openSUSE Translation Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
September 2016
- 12 participants
- 475 discussions
[opensuse-translation-commit] r96735 - branches/SLE12-SP2/yast/50-pot
by swims@svn2.opensuse.org 06 Sep '16
by swims@svn2.opensuse.org 06 Sep '16
06 Sep '16
Author: swims
Date: 2016-09-06 16:04:31 +0200 (Tue, 06 Sep 2016)
New Revision: 96735
Modified:
branches/SLE12-SP2/yast/50-pot/auth-client.pot
Log:
auth-client.pot update
Modified: branches/SLE12-SP2/yast/50-pot/auth-client.pot
===================================================================
--- branches/SLE12-SP2/yast/50-pot/auth-client.pot 2016-09-05 15:49:06 UTC (rev 96734)
+++ branches/SLE12-SP2/yast/50-pot/auth-client.pot 2016-09-06 14:04:31 UTC (rev 96735)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-04 14:54+0200\n"
-"PO-Revision-Date: 2016-08-04 14:54+0200\n"
+"POT-Creation-Date: 2016-09-06 14:42+0200\n"
+"PO-Revision-Date: 2016-09-06 14:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -411,12 +411,12 @@
#: src/lib/authui/main_dialog.rb:89
#: src/lib/authui/sssd/extended_param_dialog.rb:54
#: src/lib/authui/sssd/main_dialog.rb:177
-#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+#: src/lib/authui/sssd/manage_ad_dialog.rb:99
msgid "Name"
msgstr ""
#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
-#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+#: src/lib/authui/sssd/manage_ad_dialog.rb:99
msgid "Value"
msgstr ""
@@ -592,7 +592,7 @@
msgstr ""
#. Enable/disable SSSD daemon
-#: src/lib/authui/sssd/main_dialog.rb:252
+#: src/lib/authui/sssd/main_dialog.rb:253
msgid ""
"This computer is currently using legacy LDAP or Kerberos method to authenticat"
"e users.\n"
@@ -601,7 +601,7 @@
msgstr ""
#. Enable/disable NSS password database
-#: src/lib/authui/sssd/main_dialog.rb:284
+#: src/lib/authui/sssd/main_dialog.rb:285
msgid ""
"This computer is currently reading user database from LDAP identity provider.\n"
"Before you may use SSSD user database, please disable LDAP user database from "
@@ -609,7 +609,7 @@
msgstr ""
#. Enable/disable NSS group database
-#: src/lib/authui/sssd/main_dialog.rb:302
+#: src/lib/authui/sssd/main_dialog.rb:303
msgid ""
"This computer is currently reading group database from LDAP identity provider."
"\n"
@@ -618,7 +618,7 @@
msgstr ""
#. Enable/disable NSS sudoers database
-#: src/lib/authui/sssd/main_dialog.rb:320
+#: src/lib/authui/sssd/main_dialog.rb:321
msgid ""
"This computer is currently reading sudoers database from LDAP identity provide"
"r.\n"
@@ -626,7 +626,7 @@
" from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:328
+#: src/lib/authui/sssd/main_dialog.rb:329
msgid ""
"Sudo data source has been globally enabled.\n"
"Please remember to also customise \"sudo_provider\" parameter in Extended Option"
@@ -634,7 +634,7 @@
msgstr ""
#. Enable/disable NSS automount database
-#: src/lib/authui/sssd/main_dialog.rb:342
+#: src/lib/authui/sssd/main_dialog.rb:343
msgid ""
"This computer is currently reading automount database from LDAP identity provi"
"der.\n"
@@ -642,7 +642,7 @@
"base from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:350
+#: src/lib/authui/sssd/main_dialog.rb:351
msgid ""
"Automount data source has been globally enabled.\n"
"Please remember to also customise \"autofs_provider\" parameter in Extended Opti"
@@ -650,7 +650,7 @@
msgstr ""
#. Enable/disable PAC responder
-#: src/lib/authui/sssd/main_dialog.rb:374
+#: src/lib/authui/sssd/main_dialog.rb:375
msgid ""
"MS-PAC data source has been globally enabled.\n"
"This optional feature depends on the capabilities of your Microsoft Active Dir"
@@ -660,16 +660,16 @@
msgstr ""
#. Forbid removal of mandatory parameters
-#: src/lib/authui/sssd/main_dialog.rb:409
+#: src/lib/authui/sssd/main_dialog.rb:410
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/authui/sssd/main_dialog.rb:414
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid "Confirm parameter removal: "
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:415
+#: src/lib/authui/sssd/main_dialog.rb:416
msgid ""
"The parameter is important. Removal of the parameter may cause configuration f"
"ailure.\n"
@@ -678,11 +678,11 @@
msgstr ""
#. Save settings - validate
-#: src/lib/authui/sssd/main_dialog.rb:434
+#: src/lib/authui/sssd/main_dialog.rb:435
msgid "No domain"
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:435
+#: src/lib/authui/sssd/main_dialog.rb:436
msgid ""
"You have not configured any authentication domain, yet you chose to enable dom"
"ain authentication.\n"
@@ -691,7 +691,7 @@
msgstr ""
#. Remove all SSSD cache files
-#: src/lib/authui/sssd/main_dialog.rb:455
+#: src/lib/authui/sssd/main_dialog.rb:456
msgid "All cached data have been erased."
msgstr ""
@@ -712,27 +712,31 @@
msgstr ""
#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Update AD's DNS records as well"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+#: src/lib/authui/sssd/manage_ad_dialog.rb:73
msgid "Overwrite Samba configuration to work with this AD"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:76
-#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+#: src/lib/authui/sssd/manage_ad_dialog.rb:77
+#: src/lib/authui/sssd/manage_ad_dialog.rb:87
msgid "(Not applicable in AutoYast editor)"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+#: src/lib/authui/sssd/manage_ad_dialog.rb:79
msgid " (Auto-discovered via DNS)"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
msgid "(DNS error)"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+#: src/lib/authui/sssd/manage_ad_dialog.rb:84
msgid ""
"The name resolution service on this computer does not satisfy AD enrollment re"
"quirements.\n"
@@ -740,39 +744,39 @@
"r."
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+#: src/lib/authui/sssd/manage_ad_dialog.rb:90
msgid "Already enrolled"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+#: src/lib/authui/sssd/manage_ad_dialog.rb:92
msgid "Not yet enrolled"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+#: src/lib/authui/sssd/manage_ad_dialog.rb:115
msgid "Active Directory enrollment"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+#: src/lib/authui/sssd/manage_ad_dialog.rb:117
msgid "Current status"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+#: src/lib/authui/sssd/manage_ad_dialog.rb:117
msgid "Gathering status..."
msgstr ""
#. Enroll the computer, or save the enrollment details
-#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+#: src/lib/authui/sssd/manage_ad_dialog.rb:135
msgid "Please enter both username and password."
msgstr ""
#. join_ad will configure and apply Kerberos and then join AD
-#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+#: src/lib/authui/sssd/manage_ad_dialog.rb:146
msgid ""
"AD enrollment details have been saved for AutoYast. Please keep in mind that A"
"D user password is saved in plain text."
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:150
+#: src/lib/authui/sssd/manage_ad_dialog.rb:152
msgid ""
"Enrollment has completed successfully!\n"
"\n"
@@ -780,7 +784,7 @@
msgstr ""
#. If user enters this dialog once again, the details should be cleared.
-#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+#: src/lib/authui/sssd/manage_ad_dialog.rb:160
msgid ""
"The enrollment process failed.\n"
"\n"
@@ -978,7 +982,7 @@
"r a template."
msgstr ""
-#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1251
msgid ""
"Set a default template for a user's home directory if one is not specified exp"
"licitly by the domain's data provider."
@@ -1000,7 +1004,7 @@
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1255
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
@@ -1040,8 +1044,8 @@
msgstr ""
#. The kerberos domain section
-#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
-#: src/lib/authui/sssd/params.rb:1100
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:809
+#: src/lib/authui/sssd/params.rb:1138
msgid "Display a warning N days before the password expires."
msgstr ""
@@ -1286,668 +1290,706 @@
msgid "(Active Directory specific) Use token-groups attribute if available"
msgstr ""
-#: src/lib/authui/sssd/params.rb:595
+#: src/lib/authui/sssd/params.rb:594
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:601
-msgid "The default base DN to use for performing LDAP sudo rules."
+#: src/lib/authui/sssd/params.rb:599
+msgid ""
+"An optional base DN to restrict LDAP sudo-rule searches. The default value is "
+"ldap_search_base."
msgstr ""
-#: src/lib/authui/sssd/params.rb:606
+#: src/lib/authui/sssd/params.rb:603
msgid ""
"Specifies the comma-separated list of URIs of the LDAP servers to which SSSD s"
"hould connect in the order of preference."
msgstr ""
-#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
+#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:613
msgid ""
"Specifies the comma-separated list of URIs of the LDAP servers to which SSSD s"
"hould connect in the order of preference to change the password of a user."
msgstr ""
-#: src/lib/authui/sssd/params.rb:624
+#: src/lib/authui/sssd/params.rb:618
msgid "Base DN for LDAP search"
msgstr ""
-#: src/lib/authui/sssd/params.rb:631
+#: src/lib/authui/sssd/params.rb:625
msgid "LDAP schema type"
msgstr ""
-#: src/lib/authui/sssd/params.rb:635
+#: src/lib/authui/sssd/params.rb:629
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/authui/sssd/params.rb:641
+#: src/lib/authui/sssd/params.rb:635
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/authui/sssd/params.rb:645
+#: src/lib/authui/sssd/params.rb:639
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/authui/sssd/params.rb:650
+#: src/lib/authui/sssd/params.rb:644
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:655
+#: src/lib/authui/sssd/params.rb:649
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:660
+#: src/lib/authui/sssd/params.rb:654
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:665
+#: src/lib/authui/sssd/params.rb:659
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:670
+#: src/lib/authui/sssd/params.rb:664
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/authui/sssd/params.rb:675
+#: src/lib/authui/sssd/params.rb:669
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:680
+#: src/lib/authui/sssd/params.rb:674
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/authui/sssd/params.rb:685
+#: src/lib/authui/sssd/params.rb:679
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:690
+#: src/lib/authui/sssd/params.rb:684
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
+#: src/lib/authui/sssd/params.rb:689 src/lib/authui/sssd/params.rb:894
msgid ""
"The LDAP attribute that contains timestamp of the last modification of the par"
"ent object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:700
+#: src/lib/authui/sssd/params.rb:694
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 passwo"
"rd change)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:705
+#: src/lib/authui/sssd/params.rb:699
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 ""
-#: src/lib/authui/sssd/params.rb:710
+#: src/lib/authui/sssd/params.rb:704
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 ""
-#: src/lib/authui/sssd/params.rb:715
+#: src/lib/authui/sssd/params.rb:709
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 ""
-#: src/lib/authui/sssd/params.rb:720
+#: src/lib/authui/sssd/params.rb:714
msgid ""
"When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP"
" attribute corresponding to its shadow(5) counterpart (password inactivity per"
"iod)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:725
+#: src/lib/authui/sssd/params.rb:719
msgid ""
"When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this p"
"arameter contains the name of an LDAP attribute corresponding to its shadow(5)"
" counterpart (account expiration date)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:730
+#: src/lib/authui/sssd/params.rb:724
msgid ""
"When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of a"
"n LDAP attribute storing the date and time of last password change in kerberos"
"."
msgstr ""
-#: src/lib/authui/sssd/params.rb:735
+#: src/lib/authui/sssd/params.rb:729
msgid ""
"When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of a"
"n LDAP attribute storing the date and time when current password expires."
msgstr ""
-#: src/lib/authui/sssd/params.rb:740
+#: src/lib/authui/sssd/params.rb:734
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 ""
-#: src/lib/authui/sssd/params.rb:745
+#: src/lib/authui/sssd/params.rb:739
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 ""
-#: src/lib/authui/sssd/params.rb:750
+#: src/lib/authui/sssd/params.rb:744
msgid ""
"When using ldap_account_expire_policy=rhds or equivalent, this parameter deter"
"mines if access is allowed or not."
msgstr ""
-#: src/lib/authui/sssd/params.rb:755
+#: src/lib/authui/sssd/params.rb:749
msgid ""
"When using ldap_account_expire_policy=nds, this attribute determines if access"
" is allowed or not."
msgstr ""
-#: src/lib/authui/sssd/params.rb:760
+#: src/lib/authui/sssd/params.rb:754
msgid ""
"When using ldap_account_expire_policy=nds, this attribute determines until whi"
"ch date access is granted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:765
+#: src/lib/authui/sssd/params.rb:759
msgid ""
"When using ldap_account_expire_policy=nds, this attribute determines the hours"
" of a day in a week when access is granted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:770
+#: src/lib/authui/sssd/params.rb:764
msgid ""
"The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)"
"."
msgstr ""
-#: src/lib/authui/sssd/params.rb:774
+#: src/lib/authui/sssd/params.rb:768
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/authui/sssd/params.rb:779
+#: src/lib/authui/sssd/params.rb:773
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 ""
-#: src/lib/authui/sssd/params.rb:780
+#: src/lib/authui/sssd/params.rb:774
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/authui/sssd/params.rb:785
+#: src/lib/authui/sssd/params.rb:779
msgid ""
"Specifies how many seconds SSSD has to wait before refreshing its cache of enu"
"merated records."
msgstr ""
-#: src/lib/authui/sssd/params.rb:790
+#: src/lib/authui/sssd/params.rb:784
msgid ""
"Determine how often to check the cache for inactive entries (such as groups wi"
"th no members and users who have never logged in) and remove them to save spac"
"e."
msgstr ""
-#: src/lib/authui/sssd/params.rb:795
+#: src/lib/authui/sssd/params.rb:789
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:800
+#: src/lib/authui/sssd/params.rb:794
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/authui/sssd/params.rb:805
+#: src/lib/authui/sssd/params.rb:799
msgid ""
"If access_provider=ldap and ldap_access_order=authorized_service, SSSD will us"
"e the presence of the authorizedService attribute in the user's LDAP entry to "
"determine access privilege."
msgstr ""
-#: src/lib/authui/sssd/params.rb:810
+#: src/lib/authui/sssd/params.rb:804
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 ""
-#: src/lib/authui/sssd/params.rb:820
+#: src/lib/authui/sssd/params.rb:814
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:825
+#: src/lib/authui/sssd/params.rb:819
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:830
+#: src/lib/authui/sssd/params.rb:824
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:835
+#: src/lib/authui/sssd/params.rb:829
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/authui/sssd/params.rb:840
+#: src/lib/authui/sssd/params.rb:834
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:845
+#: src/lib/authui/sssd/params.rb:839
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:850
+#: src/lib/authui/sssd/params.rb:844
msgid ""
" The LDAP attribute that contains timestamp of the last modification of the pa"
"rent object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:856
+#: src/lib/authui/sssd/params.rb:850
msgid ""
"If ldap_schema is set to a schema format that supports nested groups (e.g. RFC"
"2307bis), then this option controls how many levels of nesting SSSD will follo"
"w."
msgstr ""
-#: src/lib/authui/sssd/params.rb:862
+#: src/lib/authui/sssd/params.rb:856
msgid ""
"This option tells SSSD to take advantage of an Active Directory-specific featu"
"re which may speed up group lookup operations on deployments with complex or d"
"eep nested groups."
msgstr ""
-#: src/lib/authui/sssd/params.rb:868
+#: src/lib/authui/sssd/params.rb:862
msgid ""
"This option tells SSSD to take advantage of an Active Directory-specific featu"
"re which might speed up initgroups operations (most notably when dealing with "
"complex or deep nested groups)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:874
+#: src/lib/authui/sssd/params.rb:868
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:880
+#: src/lib/authui/sssd/params.rb:874
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:885
+#: src/lib/authui/sssd/params.rb:879
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/authui/sssd/params.rb:890
+#: src/lib/authui/sssd/params.rb:884
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/authui/sssd/params.rb:895
+#: src/lib/authui/sssd/params.rb:889
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:905
+#: src/lib/authui/sssd/params.rb:899
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:910
+#: src/lib/authui/sssd/params.rb:904
msgid ""
"The LDAP attribute that contains the name of service attributes and their alia"
"ses."
msgstr ""
-#: src/lib/authui/sssd/params.rb:915
+#: src/lib/authui/sssd/params.rb:909
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:920
+#: src/lib/authui/sssd/params.rb:914
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:926
+#: src/lib/authui/sssd/params.rb:919
msgid ""
-"An optional base DN, search scope and LDAP filter to restrict LDAP searches fo"
-"r this attribute type."
+"An optional base DN, search scope and LDAP filter to restrict LDAP service sea"
+"rches for this attribute type. The default value is ldap_search_base."
msgstr ""
-#: src/lib/authui/sssd/params.rb:931
+#: src/lib/authui/sssd/params.rb:924
msgid ""
" Specifies the timeout (in seconds) that ldap searches are allowed to run befo"
"re they are cancelled and cached results are returned (and offline mode is ent"
"ered)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:936
+#: src/lib/authui/sssd/params.rb:929
msgid ""
"Specifies the timeout (in seconds) that ldap searches for user and group enume"
"rations are allowed to run before they are cancelled and cached results are re"
"turned (and offline mode is entered)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:941
+#: src/lib/authui/sssd/params.rb:934
msgid ""
"Specifies the timeout (in seconds) after which the poll(2)/select(2) following"
" a connect(2) returns in case of no activity."
msgstr ""
-#: src/lib/authui/sssd/params.rb:946
+#: src/lib/authui/sssd/params.rb:939
msgid ""
"Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs wi"
"ll abort if no response is received."
msgstr ""
-#: src/lib/authui/sssd/params.rb:951
+#: src/lib/authui/sssd/params.rb:944
msgid ""
"Specifies a timeout (in seconds) that a connection to an LDAP server will be m"
"aintained."
msgstr ""
-#: src/lib/authui/sssd/params.rb:956
+#: src/lib/authui/sssd/params.rb:949
msgid ""
"Specify the number of records to retrieve from LDAP in a single request. Some "
"LDAP servers enforce a maximum limit per-request."
msgstr ""
-#: src/lib/authui/sssd/params.rb:961
+#: src/lib/authui/sssd/params.rb:954
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/authui/sssd/params.rb:965
+#: src/lib/authui/sssd/params.rb:958
msgid ""
"When communicating with an LDAP server using SASL, specify the minimum securit"
"y level necessary to establish the connection."
msgstr ""
-#: src/lib/authui/sssd/params.rb:970
+#: src/lib/authui/sssd/params.rb:963
msgid ""
"Specify the number of group members that must be missing from the internal cac"
"he in order to trigger a dereference lookup."
msgstr ""
-#: src/lib/authui/sssd/params.rb:977
+#: src/lib/authui/sssd/params.rb:970
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/authui/sssd/params.rb:981
+#: src/lib/authui/sssd/params.rb:974
msgid ""
"Specifies the file that contains certificates for all of the Certificate Autho"
"rities that sssd will recognize."
msgstr ""
-#: src/lib/authui/sssd/params.rb:985
+#: src/lib/authui/sssd/params.rb:978
msgid ""
"Specifies the path of a directory that contains Certificate Authority certific"
"ates in separate individual files."
msgstr ""
-#: src/lib/authui/sssd/params.rb:989
+#: src/lib/authui/sssd/params.rb:982
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/authui/sssd/params.rb:993
+#: src/lib/authui/sssd/params.rb:986
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/authui/sssd/params.rb:998
+#: src/lib/authui/sssd/params.rb:991
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1003
+#: src/lib/authui/sssd/params.rb:996
msgid ""
"Specifies that the id_provider connection must also use tls to protect the cha"
"nnel."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1008
+#: src/lib/authui/sssd/params.rb:1001
msgid ""
"Specifies that SSSD should attempt to map user and group IDs from the ldap_use"
"r_objectsid and ldap_group_objectsid attributes instead of relying on ldap_use"
"r_uid_number and ldap_group_gid_number."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1012
+#: src/lib/authui/sssd/params.rb:1005
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1017
+#: src/lib/authui/sssd/params.rb:1010
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1022
+#: src/lib/authui/sssd/params.rb:1015
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1027
+#: src/lib/authui/sssd/params.rb:1020
msgid ""
"If set to true, the LDAP library would perform a reverse lookup to canonicaliz"
"e the host name during a SASL bind."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1032
+#: src/lib/authui/sssd/params.rb:1025
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1037
+#: src/lib/authui/sssd/params.rb:1030
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1042
+#: src/lib/authui/sssd/params.rb:1035
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1047
+#: src/lib/authui/sssd/params.rb:1040
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1052
+#: src/lib/authui/sssd/params.rb:1045
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1057
+#: src/lib/authui/sssd/params.rb:1050
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1061
+#: src/lib/authui/sssd/params.rb:1054
msgid ""
"Specifies the service name to use to find an LDAP server which allows password"
" changes when service discovery is enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1066
+#: src/lib/authui/sssd/params.rb:1059
msgid ""
"Specifies whether to update the ldap_user_shadow_last_change attribute with da"
"ys since the Epoch after a password change operation."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1071
+#: src/lib/authui/sssd/params.rb:1064
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 b"
"e met for the user to be granted access on this host."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1076
+#: src/lib/authui/sssd/params.rb:1069
msgid ""
" With this option a client side evaluation of access control attributes can be"
" enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1075
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1080
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1092
+#: src/lib/authui/sssd/params.rb:1085
msgid ""
"Allows to retain local users as members of an LDAP group for servers that use "
"the RFC2307 schema."
msgstr ""
+#: src/lib/authui/sssd/params.rb:1090
+msgid ""
+"An optional base DN, search scope and LDAP filter to restrict LDAP autofs sear"
+"ches for this attribute type. The default value is ldap_search_base."
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:1095
+msgid ""
+"An optional base DN, search scope and LDAP filter to restrict LDAP group searc"
+"hes for this attribute type. The default value is ldap_search_base."
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:1100
+msgid ""
+"An optional base DN, search scope and LDAP filter to restrict LDAP netgroup se"
+"arches for this attribute type. The default value is ldap_search_base."
+msgstr ""
+
#: src/lib/authui/sssd/params.rb:1105
+msgid ""
+"An optional base DN, search scope and LDAP filter to restrict LDAP user search"
+"es for this attribute type. The default value is ldap_search_base."
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:1110 src/lib/authui/sssd/params.rb:1120
+msgid "The object class of an automount map entry in LDAP."
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:1115
+msgid "The name of an automount map entry in LDAP."
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:1125 src/lib/authui/sssd/params.rb:1130
+msgid ""
+"The key of an automount entry in LDAP. The entry usually corresponds to a moun"
+"t point."
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:1143
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1109
+#: src/lib/authui/sssd/params.rb:1147
msgid ""
"Specifies the comma-separated list of IP addresses or hostnames of the Kerbero"
"s servers to which SSSD should connect, in the order of preference."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1114
+#: src/lib/authui/sssd/params.rb:1152
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
+#: src/lib/authui/sssd/params.rb:1156 src/lib/authui/sssd/params.rb:1161
msgid ""
"If the change password service is not running on the KDC, alternative servers "
"can be defined here."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1128
+#: src/lib/authui/sssd/params.rb:1166
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1133
+#: src/lib/authui/sssd/params.rb:1171
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1176
msgid ""
" Timeout in seconds after an online authentication request or change password "
"request is aborted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1181
msgid ""
"Verify with the help of krb5_keytab that the TGT obtained has not been spoofed"
"."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1148
+#: src/lib/authui/sssd/params.rb:1186
msgid ""
"The location of the keytab to use when validating credentials obtained from KD"
"Cs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1153
+#: src/lib/authui/sssd/params.rb:1191
msgid ""
"Store the password of the user if the provider is offline and use it to reques"
"t a TGT when the provider comes online again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1157
+#: src/lib/authui/sssd/params.rb:1195
msgid ""
"Request a renewable ticket with a total lifetime, given as an integer immediat"
"ely followed by a time unit."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1161
+#: src/lib/authui/sssd/params.rb:1199
msgid ""
"Request ticket with a with a lifetime, given as an integer immediately followe"
"d by a time unit."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1165
+#: src/lib/authui/sssd/params.rb:1203
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1170
+#: src/lib/authui/sssd/params.rb:1208
msgid ""
"Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authe"
"ntication."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1174
+#: src/lib/authui/sssd/params.rb:1212
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1179
+#: src/lib/authui/sssd/params.rb:1217
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1191
+#: src/lib/authui/sssd/params.rb:1229
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1196
-msgid "IP addresses or host names of AD servers (comma separated)"
+#: src/lib/authui/sssd/params.rb:1234
+msgid "Host names of AD servers (comma separated)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1200
-msgid ""
-"The comma-separated list of IP addresses or hostnames of the AD servers to whi"
-"ch SSSD should connect in order of preference."
+#: src/lib/authui/sssd/params.rb:1238
+msgid "Host names of backup AD servers (comma separated)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1205
+#: src/lib/authui/sssd/params.rb:1243
msgid ""
"AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN u"
"sed by AD to identify this host."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1209
+#: src/lib/authui/sssd/params.rb:1247
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1222
+#: src/lib/authui/sssd/params.rb:1260
msgid ""
" Specifies the lower bound of the range of POSIX IDs to use for mapping Active"
" Directory user and group SIDs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1227
+#: src/lib/authui/sssd/params.rb:1265
msgid ""
"Specifies the upper bound of the range of POSIX IDs to use for mapping Active "
"Directory user and group SIDs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1232
+#: src/lib/authui/sssd/params.rb:1270
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1236
+#: src/lib/authui/sssd/params.rb:1274
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1240
+#: src/lib/authui/sssd/params.rb:1278
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1245
+#: src/lib/authui/sssd/params.rb:1283
msgid ""
"Changes the behavior of the ID-mapping algorithm to behave more similarly to w"
"inbind's “idmap_autorid” algorithm."
msgstr ""
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1295
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1262
+#: src/lib/authui/sssd/params.rb:1300
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1267
+#: src/lib/authui/sssd/params.rb:1305
msgid ""
"IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN "
"used by IPA to identify this host."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1272
+#: src/lib/authui/sssd/params.rb:1310
msgid "The automounter location this IPA client will be using."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1277
+#: src/lib/authui/sssd/params.rb:1315
msgid ""
"This option tells SSSD to automatically update the DNS server built into FreeI"
"PA v2 with the IP address of this client."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1282
+#: src/lib/authui/sssd/params.rb:1320
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1286
+#: src/lib/authui/sssd/params.rb:1324
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
1
0
05 Sep '16
Author: minton
Date: 2016-09-05 17:49:06 +0200 (Mon, 05 Sep 2016)
New Revision: 96734
Added:
trunk/yast/zh_TW/po/journalctl.zh_TW.po
Modified:
trunk/yast/zh_TW/po/add-on.zh_TW.po
trunk/yast/zh_TW/po/auth-client.zh_TW.po
trunk/yast/zh_TW/po/auth-server.zh_TW.po
trunk/yast/zh_TW/po/autoinst.zh_TW.po
trunk/yast/zh_TW/po/base.zh_TW.po
trunk/yast/zh_TW/po/bootloader.zh_TW.po
trunk/yast/zh_TW/po/ca-management.zh_TW.po
trunk/yast/zh_TW/po/cio.zh_TW.po
trunk/yast/zh_TW/po/cluster.zh_TW.po
trunk/yast/zh_TW/po/control.zh_TW.po
trunk/yast/zh_TW/po/country.zh_TW.po
trunk/yast/zh_TW/po/crowbar.zh_TW.po
trunk/yast/zh_TW/po/dhcp-server.zh_TW.po
trunk/yast/zh_TW/po/dns-server.zh_TW.po
trunk/yast/zh_TW/po/docker.zh_TW.po
trunk/yast/zh_TW/po/drbd.zh_TW.po
trunk/yast/zh_TW/po/fcoe-client.zh_TW.po
trunk/yast/zh_TW/po/firewall.zh_TW.po
trunk/yast/zh_TW/po/firstboot.zh_TW.po
trunk/yast/zh_TW/po/fonts.zh_TW.po
trunk/yast/zh_TW/po/geo-cluster.zh_TW.po
trunk/yast/zh_TW/po/installation.zh_TW.po
trunk/yast/zh_TW/po/iscsi-client.zh_TW.po
trunk/yast/zh_TW/po/iscsi-lio-server.zh_TW.po
trunk/yast/zh_TW/po/kdump.zh_TW.po
trunk/yast/zh_TW/po/live-installer.zh_TW.po
trunk/yast/zh_TW/po/mail.zh_TW.po
trunk/yast/zh_TW/po/network.zh_TW.po
trunk/yast/zh_TW/po/nfs.zh_TW.po
trunk/yast/zh_TW/po/nis.zh_TW.po
trunk/yast/zh_TW/po/ntp-client.zh_TW.po
trunk/yast/zh_TW/po/packager.zh_TW.po
trunk/yast/zh_TW/po/pkg-bindings.zh_TW.po
trunk/yast/zh_TW/po/printer.zh_TW.po
trunk/yast/zh_TW/po/rdp.zh_TW.po
trunk/yast/zh_TW/po/rear.zh_TW.po
trunk/yast/zh_TW/po/registration.zh_TW.po
trunk/yast/zh_TW/po/reipl.zh_TW.po
trunk/yast/zh_TW/po/samba-client.zh_TW.po
trunk/yast/zh_TW/po/samba-server.zh_TW.po
trunk/yast/zh_TW/po/security.zh_TW.po
trunk/yast/zh_TW/po/services-manager.zh_TW.po
trunk/yast/zh_TW/po/snapper.zh_TW.po
trunk/yast/zh_TW/po/storage.zh_TW.po
trunk/yast/zh_TW/po/update.zh_TW.po
trunk/yast/zh_TW/po/users.zh_TW.po
trunk/yast/zh_TW/po/vm.zh_TW.po
trunk/yast/zh_TW/po/vpn.zh_TW.po
Log:
zh_TW merged
Modified: trunk/yast/zh_TW/po/add-on.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/add-on.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/add-on.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2012-05-21 08:21+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -86,15 +86,16 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>媒體:%1、路徑:%2、產品:%3</li>\n"
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr "啟用附加產品 \"%1\" 經由 \"%2\"。"
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
msgid "Failed to add add-on product."
msgstr "無法新增附加的產品。"
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr "啟用附加產品 \"%1\" 經由 \"%2\"。"
-
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
#. placeholder for unknown directory
Modified: trunk/yast/zh_TW/po/auth-client.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/auth-client.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/auth-client.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,1166 +17,1778 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
msgstr ""
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+#, fuzzy
+#| msgid "Name"
+msgid "User Name"
+msgstr "名稱"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr ""
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr ""
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr ""
+
+#. Add an auth_to_local_names
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
+msgstr ""
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter realm name."
+msgstr "輸入新設定檔的名稱。"
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication via Kerberos"
+msgstr "驗證模式(&A)"
+
+#. LDAP tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:76
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:84
+msgid ""
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:92
+msgid ""
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:100
+msgid ""
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:108
+msgid ""
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:163
+msgid ""
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:176
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Are you sure to delete realm %s?"
+msgstr "確定要刪除分割區 %1 嗎?"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Automatically Create Home Directory"
+msgstr "登入時建立主目錄"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "All Authentication Realms"
+msgstr "驗證模式(&A)"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Realm"
+msgstr "刪除"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+#, fuzzy
+#| msgid "Basic Settings:"
+msgid "Change Settings"
+msgstr "基本設定:"
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "User Logon Configuration"
+msgstr "全域組態"
+
+#: src/lib/authui/main_dialog.rb:68
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "LDAP/Kerberos Configuration"
+msgstr "全域組態"
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr "名稱"
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr "值"
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+#, fuzzy
+#| msgid "Network Services"
+msgid "Network Domain"
+msgstr "網路服務"
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+msgid "Identity Domains"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr "描述"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name filter:"
+msgstr "過濾器:"
+
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
#, fuzzy
#| msgid "None"
msgid "None."
msgstr "無"
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
#, fuzzy
#| msgid "Mount Parameters"
msgid "Mandatory Parameters"
msgstr "裝載參數"
-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
#, fuzzy
#| msgid "Optional Parameter File"
msgid "Optional Parameters"
msgstr "選擇性的參數檔案"
#. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
msgid "Please complete all of the following mandatory parameters:\n"
msgstr ""
-#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
#, fuzzy
-#| msgid "Authentication Key"
-msgid "Authentication Client Configuration"
-msgstr "驗證鑰匙"
-
-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
+#| msgid "Global Configuration"
+msgid "Global Options"
msgstr "全域組態"
-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
+#: src/lib/authui/sssd/main_dialog.rb:40
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name switch"
+msgstr "過濾器:"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication"
+msgstr "驗證模式(&A)"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
+#. Render overview and edit buttons on left side, config editor on right side.
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:77
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Create Home Directory"
msgstr "登入時建立主目錄"
-#: src/lib/yauthclient/main_dialog.rb:68
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
#, fuzzy
-#| msgid "Enable the NTP daemon"
-msgid "Enable SSSD daemon"
-msgstr "啟用 NTP 精靈"
+#| msgid "Domain"
+msgid "Join Domain"
+msgstr "領域"
-#: src/lib/yauthclient/main_dialog.rb:73
+#: src/lib/authui/sssd/main_dialog.rb:92
#, fuzzy
+#| msgid "Domain"
+msgid "Leave Domain"
+msgstr "領域"
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+#, fuzzy
#| msgid "Sections: %1"
-msgid "Sections"
+msgid "Service Options"
msgstr "區段:%1"
-#: src/lib/yauthclient/main_dialog.rb:76
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
#, fuzzy
-#| msgid "Network Services"
-msgid "New Service/Domain"
-msgstr "網路服務"
+#| msgid "Domain"
+msgid "Domain Options"
+msgstr "領域"
-#: src/lib/yauthclient/main_dialog.rb:77
-#, fuzzy
-#| msgid "Selected Service"
-msgid "Delete Service/Domain"
-msgstr "選取的服務裝置"
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
#. TRANSLATORS: Label of the area used to customise parameters.
#. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
+#: src/lib/authui/sssd/main_dialog.rb:172
#, fuzzy
#| msgid "Custom Registration Server"
-msgid "Customisation - %s"
+msgid "Options - %s"
msgstr "自訂註冊伺服器"
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
-msgstr "名稱"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
-msgstr "值"
+#: src/lib/authui/sssd/main_dialog.rb:220
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Do you really wish to erase configuration for domain %s?"
+msgstr "確定要刪除分割區 %1 嗎?"
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
-msgstr "描述"
+#. Enable/disable SSSD daemon
+#: src/lib/authui/sssd/main_dialog.rb:252
+msgid ""
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. For the currently selected config section, render list of additional parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-#, fuzzy
-#| msgid "Modem Parameters"
-msgid "More Parameters"
-msgstr "數據機參數"
+#. Enable/disable NSS password database
+#: src/lib/authui/sssd/main_dialog.rb:284
+msgid ""
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:140
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name filter:"
-msgstr "過濾器:"
+#. Enable/disable NSS group database
+#: src/lib/authui/sssd/main_dialog.rb:302
+msgid ""
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
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"
-"Do you want to continue?"
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"Sudo data source has been globally enabled.\n"
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
msgstr ""
-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-#, fuzzy
-#| msgid "You cannot delete the active profile."
-msgid "You may not delete section SSSD."
-msgstr "您無法刪除作用中的設定檔。"
+#. Enable/disable NSS automount database
+#: src/lib/authui/sssd/main_dialog.rb:342
+msgid ""
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:225
-#, fuzzy
-#| msgid "Do you really want to delete partition %1?"
-msgid "Do you really wish to delete section %s?"
-msgstr "確定要刪除分割區 %1 嗎?"
+#: src/lib/authui/sssd/main_dialog.rb:350
+msgid ""
+"Automount data source has been globally enabled.\n"
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
+msgstr ""
+#. Enable/disable PAC responder
+#: src/lib/authui/sssd/main_dialog.rb:374
+msgid ""
+"MS-PAC data source has been globally enabled.\n"
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
+msgstr ""
+
#. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
#, fuzzy
#| msgid "Modem parameter details"
msgid "Confirm parameter removal: "
msgstr "數據機參數詳細資料"
-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to continue?"
+"Do you still wish to remove the parameter?"
msgstr ""
#. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
+#: src/lib/authui/sssd/main_dialog.rb:434
#, fuzzy
#| msgid "N&IS domain name:"
-msgid "No domain enabled"
+msgid "No domain"
msgstr "NIS 領域名稱(&I):"
-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
msgid ""
-"No domain has been enabled in [sssd] \"domains\" parameter.\n"
-"SSSD will not start, and only local authentication will be available.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
+"SSSD will fail to start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
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 "您要啟用設定檔儲存庫的存取嗎?"
+#. The frame is shown only if AD server can be discovered or is explicitly specified
+#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
+#: src/lib/authui/sssd/manage_ad_dialog.rb:68
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
+msgstr ""
-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
-msgstr "服務"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
+msgstr ""
-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
-msgstr "領域"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com)"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:64
-#, fuzzy
-#| msgid "Identification:"
-msgid "Identification provider:"
-msgstr "識別資料:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:69
-#, fuzzy
-#| msgid "&Authentication Mode"
-msgid "Authentication provider:"
-msgstr "驗證模式(&A)"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
msgstr ""
-#. 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 "會啟用這些服務"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
+msgstr ""
-#. 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 "輸入新設定檔的名稱。"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+msgid ""
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:126
-#, fuzzy
-#| msgid "This domain is already defined."
-msgid "The domain name is already in-use."
-msgstr "已定義這個領域。"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
+msgstr ""
-#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
msgstr ""
-#: src/lib/yauthclient/params.rb:114
-msgid "Comma separated list of services that are started when sssd itself starts."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
msgstr ""
-#: src/lib/yauthclient/params.rb:115
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
msgid ""
+"Enrollment has completed successfully!\n"
"\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+"Command output:\n"
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"
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+msgid ""
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
msgstr ""
-#: 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."
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
msgstr ""
-#: src/lib/yauthclient/params.rb:126
-msgid "This parameter contains the list of domains in the order these will be queried."
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
msgstr ""
-#: 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"
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
msgstr ""
-#: src/lib/yauthclient/params.rb:143
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
msgstr ""
-#: 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."
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com)"
msgstr ""
+#: src/lib/authui/sssd/new_section_dialog.rb:78
+msgid "Which service provides identity data, such as user names and group memberships?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
+#, fuzzy
+#| msgid "Enable the NTP daemon"
+msgid "Enable the domain"
+msgstr "啟用 NTP 精靈"
+
+#. Create new domain
+#: src/lib/authui/sssd/new_section_dialog.rb:106
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter the domain name."
+msgstr "輸入新設定檔的名稱。"
+
+#: src/lib/authui/sssd/new_section_dialog.rb:109
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:112
+#, fuzzy
+#| msgid "This domain is already defined."
+msgid "The domain name is already in-use."
+msgstr "已定義這個領域。"
+
+#. Define Global Parameters
+#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:119
+msgid "The regular expression parses user name and domain name into components"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:123
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:127
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:131
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:135
+msgid "A default domain name for all names without a domian name component"
+msgstr ""
+
#. Define Global Services Parameters
-#: 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."
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
+#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
+#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
msgstr ""
-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
msgid "Add a timestamp to the debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
msgid "Add microseconds to the timestamp in debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
+#: src/lib/authui/sssd/params.rb:161
+msgid "Timeout in seconds between heartbeats for this service"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:171
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:176
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:181
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
msgstr ""
-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/yauthclient/params.rb:202
+#: src/lib/authui/sssd/params.rb:198
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 ""
-#: src/lib/yauthclient/params.rb:207
+#: src/lib/authui/sssd/params.rb:203
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 ""
-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
msgid "Exclude certain users from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
msgid "If you want filtered user to still be group members set this option to false."
msgstr ""
-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr ""
-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr ""
-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
msgid "Override the login shell for all users."
msgstr ""
-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
msgid "Restrict user shell to one of the listed values."
msgstr ""
-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
msgid "Replace any instance of these shells with the shell_fallback"
msgstr ""
-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr ""
-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr ""
-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:291
+#: src/lib/authui/sssd/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 ""
#. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
msgid "Display a warning N days before the password expires."
msgstr ""
-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr ""
-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: src/lib/authui/sssd/params.rb:325
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr ""
-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr ""
-#: src/lib/yauthclient/params.rb:330
+#: src/lib/authui/sssd/params.rb:342
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr ""
-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr ""
-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/yauthclient/params.rb:355
+#: src/lib/authui/sssd/params.rb:371
msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
msgstr ""
-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/yauthclient/params.rb:401
+#: src/lib/authui/sssd/params.rb:417
msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
msgid "The identification provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:413
+#: src/lib/authui/sssd/params.rb:429
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 ""
-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
msgstr ""
-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
msgid "The access control provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
msgid "The provider which should handle change password operations for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
msgid "The SUDO provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
msgid "The provider which should handle loading of selinux settings."
msgstr ""
-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
msgid "The provider which should handle fetching of subdomains."
msgstr ""
-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
msgid "The autofs provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
msgid "The provider used for retrieving host identity information."
msgstr ""
-#: src/lib/yauthclient/params.rb:466
+#: src/lib/authui/sssd/params.rb:482
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr ""
-#: src/lib/yauthclient/params.rb:471
+#: src/lib/authui/sssd/params.rb:487
msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
msgstr ""
-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr ""
-#: src/lib/yauthclient/params.rb:482
+#: src/lib/authui/sssd/params.rb:498
msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr ""
-#: src/lib/yauthclient/params.rb:486
+#: src/lib/authui/sssd/params.rb:502
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr ""
-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr ""
-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:516
msgid "Treat user and group names as case sensitive."
msgstr ""
-#: src/lib/yauthclient/params.rb:500
+#: src/lib/authui/sssd/params.rb:521
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 ""
-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:526
msgid "Use this homedir as default value for all subdomains within this domain."
msgstr ""
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:532
msgid "Comma separated list of users who are allowed to log in."
msgstr ""
-#: src/lib/yauthclient/params.rb:516
+#: src/lib/authui/sssd/params.rb:537
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:521
+#: src/lib/authui/sssd/params.rb:542
msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr ""
#. 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/lib/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:551
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:556
msgid "Indicate if a home directory should be created by default for new users."
msgstr ""
-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:561
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr ""
-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:566
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:550
+#: src/lib/authui/sssd/params.rb:571
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 ""
-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:576
msgid "The mail spool directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:580
msgid "The command that is run after a user is removed."
msgstr ""
#. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:589
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:595
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:601
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr ""
-#: src/lib/yauthclient/params.rb:579
+#: src/lib/authui/sssd/params.rb:606
msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr ""
-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
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 ""
-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:624
#, fuzzy
#| msgid "Base DN for the database"
msgid "Base DN for LDAP search"
msgstr "資料庫的 Base DN"
-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:631
#, fuzzy
#| msgid "LDAP secure port"
msgid "LDAP schema type"
msgstr "LDAP 安全連接埠"
-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:635
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:641
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:645
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:650
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:655
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:660
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:665
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:670
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:675
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:680
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:685
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:690
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:673
+#: src/lib/authui/sssd/params.rb:700
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 ""
-#: src/lib/yauthclient/params.rb:678
+#: src/lib/authui/sssd/params.rb:705
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 ""
-#: src/lib/yauthclient/params.rb:683
+#: src/lib/authui/sssd/params.rb:710
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 ""
-#: src/lib/yauthclient/params.rb:688
+#: src/lib/authui/sssd/params.rb:715
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 ""
-#: src/lib/yauthclient/params.rb:693
+#: src/lib/authui/sssd/params.rb:720
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 ""
-#: src/lib/yauthclient/params.rb:698
+#: src/lib/authui/sssd/params.rb:725
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 ""
-#: src/lib/yauthclient/params.rb:703
+#: src/lib/authui/sssd/params.rb:730
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 ""
-#: src/lib/yauthclient/params.rb:708
+#: src/lib/authui/sssd/params.rb:735
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 ""
-#: src/lib/yauthclient/params.rb:713
+#: src/lib/authui/sssd/params.rb:740
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 ""
-#: src/lib/yauthclient/params.rb:718
+#: src/lib/authui/sssd/params.rb:745
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 ""
-#: src/lib/yauthclient/params.rb:723
+#: src/lib/authui/sssd/params.rb:750
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:755
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:760
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:738
+#: src/lib/authui/sssd/params.rb:765
msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:770
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr ""
-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:774
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/yauthclient/params.rb:752
+#: src/lib/authui/sssd/params.rb:779
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 ""
-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:780
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:785
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr ""
-#: src/lib/yauthclient/params.rb:763
+#: src/lib/authui/sssd/params.rb:790
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 ""
-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:795
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:800
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/yauthclient/params.rb:778
+#: src/lib/authui/sssd/params.rb:805
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 ""
-#: src/lib/yauthclient/params.rb:783
+#: src/lib/authui/sssd/params.rb:810
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 ""
-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:820
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:825
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:830
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:835
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:840
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:845
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:850
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:829
+#: src/lib/authui/sssd/params.rb:856
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 ""
-#: src/lib/yauthclient/params.rb:835
+#: src/lib/authui/sssd/params.rb:862
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 ""
-#: src/lib/yauthclient/params.rb:841
+#: src/lib/authui/sssd/params.rb:868
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 ""
-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:874
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:880
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:885
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:890
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:895
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:905
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:910
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr ""
-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:915
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:920
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:899
+#: src/lib/authui/sssd/params.rb:926
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/yauthclient/params.rb:904
+#: src/lib/authui/sssd/params.rb:931
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 ""
-#: src/lib/yauthclient/params.rb:909
+#: src/lib/authui/sssd/params.rb:936
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 ""
-#: src/lib/yauthclient/params.rb:914
+#: src/lib/authui/sssd/params.rb:941
msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr ""
-#: src/lib/yauthclient/params.rb:919
+#: src/lib/authui/sssd/params.rb:946
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr ""
-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:951
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr ""
-#: src/lib/yauthclient/params.rb:929
+#: src/lib/authui/sssd/params.rb:956
msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr ""
-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:961
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/yauthclient/params.rb:938
+#: src/lib/authui/sssd/params.rb:965
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr ""
-#: src/lib/yauthclient/params.rb:943
+#: src/lib/authui/sssd/params.rb:970
msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:977
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:981
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr ""
-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:985
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr ""
-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:993
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:998
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:1003
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr ""
-#: src/lib/yauthclient/params.rb:981
+#: src/lib/authui/sssd/params.rb:1008
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 ""
-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1012
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1017
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1022
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:1000
+#: src/lib/authui/sssd/params.rb:1027
msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr ""
-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1032
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1037
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1042
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1047
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1052
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1057
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1034
+#: src/lib/authui/sssd/params.rb:1061
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1039
+#: src/lib/authui/sssd/params.rb:1066
msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
msgstr ""
-#: src/lib/yauthclient/params.rb:1044
+#: src/lib/authui/sssd/params.rb:1071
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 ""
-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1076
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1082
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1087
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/yauthclient/params.rb:1065
+#: src/lib/authui/sssd/params.rb:1092
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr ""
-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1105
#, fuzzy
#| msgid "The IP address (or host name) of the host with a fixed address"
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr "含固定位址主機的 IP 位址 (或主機名稱)"
-#: src/lib/yauthclient/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1109
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 ""
-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1114
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr ""
-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1128
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1133
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1138
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr ""
-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1143
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1148
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1126
+#: src/lib/authui/sssd/params.rb:1153
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 ""
-#: src/lib/yauthclient/params.rb:1130
+#: src/lib/authui/sssd/params.rb:1157
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1134
+#: src/lib/authui/sssd/params.rb:1161
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1165
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1170
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1174
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1179
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1191
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1196
#, fuzzy
#| msgid "The IP address (or host name) of the host with a fixed address"
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr "含固定位址主機的 IP 位址 (或主機名稱)"
-#: src/lib/yauthclient/params.rb:1173
+#: src/lib/authui/sssd/params.rb:1200
msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1209
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:1194
+#: src/lib/authui/sssd/params.rb:1222
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1199
+#: src/lib/authui/sssd/params.rb:1227
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1240
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1217
+#: src/lib/authui/sssd/params.rb:1245
msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1257
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1262
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1238
-msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1272
#, fuzzy
#| msgid "The configuration of the NIS client will be saved.\n"
msgid "The automounter location this IPA client will be using."
msgstr "將儲存 NIS 用戶端的組態。\n"
-#: src/lib/yauthclient/params.rb:1248
+#: src/lib/authui/sssd/params.rb:1277
msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
msgstr ""
-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1282
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1286
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
-#. 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 ""
+#, fuzzy
+#~| msgid "Authentication Key"
+#~ msgid "Authentication Client Configuration"
+#~ msgstr "驗證鑰匙"
-#: src/modules/AuthClient.rb:232
-msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
-msgstr ""
+#, fuzzy
+#~| msgid "Selected Service"
+#~ msgid "Delete Service/Domain"
+#~ msgstr "選取的服務裝置"
-#. end Export
-#. ################################################################
-#. ################################################################
-#. Summary()
-#. returns html formated configuration summary
-#. @return summary
-#: src/modules/AuthClient.rb:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Modem Parameters"
+#~ msgid "More Parameters"
+#~ msgstr "數據機參數"
-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "You cannot delete the active profile."
+#~ msgid "You may not delete section SSSD."
+#~ msgstr "您無法刪除作用中的設定檔。"
-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr ""
+#, 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 "您要啟用設定檔儲存庫的存取嗎?"
-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr ""
+#~ msgid "Service"
+#~ msgstr "服務"
+#, fuzzy
+#~| msgid "Identification:"
+#~ msgid "Identification provider:"
+#~ msgstr "識別資料:"
+
+#, fuzzy
+#~| msgid "These services will be enabled"
+#~ msgid "There are no more services to be enabled."
+#~ msgstr "會啟用這些服務"
+
#~ msgid "Cancel"
#~ msgstr "取消"
@@ -1189,17 +1801,11 @@
#~ msgid "New"
#~ msgstr "新增"
-#~ msgid "Basic Settings:"
-#~ msgstr "基本設定:"
-
#~ msgid "Add"
#~ msgstr "新增"
#~ msgid "Edit"
#~ msgstr "編輯"
-#~ msgid "Delete"
-#~ msgstr "刪除"
-
#~ msgid "SPAM Prevention"
#~ msgstr "垃圾郵件預防措施"
Modified: trunk/yast/zh_TW/po/auth-server.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/auth-server.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/auth-server.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -299,8 +299,7 @@
msgstr "在 SLP 精靈註冊(&S)"
#. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
msgid "Firewall Settings"
msgstr "防火牆設定"
@@ -443,12 +442,12 @@
msgid "Configure Account for Replication"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
msgid "is not a valid LDAP DN"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
msgid "Password"
msgstr "密碼"
@@ -474,8 +473,8 @@
msgid "Provider Details"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
msgid "Protocol"
msgstr "協定"
@@ -483,7 +482,7 @@
msgid "Provider Hostname"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
msgid "Use StartTLS"
msgstr ""
@@ -564,8 +563,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
msgid "The test returned the following error messages:"
msgstr ""
@@ -1826,8 +1825,7 @@
#. Initialization dialog contents
#. Initialization dialog contents
#: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
#: src/include/auth-server/wizards.rb:207
#: src/include/auth-server/wizards.rb:300
msgid "Initializing..."
@@ -2201,7 +2199,7 @@
msgid "Index Cache (IDL cache)"
msgstr ""
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
msgid "Checkpoint Settings"
msgstr ""
@@ -2271,7 +2269,7 @@
msgstr ""
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
msgid "Password Policy Settings"
msgstr "密碼規則設定"
@@ -2432,237 +2430,237 @@
msgstr "該目錄不存在。要建立嗎?"
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
msgid "The error message was: '"
msgstr ""
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
msgid "Try again?"
msgstr "再試一次?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
msgid "Available Attribute Types"
msgstr ""
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
msgid "Selected Attribute Types"
msgstr ""
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
msgid "Who should this rule apply to"
msgstr ""
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
msgid "Entry DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
msgid "Select"
msgstr "選取"
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
msgid "Define the Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
msgid "Stop access control evaluation here (default)"
msgstr ""
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
msgid "Continue with next access control rule (\"break\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
msgid "Continue evaluation of this rule (\"continue\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
msgid "Please enter a DN in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
msgid "Subtree DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
msgid "Group DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
msgid "Edit Access Control Rule"
msgstr ""
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
msgid "Target Objects"
msgstr ""
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
msgid "Matching the filter:"
msgstr ""
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
msgid "LDAP Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
msgid "Apply this rule only to the listed attribute"
msgstr ""
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
msgid "Attributes"
msgstr "屬性"
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
msgid "Edit"
msgstr "編輯"
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
msgid "Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
msgid "Who"
msgstr ""
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
msgid "DN"
msgstr "DN"
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
msgid "Flow Control"
msgstr ""
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
msgid "Up"
msgstr "向上"
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
msgid "Down"
msgstr "向下"
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
msgid "Enter valid a LDAP filter in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
msgid "You must add at least one item to the \"Access Level\" list."
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Target"
msgstr "目標"
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
msgid "This database is a Replication Consumer."
msgstr ""
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
msgid "Provider Name"
msgstr ""
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
msgid "Port"
msgstr "埠"
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
msgid "Replication Type"
msgstr ""
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
msgid "Replication Interval"
msgstr ""
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
msgid "Days"
msgstr "日"
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
msgid "Hours"
msgstr "小時"
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
msgid "Minutes"
msgstr "分鐘"
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
msgid "Seconds"
msgstr "秒鐘"
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
msgid "Authentication DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
msgid "Custom update referral"
msgstr ""
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
msgid "Target Host"
msgstr ""
#. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
msgid "Invalid replication interval specified"
msgstr ""
#. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
msgid "Checking LDAP connectivity to the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
msgid "Do you still want to continue?"
msgstr ""
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr ""
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
msgid "Enable ldapsync provider for this database"
msgstr ""
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
msgid "Operations"
msgstr ""
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
msgid "Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
msgid "Enable Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
msgid "Replication Settings"
msgstr ""
Modified: trunk/yast/zh_TW/po/autoinst.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/autoinst.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/autoinst.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2012-05-28 11:50+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -34,7 +34,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
msgid "This may take a while"
msgstr "這可能需要一些時間"
@@ -54,14 +54,13 @@
#. command line options
#. Init variables
-#. Import users configuration from the profile
-#.
+#. unique id
#. 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:410
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
@@ -260,7 +259,7 @@
msgstr "請先從表格選取檔案。"
#. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -271,74 +270,58 @@
"</p>"
#. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
msgid "Progress"
msgstr "進度"
#. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
msgid "Configuring System according to auto-install settings"
msgstr "根據自動安裝設定來設定系統組態"
#. 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."
+#: src/clients/inst_autoconfigure.rb:94
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>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:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
msgid "Configuring %1"
msgstr "正在設定 %1 組態"
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
msgid "Not Configuring %1"
msgstr "未設定 %1 組態"
#. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
msgid "Executing Post-Scripts"
msgstr "正在執行安裝後程序檔"
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
+#. Do not restart NetworkManager* services
+#. bnc#955260
#: src/clients/inst_autoconfigure.rb:304
#, fuzzy
msgid "Restarting all running services"
msgstr "正在判斷執行中的服務"
-#: src/clients/inst_autoconfigure.rb:327
+#. Filtering out all services which must not to be restarted
+#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr ""
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
msgid "Finishing Configuration"
msgstr "正在完成組態"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:447
msgid "Processing resource %1"
msgstr "處理資源 %1"
@@ -398,8 +381,15 @@
"執行影像程序失敗:\n"
"%1"
-#. import "Arch";
#. encoding: utf-8
+#. File: clients/inst_autoinit.ycp
+#. Package: Auto-installation
+#. Summary: Parses XML Profile for automatic installation
+#. Authors: Anas Nashif <nashif(a)suse.de>
+#.
+#. $Id$
+#.
+#. encoding: utf-8
#. File: clients/autoinst_post.ycp
#. Package: Auto-installation
#. Author: Anas Nashif <nashif(a)suse.de>
@@ -407,7 +397,7 @@
#. the system as described in the profile file.
#.
#. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
msgid ""
"<p>\n"
"Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -415,59 +405,45 @@
"<p>\n"
"正在準備系統以進行自動安裝,請稍候。</p>\n"
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
msgid "Probe hardware"
msgstr "偵測硬體"
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
msgid "Retrieve & Read Control File"
msgstr "取回並讀取控制檔案"
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
msgid "Parse control file"
msgstr "分析控制檔案"
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
msgid "Initial Configuration"
msgstr "啟始組態"
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
msgid "Preparing System for Automatic Installation"
msgstr "正在準備系統,以進行自動安裝"
#. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
msgid "Preprobing stage"
msgstr "預先偵測階段"
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
msgid "Probing hardware..."
msgstr "正在偵測硬體..."
+#. 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_autoinit.rb:128
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+
#. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
msgid "Parsing control file"
msgstr "正在分析控制檔案"
@@ -511,57 +487,67 @@
#. Uwe Gansert <ug(a)suse.de>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>正在準備系統以進行自動安裝,請稍候。</P>"
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
msgid "Execute pre-install user scripts"
msgstr "執行預先安裝使用者程序檔"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
msgid "Configure General Settings "
msgstr "設定一般設定組態 "
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
msgid "Set up language"
msgstr "設定語言"
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:58
msgid "Create partition plans"
msgstr "建立分割區計畫"
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
msgid "Configure Bootloader"
msgstr "設定 Bootloader"
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
msgid "Registration"
msgstr "註冊"
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure Software selections"
msgstr "設定軟體選項組態"
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:62
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:63
#, fuzzy
#| msgid "Configure Volume Groups"
msgid "Configure users and groups"
msgstr "設定磁碟區群組"
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "設定磁碟機組態"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
msgid "Executing pre-install user scripts..."
msgstr "正在執行預先安裝使用者程序檔..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configuring general settings..."
msgstr "正在設定一般設定..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
#, fuzzy
msgid "Setting up language..."
msgstr "設定語言"
@@ -570,17 +556,17 @@
msgid "Creating partition plans..."
msgstr "正在建立分割區計畫..."
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
msgid "Configuring Bootloader..."
msgstr "正在設定 Bootloader 組態..."
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
#, fuzzy
#| msgid "Repairing file system..."
msgid "Registering the system..."
msgstr "正在修復檔案系統..."
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring Software selections..."
msgstr "正在設定軟體選項組態..."
@@ -593,7 +579,19 @@
msgid "Importing users and groups configuration..."
msgstr ""
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "正在輸入 Kickstart 檔案..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "正在設定語言組態..."
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
msgid "Preparing System for Automated Installation"
msgstr "正在準備系統,以進行自動安裝"
@@ -602,7 +600,7 @@
#. while the general inst_finish process at the end of the
#. first stage. But for the installation workflow the linuxrc
#. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#: src/clients/inst_autosetup.rb:185
#, fuzzy
msgid "Handling Add-On Products..."
msgstr "簽署附加產品"
@@ -610,12 +608,12 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
msgid "Configuring language..."
msgstr "正在設定語言組態..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:298
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -623,8 +621,9 @@
"設定分割區時發生錯誤。\n"
"請再試一次。\n"
-#. Software
-#: src/clients/inst_autosetup.rb:344
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -704,11 +703,11 @@
#. Select packages
#. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
msgid "Software Selection"
msgstr "軟體選項"
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
msgid ""
"<p>\n"
"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
@@ -723,19 +722,19 @@
#. AutoinstSoftware::pmInit();
#. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
#. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
msgstr "安裝來源的位置 (像是 http://myhost/11.3/DVD1/)"
-#: src/clients/software_auto.rb:128
+#: src/clients/software_auto.rb:129
msgid "The inst-source of this system (you can't create images if you choose this)"
msgstr "此系統的安裝來源(如果選擇此項,將無法建立影像)"
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
msgid "using that installation source failed"
msgstr "使用安裝來源失敗"
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
msgid "Reading package database..."
msgstr "正在讀取套件資料庫..."
@@ -987,6 +986,11 @@
msgid "Volgroup device name"
msgstr "磁碟區組群裝置名稱"
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
#. Shows a dialog when 'control file' can't be found
#. @param [String] original Original value
#. @return [String] new value
@@ -1476,8 +1480,7 @@
msgid "Settings"
msgstr "設定"
-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
msgid "Select Directory"
msgstr "選取目錄"
@@ -1601,7 +1604,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
msgid "Checking XML with RNG validation..."
msgstr "正在以 RNG 驗證檢查 XML..."
@@ -1611,7 +1614,7 @@
msgstr "區段 %1:"
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
msgid "Checking XML with RNC validation..."
msgstr "正在以 RNC 驗證檢查 XML..."
@@ -1990,67 +1993,6 @@
"準備。\n"
"</p>\n"
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "無法透過 HTTP(S) 協定找到 URL '%1'。伺服器傳回代碼 %2。"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "無法透過 FTP 協定找到 URL '%1'。伺服器傳回代碼 %2。"
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "無法讀取 %1/%2 上的檔案。\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr "無法讀取 %1 上的檔案。\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:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "無法裝載 %1。"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "無法讀取 CD 上的檔案。路徑:%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:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "無法取回遠端檔案 %1"
-
-#. this is workaround for bnc#849767
-#. 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:485
-msgid "%1 is not mounted and mount failed"
-msgstr "%1 未掛載且掛載失敗"
-
-#. autoyast tried to copy a file but that file can't be found
-#: src/include/autoinstall/io.rb:505
-msgid "File %1 cannot be found"
-msgstr "找不到檔案 %1"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "無法透過 TFTP 協定找到 URL '%1'。"
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "未知協定 %1。"
-
#. Script Configuration
#. @return script configuration dialog
#: src/include/autoinstall/script_dialogs.rb:30
@@ -2317,12 +2259,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:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "XML 剖析程式報告在剖析 autoyast 設定檔時發生錯誤。錯誤訊息為:\n"
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
msgid ""
"\n"
"User-defined classes could not be retrieved. Make sure all classes \n"
@@ -2338,45 +2280,45 @@
#. The line above needs to be fixed when we have more attributes
#. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:278
+#: src/modules/AutoinstConfig.rb:279
msgid "Choose Profile"
msgstr "選擇 Profile"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:335
msgid "Retrieving control file from floppy."
msgstr "正在從磁片取回控制檔案。"
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "從 TFTP 伺服器取回控制檔案 (%1):%2。"
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "從 NFS 伺服器取回控制檔案 (%1):%2。"
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "從 HTTP 伺服器取回控制檔案 (%1):%2。"
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:356
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "從 FTP 伺服器取回控制檔案 (%1):%2。"
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:362
msgid "Copying control file from file: %1."
msgstr "從檔案複製控制檔案:%1。"
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:367
msgid "Copying control file from device: /dev/%1."
msgstr "從裝置複製控制檔案:/dev/%1。"
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:371
msgid "Copying control file from default location."
msgstr "從預設位置複製控制檔案。"
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:373
msgid "Source unknown."
msgstr "不明的來源。"
@@ -2386,7 +2328,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:453
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2396,7 +2338,7 @@
"<p>幾乎所有控制檔案的資源,都可以\n"
"使用組態管理系統來設定。</p>\n"
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:458
msgid ""
"<p>Most of the modules used to create the configuration are identical to those available\n"
"through the YaST Control Center. Instead of configuring this system, the data\n"
@@ -2410,7 +2352,7 @@
"使用 AutoYaST 安裝其他系統時,可以使用該控制檔案。\n"
"</p>\n"
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:465
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2516,24 +2458,24 @@
msgstr "不輸入新的 GPG 金鑰"
#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
+#: src/modules/AutoinstGeneral.rb:419
#, fuzzy
#| msgid "Syncing server..."
msgid "Syncing time..."
msgstr "正在同步化伺服器..."
#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
+#: src/modules/AutoinstGeneral.rb:421
msgid "Syncing time with %s."
msgstr ""
-#: src/modules/AutoinstGeneral.rb:420
+#: src/modules/AutoinstGeneral.rb:425
#, fuzzy
#| msgid "Parsing failed."
msgid "Time syncing failed."
msgstr "分析失敗。"
-#: src/modules/AutoinstGeneral.rb:424
+#: src/modules/AutoinstGeneral.rb:429
#, fuzzy
#| msgid "Cannot mount file system."
msgid "Cannot update system time."
@@ -2556,17 +2498,17 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
msgid "Drives"
msgstr "磁碟機"
#. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
msgid "%s drive in total"
msgid_plural "%s drives in total"
msgstr[0] ""
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
#, fuzzy
#| msgid "Not detected."
msgid "Not yet cloned."
@@ -2574,55 +2516,55 @@
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
msgid "Preinstallation Scripts"
msgstr "安裝前程序檔"
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
msgid "Postinstallation Scripts"
msgstr "安裝後程序檔"
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
msgid "Chroot Scripts"
msgstr "Chroot 程序檔"
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
msgid "Init Scripts"
msgstr "Init 程序檔"
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
msgid "Postpartitioning Scripts"
msgstr "分割後程序檔"
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
msgid "Pre"
msgstr "預先"
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
msgid "Post"
msgstr "後置"
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
msgid "Init"
msgstr "Init"
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
msgid "Chroot"
msgstr "Chroot"
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
msgid "Postpartitioning"
msgstr "磁碟分割之後"
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
msgid "Unknown"
msgstr "未知的"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:174
msgid ""
"These packages could not be found in the software repositories:\n"
"%1"
@@ -2632,31 +2574,31 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
msgid "Adding repo %1 failed"
msgstr "加入套件庫 %1 失敗"
#. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:377
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr "在安裝樣式過程中影像建立失敗。 請查看 /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:385
msgid "Creating Image - installing packages"
msgstr "建立影像 - 正在安裝套件"
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:395
msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
msgstr "當安裝套件時影響建立失敗。請查看 /tmp/ay_image.log"
#. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:404
+#: src/modules/AutoinstSoftware.rb:406
msgid "Store image to ..."
msgstr "正在儲存影像檔到 ..."
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:435
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."
@@ -2664,16 +2606,16 @@
"您可以對此影像進行變更在 %1/\n"
"如果您按下確定按鈕,此影像將被壓縮且不再允許變更。"
-#: src/modules/AutoinstSoftware.rb:447
+#: src/modules/AutoinstSoftware.rb:449
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr "影像壓縮失敗在 '%1'。請查看 /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:456
msgid "Image created successfully"
msgstr "成功建立影像"
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:492
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."
@@ -2682,30 +2624,30 @@
"如果沒有此檔案,可以用 'ls -F > directory.yast' 建立。"
#. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:524
+#: src/modules/AutoinstSoftware.rb:526
msgid "can not read '%1'. Try again?"
msgstr "無法讀取 '%1'。要再試一次嗎?"
#. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:544
msgid "can not read '%1'. ISO creation failed"
msgstr "無法讀取 '%1'。建立 ISO 失敗"
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:574
msgid "Preparing ISO Filestructure ..."
msgstr "正在準備 ISO 目錄結構 ..."
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:623
msgid "boot config for the DVD"
msgstr "DVD 開機設定"
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:627
msgid "Ok"
msgstr "確定"
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:630
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."
@@ -2715,43 +2657,43 @@
#. 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:647
+#: src/modules/AutoinstSoftware.rb:649
msgid "Store ISO image to ..."
msgstr "儲存 ISO 影像到 ..."
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:650
msgid "Creating ISO File ..."
msgstr "正在建立 ISO 檔案..."
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:671
msgid "ISO successfully created at %1"
msgstr "已成功建立 ISO 在 %1"
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:753
msgid "Selected Patterns"
msgstr "選定模式"
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:763
msgid "Individually Selected Packages"
msgstr "個別選取的套件"
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:769
msgid "Packages to Remove"
msgstr "要移除的套件"
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:776
msgid "Force Kernel Package"
msgstr "強制核心套件"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:871
msgid "Could not set patterns: %1."
msgstr "無法設定模式:%1。"
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:932
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr "套件解析器執行失敗。 請檢查您在 autoyast 設定檔中的軟體區段。"
@@ -2797,14 +2739,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:363
msgid "Collecting configuration data..."
msgstr "正在收集組態資料..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:466
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr "加密 AutoYaST 剖析檔。輸入密碼 2 次"
@@ -2812,14 +2754,14 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:540
msgid "Could not write section %1 to file %2."
msgstr "無法寫入區段 %1 到檔案 %2。"
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr "加密 AutoYaST 剖析檔。輸入正確的密碼。"
@@ -2837,6 +2779,39 @@
msgid "&OK"
msgstr "確定(&O)"
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "無法透過 HTTP(S) 協定找到 URL '%1'。伺服器傳回代碼 %2。"
+
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "無法透過 FTP 協定找到 URL '%1'。伺服器傳回代碼 %2。"
+
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "無法讀取 %1/%2 上的檔案。\n"
+
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "無法讀取 %1 上的檔案。\n"
+
+#~ msgid "Mounting %1 failed."
+#~ msgstr "無法裝載 %1。"
+
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "無法讀取 CD 上的檔案。路徑:%1/%2."
+
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "無法取回遠端檔案 %1"
+
+#~ msgid "%1 is not mounted and mount failed"
+#~ msgstr "%1 未掛載且掛載失敗"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "找不到檔案 %1"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "無法透過 TFTP 協定找到 URL '%1'。"
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "未知協定 %1。"
+
#~ msgid "Configure runlevel"
#~ msgstr "設定 runlevel"
@@ -2968,9 +2943,6 @@
#~ "如需詳細資訊,請參閱文件。\n"
#~ "</P>\n"
-#~ msgid "Configure Drives"
-#~ msgstr "設定磁碟機組態"
-
#~ msgid "&Drive"
#~ msgstr "磁碟機(&D)"
Modified: trunk/yast/zh_TW/po/base.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/base.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/base.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-01-16 09:57+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -80,79 +80,79 @@
msgstr "此 YaST2 模組不支援指令行介面。"
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
msgid "Use 'help' for a complete list of available commands."
msgstr "使用 'help' 取得可用指令的完整清單。"
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
msgid "Use 'yast2 %1 help' for a complete list of available commands."
msgstr "使用 'yast2 %1 help' 取得可用指令的完整清單。"
#. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
msgid "Unknown Command: %1"
msgstr "不明的指令:%1"
#. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
msgid "Option '%1' is missing value."
msgstr "選項 '%1' 的值遺失。"
#. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
msgid "Unknown option for command '%1': %2"
msgstr "指令 '%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:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
msgid "Invalid value for option '%1': %2"
msgstr "選項 '%1' 的無效值:%2"
#. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
msgid "Invalid value for option '%1' -- expected '%2', received %3"
msgstr "選項 '%1' 的無效值 -- 預期為 '%2',卻接收到 %3"
#. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
msgid "Option '%1' cannot have a value. Given value: %2"
msgstr "選項 '%1' 不能有值。給定值:%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:541
+#: library/commandline/src/modules/CommandLine.rb:533
msgid "Use '%1 %2 help' for a complete list of available options."
msgstr "使用 '%1 %2 help' 取得可用選項的完整清單。"
#. 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:551
+#: library/commandline/src/modules/CommandLine.rb:543
msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
msgstr "使用 'yast2 %1 %2 help' 取得可用選項的完整清單。"
#. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
msgid "YaST Configuration Module %1\n"
msgstr "YaST 組態模組 %1\n"
#. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
msgid "No help available"
msgstr "沒有可用的說明"
#. Process <command> "help"
#. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
msgid "Command '%1'"
msgstr "指令 '%1'"
#. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
msgid ""
"\n"
" Options:"
@@ -161,7 +161,7 @@
" 選項:"
#. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
msgid ""
"\n"
" Options of the [string] type must be written in the form 'option=value'."
@@ -170,7 +170,7 @@
" 字串形態的選項要寫成'選項=值'的格式。"
#. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
msgid ""
"\n"
" Example:"
@@ -179,137 +179,137 @@
" 範例:"
#. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
msgid "This is a YaST module."
msgstr "這是一個 YaST 模組。"
#. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
msgid "Basic Syntax:"
msgstr "基本語法:"
#. translators: module command line help, %1 is the module name
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
msgid " yast2 %1 <command> [verbose] [options]"
msgstr " yast2 %1 <command> [詳細] [選項]"
#. translators: module command line help, %1 is the module name
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
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:797
+#: library/commandline/src/modules/CommandLine.rb:789
msgid " <command> [options]"
msgstr " <command> [選項]"
#. translators: module command line help
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
msgid " <command> help"
msgstr " <command> help"
#. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
msgid "Commands:"
msgstr "指令:"
#. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
msgid "No help available."
msgstr "沒有可用的說明。"
#. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
msgid "<Error: invalid help>"
msgstr "<錯誤: 無適用的說明>"
#. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
msgid "Run 'yast2 %1 <command> help' for a list of available options."
msgstr "執行 'yast2 %1 <command> help' 取得可用選項的清單。"
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
+#: library/commandline/src/modules/CommandLine.rb:930
msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option."
msgstr "遺失目標檔案名稱 ('xmlfile' 選項)。使用 xmlfile=<target_XML_file> 指令行選項。"
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
+#: library/commandline/src/modules/CommandLine.rb:942
msgid "Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> command line option."
msgstr "目標檔案名稱 ('xmlfile' 選項) 是空白的。使用 xmlfile=<target_XML_file> 指令行選項。"
#. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
msgid "unknown"
msgstr "不明的"
#. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
msgid "or '%1'"
msgstr "或 '%1'"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
msgid "Specify the command '%1'."
msgstr "指定指令 '%1'。"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
msgid "Specify one of the commands: %1."
msgstr "指定其中一個指令:%1。"
#. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
msgid "Specify only one of the commands: %1."
msgstr "僅指定其中一個指令:%1。"
#. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
msgid "There is no user interface available for this module."
msgstr "此模組沒有可用的使用者介面。"
#. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
msgid "Ready"
msgstr "就緒"
#. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
msgid "Initializing"
msgstr "啟始化中"
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
msgid "Finishing"
msgstr "完成中"
#. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
msgid "Done"
msgstr "完成"
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
msgid "Quitting (without changes)"
msgstr "結束中 (沒有變更)"
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
msgid "yes or no?"
msgstr "「是」或「否」?"
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
msgid "yes"
msgstr "是"
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
msgid "no"
msgstr "否"
@@ -390,7 +390,7 @@
#. 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:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1435
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr "http://en.opensuse.org/Bugs/YaST"
@@ -403,7 +403,7 @@
#. from YaST logs.
#.
#. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
msgid "Installation Error"
msgstr "安裝錯誤"
@@ -430,7 +430,7 @@
msgstr "移除套件 %1 嗎?"
#. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1244
msgid "No workflow defined for this installation mode."
msgstr "沒有為此安裝模式定義的工作流程。"
@@ -445,14 +445,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
msgid "&Continue Installation"
msgstr "繼續安裝(&C)"
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
msgid "&Abort Installation"
msgstr "中止安裝(&A)"
@@ -485,12 +485,12 @@
#. make sure that every workflow is merged only once
#. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
msgid "An internal error occurred when integrating additional workflow."
msgstr "整合附加工作流程時發生內部錯誤。"
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
msgid "The value of %1 is invalid."
msgstr "%1 的值無效。"
@@ -537,7 +537,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:255
#: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
msgid "During Boot"
msgstr "開機時"
@@ -546,7 +546,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:257
#: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
msgid "Manually"
msgstr "手動"
@@ -556,22 +556,22 @@
msgstr "藉由 xinetd"
#. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
msgid "Via &xinetd"
msgstr "藉由 xinetd(&X)"
#. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
msgid "Service Start"
msgstr "服務啟動"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
msgid "Service is running"
msgstr "服務正在執行"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
msgid "Service is not running"
msgstr "服務尚未執行"
@@ -580,7 +580,7 @@
#. %1 is eg. "Start the Service Now"
#. %2 is eg. "Stop the Service Now"
#. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
msgid ""
"<p><b><big>Switch On or Off</big></b><br>\n"
"To start or stop the service immediately, use \n"
@@ -594,7 +594,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:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
msgid ""
"<p>To save all changes and restart the\n"
"service immediately, use <b>%3</b>.</p>\n"
@@ -603,48 +603,48 @@
"服務,請使用<b>「%3」</b>。</p>\n"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
msgid "Start the Service Now"
msgstr "立即啟動服務"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
msgid "Stop the Service Now"
msgstr "立即停止服務"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
msgid "Save Changes and Restart Service Now"
msgstr "立即儲存變更並重新啟動服務"
#. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
msgid "&Start the Service Now"
msgstr "立即啟動服務(&S)"
#. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
msgid "S&top the Service Now"
msgstr "立即停止服務(&T)"
#. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
msgid "S&ave Changes and Restart Service Now"
msgstr "立即儲存變更並重新啟動服務(&A)"
#. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
msgid "Switch On and Off"
msgstr "開啟與關閉"
#. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
msgid "Current Status: "
msgstr "目前狀態:"
#. help text for LDAP enablement widget
#. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
msgid ""
"<p><b><big>LDAP Support</big></b><br>\n"
"To store the settings in LDAP instead of native configuration files,\n"
@@ -655,12 +655,12 @@
"請設為<b>「%1」</b>。</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
msgid "LDAP Support Active"
msgstr "LDAP 主動支援"
#. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
msgid "&LDAP Support Active"
msgstr "LDAP 主動支援(&L)"
@@ -672,7 +672,7 @@
#. push button
#. push button
#. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
#: library/cwm/src/modules/TablePopup.rb:940
#: library/general/src/modules/Label.rb:166
msgid "&Up"
@@ -680,7 +680,7 @@
#. push button
#. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
#: library/cwm/src/modules/TablePopup.rb:942
msgid "&Down"
msgstr "向下(&D)"
@@ -722,12 +722,12 @@
msgstr "指定的檔案已存在。要覆寫它嗎?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
msgid "The TSIG key ID was not specified."
msgstr "未指定 TSIG 金鑰 ID。"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
msgid ""
"The key with the specified ID exists and is used.\n"
"Remove it?"
@@ -736,7 +736,7 @@
"要移除嗎?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
msgid ""
"A key with the specified ID was found\n"
"on your disk. Remove it?"
@@ -745,27 +745,27 @@
"金鑰。要移除嗎?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
msgid "The key will be created now. Continue?"
msgstr "現在將建立金鑰。是否要繼續?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
msgid "Creating the TSIG key failed."
msgstr "建立 TSIG 金鑰失敗。"
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
msgid "The specified file does not exist."
msgstr "指定的檔案不存在。"
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
msgid "The specified file does not contain any TSIG key."
msgstr "指定的檔案不包含任何 TSIG 金鑰。"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
msgid ""
"The specified file contains a TSIG key with the same\n"
"identifier as some of already present keys.\n"
@@ -776,7 +776,7 @@
"將會移除舊的金鑰。是否要繼續?"
#. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
msgid ""
"<p><big><b>TSIG Key Management</b></big><br>\n"
"Use this dialog to manage the TSIG keys.</p>\n"
@@ -785,7 +785,7 @@
"使用這個對話方塊來管理 TSIG 金鑰。</p>\n"
#. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
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"
@@ -796,7 +796,7 @@
"包含金鑰檔案的<b>「檔案名稱」</b>,並按一下<b>「新增」</b>。</p>\n"
#. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
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"
@@ -810,7 +810,7 @@
"<b>「產生」</b>。</p>\n"
#. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
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"
@@ -827,27 +827,27 @@
"停止使用它。</p>\n"
#. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
msgid "Add an Existing TSIG Key"
msgstr "新增現有的 TSIG 金鑰"
#. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
msgid "Create a New TSIG Key"
msgstr "建立新的 TSIG 金鑰"
#. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
msgid "&Key ID"
msgstr "金鑰 ID(&K)"
#. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
msgid "&Generate"
msgstr "產生(&G)"
#. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
msgid "Current TSIG Keys"
msgstr "目前的 TSIG 金鑰"
@@ -855,7 +855,7 @@
#. table header - GPG key ID
#. table header - GPG key ID
#. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
#: library/gpg/src/modules/GPGWidgets.rb:192
#: library/gpg/src/modules/GPGWidgets.rb:224
#: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -863,22 +863,22 @@
msgstr "金鑰 ID"
#. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
msgid "Filename"
msgstr "檔案名稱"
#. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
msgid "&Selected Option"
msgstr "選取的選項(&S)"
#. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
msgid "Current Option: "
msgstr "目前選項:"
#. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
msgid "The selected option is already present."
msgstr "選取的選項已經存在。"
@@ -942,19 +942,19 @@
"在清單中上下移動選項位置。</p>"
#. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
msgid "&Other"
msgstr "其他(&O)"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
msgid "The device is not configured"
msgstr "未設定的設備"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
msgid "Press <B>Edit</B> to configure"
msgstr "按<B>「編輯」</B>以設定"
@@ -1101,9 +1101,91 @@
"<p>在某些環境下,所有或部份\n"
"F 鍵無法使用。</p>"
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+#, fuzzy
+#| msgid "Read Other Settings."
+msgid "Restart After Saving Settings"
+msgstr "讀取其他設定。"
+
+#: library/general/src/lib/ui/service_status.rb:61
+#, fuzzy
+#| msgid "Read Other Settings."
+msgid "Reload After Saving Settings"
+msgstr "讀取其他設定。"
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+#, fuzzy
+#| msgid "Service Start"
+msgid "Service Status"
+msgstr "服務啟動"
+
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:129
+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_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</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
+#: library/general/src/lib/ui/service_status.rb:155
+msgid "Current status:"
+msgstr "目前的狀態:"
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:168
+#, fuzzy
+#| msgid "Operating System Boot"
+msgid "Start During System Boot"
+msgstr "作業系統開機"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:192
+#, fuzzy
+#| msgid "Not running"
+msgid "running"
+msgstr "不在執行中"
+
+#: library/general/src/lib/ui/service_status.rb:194
+#, fuzzy
+#| msgid "S&top now ..."
+msgid "Stop now"
+msgstr "現在停止(&T)..."
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:199
+#, fuzzy
+#| msgid "Stopped"
+msgid "stopped"
+msgstr "已停止"
+
+#: library/general/src/lib/ui/service_status.rb:201
+#, fuzzy
+#| msgid "Start it now?"
+msgid "Start now"
+msgstr "立即啟動它嗎?"
+
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
msgid ""
"Although the path %1 exists, it is not a directory.\n"
"Continue or cancel the operation?\n"
@@ -1113,7 +1195,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:306
+#: library/general/src/modules/FileUtils.rb:300
msgid ""
"The path %1 does not exist.\n"
"Create it now?\n"
@@ -1123,7 +1205,7 @@
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
msgid ""
"Failed to create the directory %1.\n"
"Continue or cancel the current operation?\n"
@@ -1301,7 +1383,7 @@
#. 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:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "跳過(&S)"
@@ -1324,7 +1406,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2221
msgid "&Password"
msgstr "密碼(&P)"
@@ -1547,27 +1629,27 @@
msgstr ""
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
msgid "Really abort the installation?"
msgstr "確定要中止安裝嗎?"
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
msgid "Really abort YaST System Repair?"
msgstr "確定要中止 YaST 系統修復嗎?"
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
msgid "Abort System Repair"
msgstr "中止系統修復"
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
msgid "&Continue System Repair"
msgstr "繼續系統修復(&C)"
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1580,7 +1662,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:766
+#: library/general/src/modules/Popup.rb:759
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1594,7 +1676,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:775
+#: library/general/src/modules/Popup.rb:768
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1605,18 +1687,18 @@
"您將需要重新安裝。"
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
msgid "Really abort?"
msgstr "確定要中止嗎?"
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
msgid "All changes will be lost!"
msgstr "會遺失所有變更!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
msgid "&Details..."
msgstr "詳細資訊(&D)..."
@@ -1644,7 +1726,7 @@
#: 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/network/src/modules/NetworkPopup.rb:90
#: library/types/src/modules/String.rb:101
msgid "Yes"
msgstr "是"
@@ -1655,7 +1737,7 @@
#: 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/network/src/modules/NetworkPopup.rb:89
#: library/types/src/modules/String.rb:101
msgid "No"
msgstr "無"
@@ -1719,21 +1801,21 @@
msgstr "記錄錯誤:%1"
#. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
#, fuzzy
msgid "Warning:"
msgstr "警告:"
#. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
#, fuzzy
msgid "Error:"
msgstr "錯誤:"
#. translators: message summary header
#. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
#, fuzzy
msgid "Message:"
msgstr "訊息:"
@@ -1787,7 +1869,7 @@
msgstr "刪除(&L)"
#. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
msgid "&Variable"
msgstr "變數(&V)"
@@ -1883,7 +1965,7 @@
msgstr "輸入通關密語"
#. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
msgid "Enter Passphrase to Unlock GPG Key %1: "
msgstr "輸入通關密語才可使 GPG 金鑰解除鎖定 %1:"
@@ -1989,6 +2071,234 @@
msgid "Error occurred while reading the log."
msgstr "讀取記錄時發生錯誤。"
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "未知區域"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"'%1' 介面未指定給任何防火牆區域。\n"
+"請執行 YaST2 防火牆並加以指定。\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "外部區域"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "內部區域"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "非受保護區域"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+msgid "TCP"
+msgstr "TCP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+msgid "UDP"
+msgstr "UDP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+msgid "RPC"
+msgstr "RPC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+msgid "IP"
+msgstr "IP"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"介面 '%1' 包含在多個防火牆區域中。\n"
+"繼續組態可能會發生錯誤。\n"
+"\n"
+"建議您離開組態並在\n"
+"檔案 '/etc/sysconfig/SuSEFirewall' 中手動修復它。"
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "啟始化防火牆組態"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "檢查網路設備"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "讀取目前的組態"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "檢查可能發生衝突的服務"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "正在檢查網路設備..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "正在讀取目前的組態..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "正在檢查可能發生衝突的服務..."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "寫入防火牆組態"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "寫入防火牆設定"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "調整防火牆服務"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "正在寫入防火牆設定..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "正在調整防火牆服務..."
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "寫入設定失敗"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+msgid "Unknown protocol (%1)"
+msgstr "未知協定 %1。"
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" => [ ],
+#. "rpc_ports" => [ "portmap", "ypbind" ],
+#. "ip_protocols" => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr ""
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+#, fuzzy
+msgid "Service: %{filename}"
+msgstr "服務 %1"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "GPG 公用金鑰"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "未知的服務 '%1'"
+
#. label
#: library/network/src/modules/CWMFirewallInterfaces.rb:109
msgid "Firewall cannot be adjusted during first stage installation."
@@ -2030,13 +2340,13 @@
msgstr "此介面沒有指定至任何區域"
#. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
msgid "&Network Interfaces with Open Port in Firewall"
msgstr "在防火牆中有開啟埠的網路介面(&N)"
#. Check the INT zone, it's not protected by default
#. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
msgid ""
"These network interfaces assigned to internal network cannot be deselected:\n"
"%1\n"
@@ -2045,7 +2355,7 @@
"%1\n"
#. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -2058,7 +2368,7 @@
"要繼續嗎?"
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces will additionally be open:\n"
@@ -2074,8 +2384,8 @@
#. yes-no popup
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces cannot be opened:\n"
@@ -2090,29 +2400,29 @@
"要繼續嗎?"
#. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
msgid "Network &Interfaces with Open Port in Firewall"
msgstr "在防火牆中有開啟埠的網路介面(&I)"
#. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
msgid "Select &All"
msgstr "全選(&A)"
#. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
msgid "Select &None"
msgstr "全不選(&N)"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
msgid ""
"Error checking service status:\n"
"%{details}"
msgstr ""
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
msgid ""
"Error setting service status:\n"
"%{details}"
@@ -2120,7 +2430,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:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
"To open the firewall to allow access to the service from remote computers,\n"
@@ -2133,7 +2443,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:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
msgid ""
"To select interfaces on which to open the port,\n"
"click <b>%2</b>.<br>"
@@ -2142,7 +2452,7 @@
"按一下<b>「%2」</b>。<br>"
#. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
@@ -2151,46 +2461,48 @@
"此選項。</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
msgid "Open Port in Firewall"
msgstr "在防火牆中開啟埠"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
msgid "Firewall Details"
msgstr "防火牆細節"
#. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
msgid "Open Port in &Firewall"
msgstr "在防火牆中開啟埠(&F)"
#. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
msgid "Firewall &Details..."
msgstr "防火牆細節(&D)..."
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
msgstr "防火牆設定"
#. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
msgid "Firewall is open"
msgstr "防火牆已開啟"
#. pppN must be tried before pN, modem before netcard
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
#: library/system/src/include/hwinfo/classnames.rb:108
#: library/system/src/include/hwinfo/classnames.rb:198
msgid "Modem"
msgstr "數據機"
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
msgid "Network Card"
msgstr "網路卡"
@@ -2198,27 +2510,27 @@
#. Device type label
#. Device type label
#. Device type label
-#: 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:425
#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN"
msgstr "ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL"
msgstr "DSL"
-#: 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
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
msgid "Unknown"
msgstr "不明"
@@ -2228,389 +2540,389 @@
#. are represented as its sub-interfaces.
#. And also we frequently confuse "device" and "interface"
#. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
msgid "Additional Address"
msgstr "其他位址"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet"
msgstr "ARCnet"
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet Network Card"
msgstr "ARCnet 網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
msgid "ATM"
msgstr "ATM"
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
msgid "Asynchronous Transfer Mode (ATM)"
msgstr "非同步轉送模式 (ATM)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
msgid "Bluetooth"
msgstr "藍芽"
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
msgid "Bluetooth Connection"
msgstr "藍芽連線"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond"
msgstr "Bond"
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond Network"
msgstr "Bond 網路"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
msgid "CLAW"
msgstr "CLAW"
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
msgid "Common Link Access for Workstation (CLAW)"
msgstr "工作站公用連結存取 (CLAW)"
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
msgid "ISDN Card"
msgstr "ISDN 卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
#: library/system/src/include/hwinfo/classnames.rb:223
msgid "CTC"
msgstr "CTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
msgid "Channel to Channel Interface (CTC)"
msgstr "通道對通道介面 (CTC)"
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL Connection"
msgstr "DSL 連接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy"
msgstr "虛構"
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy Network Device"
msgstr "虛擬網路設備"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
#: library/system/src/include/hwinfo/classnames.rb:227
msgid "ESCON"
msgstr "ESCON"
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
msgid "Enterprise System Connector (ESCON)"
msgstr "企業系統連接器 (ESCON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
#: library/system/src/include/hwinfo/classnames.rb:220
msgid "Ethernet"
msgstr "乙太網路"
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
msgid "Ethernet Network Card"
msgstr "乙太網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
#: library/system/src/include/hwinfo/classnames.rb:222
msgid "FDDI"
msgstr "FDDI"
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
msgid "FDDI Network Card"
msgstr "FDDI 網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
msgid "FICON"
msgstr "FICON"
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
msgid "Fiberchannel System Connector (FICON)"
msgstr "光纖通道系統連接器 (FICON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
msgid "HIPPI"
msgstr "HIPPI"
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
msgid "HIgh Performance Parallel Interface (HIPPI)"
msgstr "高效能平行介面 (HIPPI)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
msgid "Hipersockets"
msgstr "Hipersockets"
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
msgid "Hipersockets Interface (HSI)"
msgstr "Hipersockets 介面 (HSI)"
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN Connection"
msgstr "ISDN 連線"
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "IrDA"
msgstr "IrDA"
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
msgid "Infrared Network Device"
msgstr "紅外線網路裝置"
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "Infrared Device"
msgstr "紅外線裝置"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
#: library/system/src/include/hwinfo/classnames.rb:224
msgid "IUCV"
msgstr "IUCV"
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
msgid "Inter User Communication Vehicle (IUCV)"
msgstr "內部使用者通訊處 (IUCV)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS"
msgstr "OSA LCS"
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS Network Card"
msgstr "OSA LCS 網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
#: library/system/src/include/hwinfo/classnames.rb:219
msgid "Loopback"
msgstr "迴路"
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
msgid "Loopback Device"
msgstr "回送設備"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
#: library/system/src/include/hwinfo/classnames.rb:228
msgid "Myrinet"
msgstr "Myrinet"
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
msgid "Myrinet Network Card"
msgstr "Myrinet 網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
msgid "Parallel Line"
msgstr "平行線"
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
msgid "Parallel Line Connection"
msgstr "平行線連接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
#: library/system/src/include/hwinfo/classnames.rb:226
msgid "QETH"
msgstr "QETH"
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
msgid "OSA-Express or QDIO Device (QETH)"
msgstr "OSA-Express 或 QDIO 裝置 (QETH)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
msgid "IPv6-in-IPv4"
msgstr "IPv6-in-IPv4"
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
msgid "IPv6-in-IPv4 Encapsulation Device"
msgstr "IPv6-in-IPv4 封裝裝置"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
msgid "Serial Line"
msgstr "序列線"
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
msgid "Serial Line Connection"
msgstr "序列線連接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
msgid "Token Ring"
msgstr "記號環"
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
msgid "Token Ring Network Card"
msgstr "記號環網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB"
msgstr "USB"
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB Network Device"
msgstr "USB 網路裝置"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare"
msgstr "VMWare"
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare Network Device"
msgstr "VMWare 網路裝置"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
msgid "Wireless"
msgstr "無線"
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
msgid "Wireless Network Card"
msgstr "無線網路卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XPNET"
msgstr "XPNET"
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XP Network"
msgstr "XP 網路"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "VLAN"
msgstr "VLAN"
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "Virtual LAN"
msgstr "虛擬網路"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#: library/system/src/include/hwinfo/classnames.rb:89
#: library/system/src/include/hwinfo/classnames.rb:101
msgid "Bridge"
msgstr "橋接器"
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
msgid "Network Bridge"
msgstr "網路橋接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "TUN"
msgstr "TUN"
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "Network TUNnel"
msgstr "網路通道"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "TAP"
msgstr "TAP"
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "Network TAP"
msgstr "網路 TAP"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#: library/system/src/include/hwinfo/classnames.rb:152
msgid "InfiniBand"
msgstr "InfiniBand"
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
msgid "InfiniBand Device"
msgstr "無限寬頻裝置"
#. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
msgid "Unknown device"
msgstr "不明的裝置"
#. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
msgid "DHCP address"
msgstr "DHCP 位址"
#. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
msgid "No IP address assigned"
msgstr "尚未指定 IP 位址"
#. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
msgid "Device Type"
msgstr "設備類型"
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
msgid "Device Name"
msgstr "設備名稱"
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
msgid "IP Address"
msgstr "IP 位址"
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
msgid "Device ID"
msgstr "裝置 ID"
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
msgid "Connected"
msgstr "已連線"
#. label message
#. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
msgid "Scanning for hosts on this LAN..."
msgstr "正在掃描此區域網路上的主機..."
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
msgid "&NFS Servers"
msgstr "NFS 伺服器(&N)"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
msgid "Re&mote Hosts"
msgstr "遠端主機(&M)"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
msgid "&Exported Directories"
msgstr "輸出的目錄(&E)"
#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
msgid ""
"Your network interfaces are currently controlled by NetworkManager\n"
"but the service to configure might not work well with it.\n"
@@ -2625,7 +2937,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:348
+#: library/network/src/modules/NetworkService.rb:346
#, fuzzy
msgid ""
"No running network detected.\n"
@@ -2633,7 +2945,7 @@
"or continue without network."
msgstr "重新啟動安裝並在 Linuxrc 設定網路"
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
#, fuzzy
msgid ""
"No running network detected.\n"
@@ -2655,142 +2967,6 @@
"埠號碼可以是從 0 到 65535 的數字。\n"
"不允許任何空格。\n"
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
-msgid "External Zone"
-msgstr "外部區域"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
-msgid "Internal Zone"
-msgstr "內部區域"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
-msgid "Demilitarized Zone"
-msgstr "非受保護區域"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
-msgid "TCP"
-msgstr "TCP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
-msgid "UDP"
-msgstr "UDP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
-msgid "RPC"
-msgstr "RPC"
-
-#. protocol name
-#: 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:1158
-msgid "Unknown Zone"
-msgstr "未知區域"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"介面 '%1' 包含在多個防火牆區域中。\n"
-"繼續組態可能會發生錯誤。\n"
-"\n"
-"建議您離開組態並在\n"
-"檔案 '/etc/sysconfig/SuSEFirewall' 中手動修復它。"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: 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"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"'%1' 介面未指定給任何防火牆區域。\n"
-"請執行 YaST2 防火牆並加以指定。\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
-msgid "Initializing Firewall Configuration"
-msgstr "啟始化防火牆組態"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
-msgid "Check for network devices"
-msgstr "檢查網路設備"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Read current configuration"
-msgstr "讀取目前的組態"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Check possibly conflicting services"
-msgstr "檢查可能發生衝突的服務"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
-msgid "Checking for network devices..."
-msgstr "正在檢查網路設備..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Reading current configuration..."
-msgstr "正在讀取目前的組態..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Checking possibly conflicting services..."
-msgstr "正在檢查可能發生衝突的服務..."
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
-msgid "Writing Firewall Configuration"
-msgstr "寫入防火牆組態"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
-msgid "Write firewall settings"
-msgstr "寫入防火牆設定"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
-msgid "Adjust firewall service"
-msgstr "調整防火牆服務"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
-msgid "Writing firewall settings..."
-msgstr "正在寫入防火牆設定..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
-msgid "Adjusting firewall service..."
-msgstr "正在調整防火牆服務..."
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
-msgid "Writing settings failed"
-msgstr "寫入設定失敗"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
-msgid "Unknown protocol (%1)"
-msgstr "未知協定 %1。"
-
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
#: library/network/src/modules/SuSEFirewallProposal.rb:167
msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2877,62 +3053,14 @@
msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
msgstr "您正在使用 iSCSI 目標安裝系統,但是您沒有開啟防火牆上所需的通訊埠。"
-#. Returns service definition.
-#. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
-#.
-#. @param [String] service name
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param map <string, list <string> > of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. $[
-#. "tcp_ports" : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports" : [ ],
-#. "rpc_ports" : [ "portmap", "ypbind" ],
-#. "ip_protocols" : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: 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:430
-#, fuzzy
-msgid "Service: %{filename}"
-msgstr "服務 %1"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
-msgid "Unknown service '%1'"
-msgstr "未知的服務 '%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:106
#: library/packages/src/include/packages/common.rb:135
msgid "These packages need to be installed:"
msgstr "需要安裝這些套件:"
+#. the message is followed by list of required packages
#. Popup Text
#: library/packages/src/include/packages/common.rb:109
#: library/packages/src/include/packages/common.rb:137
@@ -2946,35 +3074,76 @@
msgid "&Uninstall"
msgstr "反安裝(&U)"
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
+#, fuzzy
+#| msgid "Checking possibly conflicting services..."
+msgid "Checking file conflicts..."
+msgstr "正在檢查可能發生衝突的服務..."
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
msgid "Downloading package %1 (%2)..."
msgstr "正在下載套件 %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
msgid "Downloading Package"
msgstr "正在下載套件"
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
msgid "Package %1 is broken, integrity check has failed."
msgstr "套件 %1 損壞,完整性檢查失敗。"
#. 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:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
msgid "Retry installation of the package?"
msgstr "重試安裝套件?"
#. 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:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
msgid "Abort the installation?"
msgstr "中止安裝?"
@@ -2983,15 +3152,15 @@
#. 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:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2136
msgid "Error: %1:"
msgstr "錯誤:%1:"
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
msgid ""
"Ignoring a download failure may result in a broken system.\n"
"Verify the system later by running the Software Management module.\n"
@@ -3000,35 +3169,35 @@
"應在稍後執行軟體管理模組檢查系統。\n"
#. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
msgid "Uninstalling package %1 (%2)..."
msgstr "正在解除安裝套件 %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
msgid "Installing package %1 (%2)..."
msgstr "正在安裝套件 %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Uninstalling Package"
msgstr "正在解除安裝套件"
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Installing Package"
msgstr "正在安裝套件"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
msgid "Removal of package %1 failed."
msgstr "無法移除套件 %1。"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
msgid "Installation of package %1 failed."
msgstr "安裝套件 %1 失敗。"
#. 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:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
msgid ""
"Ignoring a package failure may result in a broken system.\n"
"The system should be later verified by running the Software Management module."
@@ -3037,7 +3206,7 @@
"應在稍後執行軟體管理模組檢查系統。"
#. error report
-#: library/packages/src/modules/PackageCallbacks.rb:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
"If the URL is correct, this indicates that the repository content has changed. To \n"
@@ -3052,27 +3221,27 @@
#. 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:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
msgid "Side A"
msgstr "A 面"
#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
msgid "Side B"
msgstr "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:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
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:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
msgid "%1 (Medium %2)"
msgstr "%1 (媒體 %2)"
#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
msgid ""
"Insert\n"
"'%1'"
@@ -3081,7 +3250,7 @@
"'%1'"
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
msgid ""
"Cannot access installation media\n"
"%1\n"
@@ -3094,7 +3263,7 @@
"檢查是否可存取目錄。"
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
msgid ""
"Cannot access installation media \n"
"%1\n"
@@ -3108,83 +3277,83 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1835
msgid "Skip Autorefresh"
msgstr "跳過自動重新整理"
#. 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:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
msgid "&Eject"
msgstr "退出(&E)"
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
msgid "A&utomatically Eject CD or DVD Medium"
msgstr "自動退出 CD/DVD 媒體(&U)"
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
msgid "Retry the installation?"
msgstr "重試安裝?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
msgid "Skip the medium?"
msgstr "略過媒體?"
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
msgid "Ignoring the bad medium..."
msgstr "忽略不良的媒體..."
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
msgid "&URL"
msgstr "URL(&U)"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
msgid "Creating Repository %1"
msgstr "建立套件庫 %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
msgid "An error occurred while creating the repository."
msgstr "建立套件庫時發生錯誤。"
#. 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:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
msgid "Unable to retrieve the remote repository description."
msgstr "無法擷取遠端套件庫描述。"
#. 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:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
msgid "An error occurred while retrieving the new metadata."
msgstr "擷取新的中繼資料時發生錯誤。"
#. 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:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
msgid "The repository is not valid."
msgstr "此套件庫無效。"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
msgid "The repository metadata is invalid."
msgstr "套件庫中繼資料無效。"
@@ -3192,92 +3361,92 @@
#. 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:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2090
msgid "Retry?"
msgstr "重試?"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
msgid "Probing Repository %1"
msgstr "偵測套件庫 %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
msgid "Error occurred while probing the repository."
msgstr "偵測套件庫時發生錯誤。"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
msgid "Repository probing details."
msgstr "套件庫偵測詳細資訊。"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
msgid "Repository metadata is invalid."
msgstr "套件庫中繼資料無效。"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
msgid "Repository %1"
msgstr "套件庫 %1"
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "正在下載 delta RPM 套件 %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
msgid "Downloading Delta RPM package"
msgstr "下載 Delta RPM 套件"
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
msgid "Applying delta RPM package %1..."
msgstr "正在套用 delta RPM 套件 %1..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
msgid "Applying delta RPM package"
msgstr "套用 delta RPM 套件"
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3070
msgid "Package: "
msgstr "套件:"
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
msgid "Starting script %1 (patch %2)..."
msgstr "正在啟動程序檔 %1 (修補程式 %2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
msgid "Running Script"
msgstr "執行程序檔"
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
msgid "Patch: "
msgstr "修補程式:"
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
msgid "Script: "
msgstr "程序檔:"
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
msgid "Output of the Script"
msgstr "程序檔輸出"
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
msgid ""
"Patch: %1\n"
"\n"
@@ -3286,7 +3455,7 @@
"\n"
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3301,36 +3470,36 @@
"某些套件可能會遺失或過期。"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
msgid "&Skip Refresh"
msgstr "跳過重新整理(&S)"
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
msgid "Downloading"
msgstr "正在下載"
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1770
msgid "Downloading: %1"
msgstr "下載中:%1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
msgid "Checking Package Database"
msgstr "正在檢查套件資料庫"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1875
msgid "Rebuilding package database. This process can take some time."
msgstr "正在重建套件資料庫。這個程序需要一點時間。"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1908
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3339,16 +3508,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Converting package database. This process can take some time."
msgstr "正在轉換套件資料庫。這個程序需要一點時間。"
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1954
msgid "Status"
msgstr "狀態"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1978
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3357,12 +3526,12 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2014
msgid "Reading RPM database..."
msgstr "正在讀取 RPM 資料庫..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2023
msgid "Reading Installed Packages"
msgstr "讀取已安裝的套件"
@@ -3373,27 +3542,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
msgid "Scanning RPM database..."
msgstr "正在掃瞄 RPM 資料庫..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2079
msgid "Initialization of the target failed."
msgstr "起始化目標失敗。"
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2171
msgid "RPM database read"
msgstr "讀取 RPM 資料庫"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2203
msgid "User Authentication"
msgstr "使用者驗證"
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2209
msgid ""
"URL: %1\n"
"\n"
@@ -3404,20 +3573,20 @@
"%2"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid "&User Name"
msgstr "使用者名稱(&U)"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3005
msgid "Show &details"
msgstr "顯示詳細資訊(&D)"
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3071
msgid "Size: "
msgstr "大小:"
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3094
msgid "Remaining time to automatic retry: %1"
msgstr "自動重試剩餘時間: %1"
@@ -3496,12 +3665,12 @@
"在套件管理員中手動解決。"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:418
msgid "Installing required packages failed."
msgstr "安裝所需的套件時失敗。"
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:422
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3512,12 +3681,12 @@
"YaST 可能無法正常運作。\n"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
msgid "Cannot continue without installing required packages."
msgstr "沒有安裝必要的套件,無法繼續。"
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
@@ -3526,22 +3695,22 @@
"YaST 可能無法正常運作。\n"
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
msgid "Confirm Package License: %1"
msgstr "確認套件授權: %1"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
msgid "I &Agree"
msgstr "我同意(&A)"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
msgid "I &Disagree"
msgstr "我不同意(&D)"
#. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
"The package in the headline of the dialog requires an explicit confirmation\n"
@@ -3560,7 +3729,7 @@
"若要拒絕套件授權,請按一下<b>「我不同意」</b></p>。"
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3574,7 +3743,7 @@
"\t\t 左邊欄位。若要檢視項目的說明,請從該清單中進行選取。\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3588,7 +3757,7 @@
"\t\t 快顯功能表也可以用來變更所有項目的狀態。\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3600,7 +3769,7 @@
"\t\t 讓您從中檢視並選取個別的軟體套件。\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
msgid ""
"<p>\n"
"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3620,129 +3789,129 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
msgid "Software Selection and System Tasks"
msgstr "軟體選擇和系統任務"
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
msgid "(more)"
msgstr "(更多)"
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
msgid "Installation Successfully Finished"
msgstr "安裝已成功完成"
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
msgid "Package Installation Failed"
msgstr "套件安裝失敗"
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
msgid "Error Message: %1"
msgstr "錯誤訊息: %1"
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
msgid "Failed Packages: %1"
msgstr "失敗的套件: %1"
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
msgid "Installed Packages: %1"
msgstr "已安裝的套件: %1"
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
msgid "Updated Packages: %1"
msgstr "已更新的套件: %1"
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
msgid "Removed Packages: %1"
msgstr "已移除的套件: %1"
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
msgid "Not Installed Packages: %1"
msgstr "未安裝的套件: %1"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
msgid "Packages"
msgstr "套件"
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
msgid "Elapsed Time: %1"
msgstr "已用時間: %1"
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
msgid "Total Installed Size: %1"
msgstr "總共已安裝的大小: %1"
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
msgid "Total Downloaded Size: %1"
msgstr "總共下載的大小: %1"
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
msgid "Statistics"
msgstr "統計"
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:713
msgid "Installation log"
msgstr "安裝紀錄"
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
msgid "Details"
msgstr "細節"
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
#, fuzzy
msgid "After Installing Packages"
msgstr "正在安裝套件"
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Show This Report"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:682
#, fuzzy
msgid "Finish"
msgstr "完成(&F)"
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:683
#, fuzzy
msgid "Continue in the Software Manager"
msgstr "存取軟體套件管理程式失敗"
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:688
#, fuzzy
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr "<P><BIG><B>安裝摘要</B><BIG><BR>這是已安裝套件的摘要。</P>"
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:696
#, fuzzy
msgid "Installation Report"
msgstr "安裝錯誤"
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:718
msgid "Installed Packages"
msgstr "已安裝的套件"
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:723
msgid "Updated Packages"
msgstr "已更新的套件"
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:728
msgid "Removed Packages"
msgstr "已移除的套件"
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:733
msgid "Remaining Packages"
msgstr "剩餘的套件"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:754
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -3754,7 +3923,7 @@
#. popup question, %1 stands for the package name
#. %2 is a repository name
#. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
msgid ""
"The package %1 from repository %2\n"
"%3\n"
@@ -3775,7 +3944,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:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
msgid ""
"The file %1 from repository %2\n"
"%3\n"
@@ -3794,16 +3963,16 @@
"無論如何都要使用它嗎?\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
msgid "Unsigned Package"
msgstr "未經簽署的套件"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
msgid "Unsigned File"
msgstr "未經簽署的檔案"
#. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
msgid ""
"No checksum for package %1 was found in the repository.\n"
"While the package is part of the signed repository, it is not contained \n"
@@ -3820,7 +3989,7 @@
"無論如何都要安裝它嗎?\n"
#. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
msgid ""
"No checksum for file %1 was found in the repository.\n"
"This means that the file is part of the signed repository,\n"
@@ -3837,62 +4006,62 @@
"無論如何都要使用它嗎?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
msgid "No Checksum Found"
msgstr "找不到任何 Checksum"
#. 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:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
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:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
msgid "Fingerprint: %1"
msgstr "指紋檔:%1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
msgid "Name: %1"
msgstr "名稱:%1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
msgid "Created: %1"
msgstr "建立: %1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
msgid "Expires: %1"
msgstr "過期: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
msgid "ID: "
msgstr "ID:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
msgid "Name: "
msgstr "名稱:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
msgid "Fingerprint: "
msgstr "指紋: "
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
msgid "Created: "
msgstr "建立:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
msgid "Expires: "
msgstr "過期: "
#. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
msgid ""
"Package %1 from repository %2\n"
"%3\n"
@@ -3915,7 +4084,7 @@
"無論如何都要安裝它嗎?\n"
#. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
msgid ""
"File %1 from repository %2\n"
"%3\n"
@@ -3938,12 +4107,12 @@
"無論如何都要使用它嗎?\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
msgid "Validation Check Failed"
msgstr "驗證檢查失敗"
#. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
msgid ""
"The package %1 is digitally signed\n"
"with the following unknown GnuPG key: %2.\n"
@@ -3964,7 +4133,7 @@
"無論如何都要安裝它嗎?"
#. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
msgid ""
"The file %1\n"
"is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -3985,12 +4154,12 @@
"無論如何都要使用它嗎?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
msgid "Unknown GnuPG Key"
msgstr "不明的 GnuPG 金鑰"
#. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
msgid ""
"The package %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4013,7 +4182,7 @@
"是最安全的做法。\n"
#. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
msgid ""
"The file %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4036,17 +4205,17 @@
"是最安全的做法。\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
msgid "Signed with Untrusted Public Key"
msgstr "已由不受信任的公開金鑰簽署"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
msgid "&Trust and Import the Key"
msgstr "信任且匯入金鑰(&T)"
#. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
msgid ""
"<p>The owner of the key may distribute updates,\n"
"packages, and package repositories that your system will trust and offer\n"
@@ -4061,7 +4230,7 @@
"對您系統中的軟體有某種程度的控制權。</p>"
#. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
msgid ""
"<p>A warning dialog opens for every package that\n"
"is not signed by a trusted (imported) key. If you do not trust the key,\n"
@@ -4072,7 +4241,7 @@
"由擁有此金鑰者所建立的套件或套件庫將不會被使用。</p>"
#. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
msgid ""
"The following GnuPG key has been found in repository\n"
"%1\n"
@@ -4083,7 +4252,7 @@
"(%2):"
#. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
msgid ""
"You can choose to import it into your keyring of trusted\n"
"public keys, meaning that you trust the owner of the key.\n"
@@ -4096,23 +4265,23 @@
"以及該金鑰確實為該其所擁有。"
#. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
msgid "WARNING: The key has expired!"
msgstr "警告:此金鑰已過期!"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
msgid "Import Untrusted GnuPG Key"
msgstr "匯入不受信任的 GnuPG 金鑰"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
msgid "&Trust"
msgstr "信任(&T)"
#. 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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
msgid ""
"The expected checksum of file %1\n"
"is %2,\n"
@@ -4135,12 +4304,12 @@
"無論如何都要使用它嗎?\n"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
msgid "Wrong Digest"
msgstr "錯誤摘要"
#. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
msgid ""
"The checksum of file %1\n"
"is %2,\n"
@@ -4161,7 +4330,7 @@
"無論如何都要使用它嗎?\n"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
msgid "Unknown Digest"
msgstr "未知摘要"
@@ -4170,79 +4339,79 @@
#. Return the description for the current stage.
#. @return [String] localized string description
#. 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:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
msgid "Installing..."
msgstr "正在安裝..."
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
msgid "Media"
msgstr "媒體"
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
#, fuzzy
msgid "Remaining"
msgstr "剩餘的套件"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
msgid "Time"
msgstr "時間"
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
msgid "Actions performed:"
msgstr "執行的動作:"
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
msgid "<p>Packages are being installed.</p>"
msgstr "<p>套件已被安裝。</p>"
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
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 "<P><B>中止安裝</B> 您可以中止套件的安裝,要中止請按 <B>中止</B> 按鈕。 然而,系統可能會處在不一致或不穩定的狀態,如果基礎系統元件未安裝則可能無法開機。</P>"
#. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:652
+#: library/packages/src/modules/SlideShow.rb:653
#, fuzzy
msgid "%s Release Notes"
msgstr "版本說明(&N)"
#. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
+msgid "&Details"
+msgstr "詳細資訊(&D)"
+
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
msgid "Slide Sho&w"
msgstr "投影片介紹(&W)"
-#. tab
-#: library/packages/src/modules/SlideShow.rb:666
-msgid "&Details"
-msgstr "詳細資訊(&D)"
-
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:708
msgid "Performing Upgrade"
msgstr ""
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:711
#, fuzzy
msgid "Performing Installation"
msgstr "執行安裝"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:746
msgid "Package Installation"
msgstr "套件安裝"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:818
msgid ""
"Do you really want\n"
"to quit the installation?"
@@ -4251,7 +4420,7 @@
"結束安裝嗎?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:830
msgid "Aborted"
msgstr "已中止"
@@ -4846,17 +5015,18 @@
msgid "Bluetooth device"
msgstr "藍芽設備"
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
msgstr ""
-"檔案 %1 已被手動變更。\n"
-"YaST 可能會遺失一些變更。\n"
#. Continue/Cancel question, %1 is a coma separated list of file names
-#: library/system/src/modules/FileChanges.rb:180
+#: library/system/src/modules/FileChanges.rb:178
msgid ""
"Files %1 have been changed manually.\n"
"YaST might lose some of the changes"
@@ -4864,12 +5034,22 @@
"檔案 %1 已被手動變更。\n"
"YaST 可能會遺失一些變更"
-#: library/system/src/modules/FileChanges.rb:193
+#. Continue/Cancel question, %1 is a file name
+#: library/system/src/modules/FileChanges.rb:180
+msgid ""
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
+msgstr ""
+"檔案 %1 已被手動變更。\n"
+"YaST 可能會遺失一些變更。\n"
+
+#: library/system/src/modules/FileChanges.rb:192
msgid "Do not show this message anymore"
msgstr "不要再顯示此訊息"
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
#, fuzzy
#| msgid ""
#| "File %1 has been changed manually.\n"
@@ -4877,22 +5057,12 @@
msgid ""
"File %s has been created manually.\n"
"YaST might lose this file."
-msgstr ""
-"檔案 %1 已被手動變更。\n"
-"YaST 可能會遺失一些變更。\n"
-
-#. 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 ""
+msgid_plural ""
"Files %s have been created manually.\n"
"YaST might lose these files."
-msgstr ""
+msgstr[0] ""
"檔案 %1 已被手動變更。\n"
-"YaST 可能會遺失一些變更"
+"YaST 可能會遺失一些變更。\n"
#. error report
#: library/system/src/modules/Initrd.rb:415
@@ -4900,7 +5070,7 @@
msgstr "建立 initrd 期間發生錯誤。"
#. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
msgid ""
"Reboot your system\n"
"to activate the new kernel.\n"
@@ -4935,7 +5105,7 @@
"十六進位數字。"
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -4946,7 +5116,7 @@
"元件的開始或結束,而且最後一個元件不能以數字開始。"
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -5031,13 +5201,13 @@
#. 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:738
+#: library/types/src/modules/String.rb:730
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
+#: library/types/src/modules/String.rb:846
msgid "%1/s"
msgstr "%1/s"
@@ -5119,8 +5289,8 @@
#. fallback name for the dialog title
#. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
msgid "Module"
msgstr "模組"
@@ -5900,68 +6070,17 @@
"由 DNS 伺服器所管理的 %1 沒有反向區域。\n"
"無法新增主機名稱 %2。"
-#: src/lib/ui/srv_status_component.rb:60
#, fuzzy
-#| msgid "Service Start"
-msgid "Service Status"
-msgstr "服務啟動"
+#~| 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 ""
+#~ "檔案 %1 已被手動變更。\n"
+#~ "YaST 可能會遺失一些變更"
-#. 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 "目前的狀態:"
-
-#. Widget to configure the status on boot
-#: src/lib/ui/srv_status_component.rb:194
-#, fuzzy
-#| msgid "Operating System Boot"
-msgid "Start During System Boot"
-msgstr "作業系統開機"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-#, fuzzy
-#| msgid "Read Other Settings."
-msgid "Reload After Saving Settings"
-msgstr "讀取其他設定。"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-#, fuzzy
-#| msgid "Not running"
-msgid "running"
-msgstr "不在執行中"
-
-#: src/lib/ui/srv_status_component.rb:220
-#, fuzzy
-#| msgid "S&top now ..."
-msgid "Stop now"
-msgstr "現在停止(&T)..."
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:225
-#, fuzzy
-#| msgid "Stopped"
-msgid "stopped"
-msgstr "已停止"
-
-#: src/lib/ui/srv_status_component.rb:227
-#, fuzzy
-#| msgid "Start it now?"
-msgid "Start now"
-msgstr "立即啟動它嗎?"
-
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "無法裝載正確的來源媒體。"
Modified: trunk/yast/zh_TW/po/bootloader.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/bootloader.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/bootloader.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2013-01-16 11:22+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -22,657 +22,548 @@
"X-Generator: Lokalize 1.4\n"
#. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
msgid "Boot loader configuration module"
msgstr "開機載入器組態模組"
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "開機載入器的組態摘要"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "此根分割區為 NFS 類型。開機載入器無法安裝。"
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
-#, fuzzy
-#| msgid "Set a global option"
-msgid "Delete a global option"
-msgstr "設定全域選項"
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "開機載入器設定"
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
-msgid "Set a global option"
-msgstr "設定全域選項"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
+msgid "Device map must contain at least one device"
+msgstr "裝置地圖必須包含至少一台裝置"
-#. command line help text for print action
-#: src/clients/bootloader.rb:75
-msgid "Print value of specified option"
-msgstr "列印指定選項的值"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
+msgid "Disk order settings"
+msgstr "磁碟順序設定"
-#. command line help text for an option
-#: src/clients/bootloader.rb:83
-msgid "The key of the option"
-msgstr "選項的鍵"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "磁碟(&I)"
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The value of the option"
-msgstr "選項的值"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "裝置(&D)"
-#. command line error report
-#: src/clients/bootloader.rb:152
-msgid "Value was not specified."
-msgstr "未指定值。"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+msgid "Selected bootloader partition %s is not available any more."
+msgstr ""
-#. command line error report
-#: src/clients/bootloader.rb:174
-msgid "Option was not specified."
-msgstr "未指定選項。"
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
+msgid "Saving bootloader configuration..."
+msgstr "儲存開機載入器組態..."
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:102
#, fuzzy
-#| msgid "Value: %1"
-msgid "Value: %s"
-msgstr "值:%1"
-
-#. command line error report
-#: src/clients/bootloader.rb:183
-msgid "Specified option does not exist."
-msgstr "指定的選項不存在。"
-
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>開機功能表</b></big><br></p>"
-
-#: src/include/bootloader/grub/helps.rb:24
msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active even\n"
-"if the boot loader is installed in the MBR.</p>"
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
msgstr ""
-"<b>在分割表中設定啟用旗標,以做為開機分割區</b><br>\n"
-"啟用包含開機載入器的分割區。 一般 MBR 程式碼會接著啟動\n"
-"啟用的分割區。 較舊的 BIOS 需要用到一個啟用的分割區,\n"
-"即使開機載入器是安裝在 MBR。</p>"
+"\n"
+"您的系統現在即將關機。%1%2\n"
+"如需詳細資訊,請參閱說明文件中的\n"
+"相關章節。\n"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
-msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
-msgstr ""
-"<p><b>逾時秒數</b><br>\n"
-"指定開啟載入起在預設核心載入前等待多久時間。</p>\n"
+#. 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:115
+msgid "The system will reboot now..."
+msgstr "系統現在將重新開機..."
-#: src/include/bootloader/grub/helps.rb:33
-msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
-msgstr ""
-"<p> 按下<b>「設定為預設」</b>可將選取的區段\n"
-"標示為預設設定。 進行開機時,開機載入器會提供一個開機功能表,\n"
-"並等候使用者選取要開機的核心或是其他\n"
-"作業系統。 如果在逾時之前沒有按任何按鍵,就會為預設 kernel 或\n"
-" OS 進行開機。 開機載入器功能表的區段順序,\n"
-"可以使用<b>「向上」</b>和<b>「向下」</b>按鈕來加以改變。</p>\n"
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "開機載入器(&B)"
-#: src/include/bootloader/grub/helps.rb:41
-msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
msgstr ""
-"<p><b>將一般開機碼寫入 MBR</b>將您的磁碟的主要開機記錄取代為一般碼 (獨立於作業系統外的程式碼,\n"
-"可讓啟用中的分割區開機)。</p>"
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
-"<b>Boot from Root Partition</b>.</p>"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
msgstr ""
-"<p><b>「從開機分割區開機」</b>是其中一個建議的選項,而另一個是\n"
-"<b>「從根分割區開機」</b>。</p>"
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
-"installed on your computer</p>"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
msgstr ""
-"<p><b>「從主開機記錄開機」</b>,當您在電腦上安裝了其他的作業系統,\n"
-"便不建議這個選項</p>"
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
-"to start this section.</p>"
-msgstr ""
-"<p><b>「從根分割區開機」</b>是每當有合適分割區時的\n"
-"建議選項。 請視需要選取<b>「開機載入器選項」</b>中的<b>「在分割區表中設定使用中旗標,以做為開機分割區」</b>和<b>「將一般開機碼寫入 MBR」</b>\n"
-"來更新主開機記錄,或請設定您其他的開機管理員\n"
-"來啟動此區段。</p>"
+#: src/lib/bootloader/generic_widgets.rb:43
+#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr " (預設)"
-#: src/include/bootloader/grub/helps.rb:56
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
-"logical partition and the /boot partition is missing</p>"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
msgstr ""
+"\n"
+"如果您沒有安裝任何開機載入器,系統\n"
+"可能不會啟動。\n"
+" \n"
+" 是否要繼續進行?\n"
-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p><b>「自定開機分割區」</b>可讓您選擇要用來開機的分割區</p>"
-
-#: src/include/bootloader/grub/helps.rb:62
+#: src/lib/bootloader/generic_widgets.rb:75
msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
msgstr ""
-"<p>MD 陣列是由 2 磁碟組成。 <b>啟用 MD 磁碟陣列</b>\n"
-"啟用已寫入 GRUB 到兩個磁碟的 MBR。</p>"
+"<p><b>開機載入器類型</b><br>\n"
+"若要選取是否要安裝開機載入器,以及要安裝哪個開機載入器,\n"
+"請使用<b>「開機載入器」</b>。</p>"
-#: src/include/bootloader/grub/helps.rb:65
-#, fuzzy
-#| msgid ""
-#| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-#| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
-msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
-msgstr ""
-"<p><b>使用序列主控台</b>可讓您設定參數以\n"
-"使用序列控制台。 如需詳細資訊,請參閱 grub 文件 (<code>info grub</code>)。</p>"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "開機載入器類型:%1"
-#: src/include/bootloader/grub/helps.rb:68
+#: src/lib/bootloader/grub2.rb:109
#, 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 (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>"
-msgstr ""
-"<p><b>終端機定義</b></p><br>\n"
-"可定義您想使用的終端機類型。 若是序列終端機 (例如序列主控台),\n"
-"您則需指定 <code>serial</code>。 您也可以將 <code>console</code> 傳送給\n"
-"指令,做為 <code>serial console</code>。 在這種情況下,讓您在其中按下任意鍵的終端機,\n"
-"將獲選為 GRUB 終端機。</p>"
+msgid "Enable Trusted Boot: %1"
+msgstr "啟用 GSS 安全性(&G)"
-#: src/include/bootloader/grub/helps.rb:75
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
-msgstr ""
-"<p><b>「預設區段失敗時採用後援區段」</b>包含區段號碼清單,可在\n"
-"預設區段無法開機時用來開機。</p>"
-
-#: src/include/bootloader/grub/helps.rb:78
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>選取<b>「開機時隱藏功能表」</b>可以隱藏開機功能表</p>"
-
-#: src/include/bootloader/grub/helps.rb:81
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
#, 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>"
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"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>以密碼保護開機載入器</b><br>\n"
-"定義當存取開機選單時所需的密碼。 只有當您在<b>「再次輸入密碼」</b>中輸入密碼時,\n"
-"YaST 才會接受該密碼。</p>"
+#| msgid "Yes"
+msgid "yes"
+msgstr "是"
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
-msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"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.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
msgstr ""
-"<p><big><b>磁碟順序</b></big><br>\n"
-"若要根據 BIOS 的順序來排列磁碟順序,請使用\n"
-"<b>「向上」</b>和<b>「向下」</b>按鈕,來重新排列磁碟順序。\n"
-"要新增磁碟,按 <b>新增</b>。\n"
-"要移除磁碟,按 <b>移除</b>。</p>"
-#: src/include/bootloader/grub/helps.rb:101
-msgid "Boot Loader Locations"
-msgstr "開機載入器位置"
+#: src/lib/bootloader/grub2.rb:116
+msgid "Status Location: %1"
+msgstr "狀態位置: %1"
-#: src/include/bootloader/grub/helps.rb:102
-msgid "Set &active Flag in Partition Table for Boot Partition"
-msgstr "在分割區表中設定啟用旗標以做為開機分割區(&A)"
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "硬碟的順序:%1"
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
-msgid "&Timeout in Seconds"
-msgstr "逾時秒數(&T)"
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
+msgstr " (extended)"
-#: src/include/bootloader/grub/helps.rb:106
-msgid "&Default Boot Section"
-msgstr "預設開機區段(&D)"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
+msgstr " (MBR)"
-#: src/include/bootloader/grub/helps.rb:107
-msgid "Write &generic Boot Code to MBR"
-msgstr "將一般開機碼寫入 MBR(&G)"
+#: src/lib/bootloader/grub2.rb:216
+#, fuzzy
+msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
+msgstr "已啟用由 MBR 開機 (<a href=\"disable_boot_mbr\">停用</a>"
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Custom Boot Partition"
-msgstr "自定開機分割區"
+#: src/lib/bootloader/grub2.rb:220
+#, fuzzy
+msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
+msgstr "已停用由 MBR 開機 (<a href=\"enable_boot_mbr\">啟用</a>"
-#: src/include/bootloader/grub/helps.rb:109
-msgid "Boot from Master Boot Record"
-msgstr "從主開機記錄開機"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+#, fuzzy
+msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
+msgstr "已啟用由 /boot 分割區開機 (<a href=\"disable_boot_boot\">停用</a>"
-#: src/include/bootloader/grub/helps.rb:110
-msgid "Boot from Root Partition"
-msgstr "從根分割區開機"
+#: src/lib/bootloader/grub2.rb:235
+#, fuzzy
+msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
+msgstr "已停用由 /boot 分割區開機 (<a href=\"enable_boot_boot\">啟用</a>"
-#: src/include/bootloader/grub/helps.rb:111
-msgid "Boot from Boot Partition"
-msgstr "從開機分割區開機"
+#: src/lib/bootloader/grub2.rb:241
+#, fuzzy
+msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
+msgstr "已啟用由 \"/\" 分割區開機 (<a href=\"disable_boot_root\">停用</a>"
-#: src/include/bootloader/grub/helps.rb:112
-msgid "Boot from Extended Partition"
-msgstr "從擴充分割區開機"
+#: src/lib/bootloader/grub2.rb:246
+#, fuzzy
+msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
+msgstr "已停用由 \"/\" 分割區開機 (<a href=\"enable_boot_root\">啟用</a>"
-#: src/include/bootloader/grub/helps.rb:113
-msgid "Serial Connection &Parameters"
-msgstr "序列主控台參數(&P)"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:114
-msgid "Fallback Sections if Default fails"
-msgstr "預設區段失敗時採用後援區段"
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
+#, fuzzy
+msgid "Change Location: %s"
+msgstr "變更位置: %1"
-#: src/include/bootloader/grub/helps.rb:115
-msgid "&Hide Menu on Boot"
-msgstr "開機時隱藏選單(&H)"
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
+msgid "&Timeout in Seconds"
+msgstr "逾時秒數(&T)"
-#: src/include/bootloader/grub/helps.rb:116
-msgid "Pa&ssword for the Menu Interface"
-msgstr "選單介面的密碼(&S)"
+#: src/lib/bootloader/grub2_widgets.rb:57
+msgid ""
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
+msgstr ""
+"<p><b>逾時秒數</b><br>\n"
+"指定開啟載入起在預設核心載入前等待多久時間。</p>\n"
-#: src/include/bootloader/grub/helps.rb:117
-msgid "Debugg&ing Flag"
-msgstr "除錯旗標(&I)"
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
+msgid "Set &active Flag in Partition Table for Boot Partition"
+msgstr "在分割區表中設定啟用旗標以做為開機分割區(&A)"
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
-msgid "Prot&ect Boot Loader with Password"
-msgstr "使用密碼保護開機載入器(&E)"
-
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
-msgid "P&rotect Entry Modification Only"
+#: src/lib/bootloader/grub2_widgets.rb:93
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
msgstr ""
+"<b>在分割表中設定啟用旗標,以做為開機分割區</b><br>\n"
+"啟用包含開機載入器的分割區。 一般 MBR 程式碼會接著啟動\n"
+"啟用的分割區。 較舊的 BIOS 需要用到一個啟用的分割區,\n"
+"即使開機載入器是安裝在 MBR。</p>"
-#. text entry
-#: src/include/bootloader/grub/options.rb:85
-msgid "&Password"
-msgstr "密碼(&P)"
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
+msgid "Write &generic Boot Code to MBR"
+msgstr "將一般開機碼寫入 MBR(&G)"
-#. text entry
-#: src/include/bootloader/grub/options.rb:88
-msgid "Re&type Password"
-msgstr "再次輸入密碼(&T)"
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
+msgstr ""
+"<p><b>將一般開機碼寫入 MBR</b>將您的磁碟的主要開機記錄取代為一般碼 (獨立於作業系統外的程式碼,\n"
+"可讓啟用中的分割區開機)。</p>"
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
-msgid "Boot from &Root Partition"
-msgstr "從 Root 分割區開機(&R)"
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
+msgid "&Hide Menu on Boot"
+msgstr "開機時隱藏選單(&H)"
-#: src/include/bootloader/grub/options.rb:224
-msgid "Boo&t from Boot Partition"
-msgstr "從開機分割區開機(&T)"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>選取<b>「開機時隱藏功能表」</b>可以隱藏開機功能表</p>"
-#: src/include/bootloader/grub/options.rb:235
-msgid "C&ustom Boot Partition"
-msgstr "自定開機分割區(&U)"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+#, fuzzy
+#| msgid "Probe Foreign OS"
+msgid "Pro&be Foreign OS"
+msgstr "偵測外來作業系統"
-#: 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 "開機載入器位置"
+#: src/lib/bootloader/grub2_widgets.rb:176
+msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+msgstr "<p><b>偵測外來作業系統</b> 藉由 os-prober 和外來的發行版本進行多重開機 </p>"
-#: src/include/bootloader/grub/options.rb:256
-#: src/include/bootloader/grub/options.rb:286
-#: src/include/bootloader/grub/options.rb:307
-msgid "Boot from &Master Boot Record"
-msgstr "從主開機記錄開機(&M)"
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
+msgid "O&ptional Kernel Command Line Parameter"
+msgstr "選擇性的核心指令行參數(&P)"
-#: src/include/bootloader/grub/options.rb:263
-msgid "Boot from &Extended Partition"
-msgstr "從擴充分割區開機(&E)"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr "<p><b>「選擇性的核心指令行參數」</b>可讓您定義其他要傳送到核心的參數。</p>"
-#: src/include/bootloader/grub/options.rb:312
-msgid "Enable Red&undancy for MD Array"
-msgstr "啟用 MD 磁碟陣列(&U)"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+msgid "&Protective MBR flag"
+msgstr ""
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
-#, fuzzy
-msgid "Boot Code Options"
-msgstr "開機載入器選項"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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 ""
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
-#, fuzzy
-msgid "Kernel Parameters"
-msgstr "新增的 Kernel 參數:%1"
+#. TRANSLATORS: set flag on disk
+#: src/lib/bootloader/grub2_widgets.rb:246
+msgid "set"
+msgstr ""
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
-#, fuzzy
-msgid "Bootloader Options"
-msgstr "開機載入器選項"
+#. TRANSLATORS: remove flag from disk
+#: src/lib/bootloader/grub2_widgets.rb:248
+msgid "remove"
+msgstr "移除"
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-msgid "Boot Loader Options"
-msgstr "開機載入器選項"
+#. TRANSLATORS: do not change flag on disk
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
+msgid "do not change"
+msgstr ""
-#: src/include/bootloader/grub2/dialogs.rb:190
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
#, fuzzy
-msgid "Secure Boot"
-msgstr "安全"
-
-#: src/include/bootloader/grub2/dialogs.rb:196
-#, fuzzy
msgid "Enable &Secure Boot Support"
msgstr "啟用限額支援(&Q)"
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
+#: src/lib/bootloader/grub2_widgets.rb:272
#, fuzzy
-msgid "Boot &Loader Location"
-msgstr "開機載入器位置"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "啟用 GSS 安全性(&G)"
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
-msgid "Choose partition where is boot sequence installed."
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
+#, fuzzy
+msgid "Enable &Trusted Boot Support"
+msgstr "啟用限額支援(&Q)"
+
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
msgstr ""
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
-msgstr "<p><b>「選擇性的核心指令行參數」</b>可讓您定義其他要傳送到核心的參數。</p>"
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
+msgid "Prot&ect Boot Loader with Password"
+msgstr "使用密碼保護開機載入器(&E)"
-#: src/include/bootloader/grub2/helps.rb:26
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
-msgstr "<p><b>「VGA 模式」</b>可定義<i></i>主控台在核心開機時所使用的 VGA 模式</p>"
-
-#: src/include/bootloader/grub2/helps.rb:29
-msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
-msgstr "<p><b>偵測外來作業系統</b> 藉由 os-prober 和外來的發行版本進行多重開機 </p>"
-
-#: 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>"
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
+msgid "P&rotect Entry Modification Only"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:38
-msgid "O&ptional Kernel Command Line Parameter"
-msgstr "選擇性的核心指令行參數(&P)"
-
-#: src/include/bootloader/grub2/helps.rb:39
-msgid "&Vga Mode"
-msgstr "Vga 模式(&V)"
-
-#: src/include/bootloader/grub2/helps.rb:40
-msgid "Probe Foreign OS"
-msgstr "偵測外來作業系統"
-
-#: src/include/bootloader/grub2/helps.rb:41
-msgid "Protective MBR flag"
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
msgstr ""
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2、%3 位元 (模式 %4)"
+#. text entry
+#: src/lib/bootloader/grub2_widgets.rb:339
+msgid "Re&type Password"
+msgstr "再次輸入密碼(&T)"
-#: src/include/bootloader/grub2/options.rb:68
-msgid "Standard 8-pixel font mode."
-msgstr "標準 8-像素字型模式。"
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "密碼不可是空的。"
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-msgid "Text Mode"
-msgstr "文字模式"
-
-#: src/include/bootloader/grub2/options.rb:72
-msgid "Unspecified"
-msgstr "未指定"
-
-#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
-msgid "set"
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
msgstr ""
+"「密碼」和「重新輸入密碼」\n"
+"不符合。請重新輸入密碼。"
-#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
-msgid "remove"
-msgstr "移除"
-
-#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
-msgid "do not change"
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
+#, 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>"
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"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>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
msgstr ""
+"<p><b>以密碼保護開機載入器</b><br>\n"
+"定義當存取開機選單時所需的密碼。 只有當您在<b>「再次輸入密碼」</b>中輸入密碼時,\n"
+"YaST 才會接受該密碼。</p>"
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
-msgid "Autodetect by grub2"
-msgstr "由 grub2 自動偵測"
-
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
msgid "Choose new graphical theme file"
msgstr "選擇新的圖形化主題檔案"
-#: src/include/bootloader/grub2/options.rb:258
+#: src/lib/bootloader/grub2_widgets.rb:498
msgid "Use &graphical console"
msgstr "使用圖形化主控台(&G)"
-#: src/include/bootloader/grub2/options.rb:265
+#: src/lib/bootloader/grub2_widgets.rb:503
msgid "&Console resolution"
msgstr "主控台解析度(&C)"
-#: src/include/bootloader/grub2/options.rb:273
+#: src/lib/bootloader/grub2_widgets.rb:508
msgid "&Console theme"
msgstr "主控台主題(&C)"
-#: src/include/bootloader/grub2/options.rb:292
+#: src/lib/bootloader/grub2_widgets.rb:539
+msgid "Autodetect by grub2"
+msgstr "由 grub2 自動偵測"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
msgid "Use &serial console"
msgstr "使用序列主控台(&S)"
-#: src/include/bootloader/grub2/options.rb:299
+#: src/lib/bootloader/grub2_widgets.rb:554
msgid "&Console arguments"
msgstr "主控台參數(&C)"
-#. 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."
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+msgid "&Default Boot Section"
+msgstr "預設開機區段(&D)"
+
+#: src/lib/bootloader/grub2_widgets.rb:575
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
msgstr ""
+"<p> 按下<b>「設定為預設」</b>可將選取的區段\n"
+"標示為預設設定。 進行開機時,開機載入器會提供一個開機功能表,\n"
+"並等候使用者選取要開機的核心或是其他\n"
+"作業系統。 如果在逾時之前沒有按任何按鍵,就會為預設 kernel 或\n"
+" OS 進行開機。 開機載入器功能表的區段順序,\n"
+"可以使用<b>「向上」</b>和<b>「向下」</b>按鈕來加以改變。</p>\n"
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
-msgid "Select File"
-msgstr "選取檔案"
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "開機載入器位置"
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "此根分割區為 NFS 類型。開機載入器無法安裝。"
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
-msgid "Boot Loader Settings"
-msgstr "開機載入器設定"
+#: src/lib/bootloader/grub2_widgets.rb:692
+msgid "Boo&t from Boot Partition"
+msgstr "從開機分割區開機(&T)"
-#. message
-#: src/include/bootloader/routines/dialogs.rb:142
-msgid "There are no options to set for the current boot loader."
-msgstr "沒有選項可以設定目前的開機載入器。"
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "從根分割區開機"
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
-msgid "&Boot Loader"
-msgstr "開機載入器(&B)"
+#: src/lib/bootloader/grub2_widgets.rb:694
+msgid "Boot from &Master Boot Record"
+msgstr "從主開機記錄開機(&M)"
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
-msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
-msgstr ""
-"\n"
-"如果您沒有安裝任何開機載入器,系統\n"
-"可能不會啟動。\n"
-" \n"
-" 是否要繼續進行?\n"
+#: src/lib/bootloader/grub2_widgets.rb:695
+msgid "Boot from &Extended Partition"
+msgstr "從擴充分割區開機(&E)"
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "編輯組態檔案(&D)"
+#: src/lib/bootloader/grub2_widgets.rb:706
+msgid "C&ustom Boot Partition"
+msgstr "自定開機分割區(&U)"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
-msgid "&Propose New Configuration"
-msgstr "建議新的組態(&P)"
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "磁碟順序"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
-msgid "&Start from Scratch"
-msgstr "重新啟動(&S)"
+#: src/lib/bootloader/grub2_widgets.rb:725
+msgid ""
+"<p><big><b>Disks Order</b></big><br>\n"
+"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.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
+msgstr ""
+"<p><big><b>磁碟順序</b></big><br>\n"
+"若要根據 BIOS 的順序來排列磁碟順序,請使用\n"
+"<b>「向上」</b>和<b>「向下」</b>按鈕,來重新排列磁碟順序。\n"
+"要新增磁碟,按 <b>新增</b>。\n"
+"要移除磁碟,按 <b>移除</b>。</p>"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
-msgid "&Reread Configuration from Disk"
-msgstr "從硬碟重新讀取組態(&R)"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+msgid "&Kernel Parameters"
+msgstr "新增的 Kernel 參數:%1"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
-msgid "Restore MBR of Hard Disk"
-msgstr "還原硬碟的 MBR"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+msgid "Boot Co&de Options"
+msgstr "開機載入器選項"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
-msgid "Write bootloader boot code to disk"
-msgstr "將開機載入器開機碼寫入磁碟"
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+msgid "Boot&loader Options"
+msgstr "開機載入器選項"
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "其他"
+#: src/lib/bootloader/grub2efi.rb:81
+#, fuzzy
+msgid "Enable Secure Boot: %1"
+msgstr "啟用 GSS 安全性(&G)"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
-msgid "MBR restored successfully."
-msgstr "成功還原 MBR。"
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "因為分割區因素,所以無法正確安裝開機載入器。"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Failed to restore MBR."
-msgstr "還原 MBR 失敗。"
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "請勿安裝任何開機載入器"
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
-msgid "Writing bootloader settings failed."
-msgstr "寫入開機載入器設定失敗。"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "開機"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
-msgid "Boot &Loader Options"
-msgstr "開機載入器選項(&L)"
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "開機(&B)"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-msgid "Boot Loader Installation &Details"
-msgstr "開機載入器安裝詳細資訊(&D)"
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "未選取要安裝的開機載入器。您的系統可能無法開機。"
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "因為分割區因素,所以無法正確安裝開機載入器"
+
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
msgid ""
"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
+"Reading current configuration...</P>"
msgstr ""
"<P><BIG><B>開機載入器組態工具</B></BIG><BR>\n"
"可以變更開機載入器的設定。</P>"
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
msgid ""
"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
"Please wait...<br></p>"
@@ -680,649 +571,606 @@
"<P><B><BIG>正在儲存開機載入器組態</BIG></B><BR>\n"
"請稍候...<br></p>"
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the current \n"
-"configuration and propose a new configuration, start from scratch, or reread\n"
-"the configuration saved on your disk. %1</P>"
-msgstr ""
-"<P>透過<B>「其他」</B>按鈕,\n"
-"您就可以手動編輯開機載入器組態檔案、清除目前的\n"
-"組態、建議新的組態、重新啟動,或是重新讀取\n"
-"磁碟所儲存的組態。%1</P>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
+msgstr "不支援硬體平台 %1 和開機載入器 %2 的組合"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+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 ""
-"<P>若要手動編輯開機載入器組態檔案,\n"
-"請按一下<B>「編輯組態檔案」</B>。</P>"
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr ""
-"<P> 在表格中,每個區段代表開機功能表中的\n"
-"一個項目。</P>"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "開機裝置在磁碟陣列種類: %1. 系統可能無法開機。"
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
-msgstr ""
-"<P>按<B>「編輯」</B>會顯示所選取區段的\n"
-"內容。</P>"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
+msgstr "開機裝置在軟體 RAID1。 選擇其他開機載入器位置,例如,主要開機紀錄"
-#. help 3/4
-#: 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"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
-"<P> 按<b>「設定為預設」</b>,將選取區段\n"
-"標示為預設設定。進行開機時,開機載入器會提供\n"
-"開機功能表,並等候使用者選取要開機的 kernel 或是其他\n"
-"OS。如果在逾時之前沒有按任何按鍵,就會為預設 kernel 或\n"
-" OS 進行開機。開機載入器功能表的區段順序,\n"
-"可以使用<B>「向上」</B>和<B>「向下」</B>按鈕來加以改變。</P>"
-#. help 4/4
-#: 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>"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
msgstr ""
-"<P>按<B>「新增」</B>便可建立新的開機載入器區段,\n"
-"而按<B>「刪除」</B>便可刪除選取區段。</P>"
-#. 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:107
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
+#: src/modules/BootSupportCheck.rb:207
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
msgstr ""
-"<p><big><b>開機載入器位置</b></big><br>\n"
-"開機管理員(%1) 可以透過下列方式完成安裝:</p>"
-#. custom bootloader help text, 2 of 7
-#: 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"
-"on the computer.</p>"
-msgstr ""
-"<p>- 使用<b>主開機記錄</b> (MBR)。\n"
-"若電腦上\n"
-"已安裝其他作業系統,則不建議您使用此選項。</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "檢查開機載入器"
-#. custom bootloader help text, 3 of 7
-#: 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"
-"partition. This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- 使用 <tt>/boot</tt> 或 <tt>/</tt> (根) 分割區的\n"
-"<b>「開機磁區」</b>。若有合適的\n"
-"分割區,建議您使用此選項。\n"
-"若有必要,您可以在<b>開機載入器安裝詳細資訊</b>中設定<b>「啟用開機載入分割區」</b>和\n"
-" <b>「將 MBR 取代為一般碼」</b>\n"
-",更新主要開機記錄,或是設定其他開機管理員\n"
-" 以啟動 &product;。</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "讀取分割區"
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- 使用<b>「其他」</b>分割區。在選取這個選項時,\n"
-"考量您的系統限制。</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "載入開機載入器設定"
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>例如,大部分 PC 都會有\n"
-"開機硬碟詞柱不可小於 1024 的\n"
-"BIOS 限制。根據使用的開機管理員,\n"
-"您可能無法從邏輯分割區進行開機。</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "正在檢查開機載入器..."
-#. custom bootloader help text, 7 of 7
-#: 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"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"請在輸入欄位中,輸入分割區的設備名稱 (例如,<tt>/dev/hda3</tt> 或 \n"
-"<tt>/dev/sdb</tt>)。</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "正在讀取分割區..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><b>開機載入器安裝詳細資訊</b><br>\n"
-"若要調整進階開機載入器安裝選項 (例如,設備\n"
-"對應),請按一下<b>「開機載入安裝詳細資訊」</b>。</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "正在載入開機載入器設定..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><b>開機載入器類型</b><br>\n"
-"若要選取是否要安裝開機載入器,以及要安裝哪個開機載入器,\n"
-"請使用<b>「開機載入器」</b>。</p>"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "正在啟始化開機載入器組態"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><b>開機載入器選項</b><br>\n"
-"若要調整例如逾時等開機載入器選項,請按一下\n"
-"<b>「開機載入器選項」</b>。</p>"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "建立 initrd"
-#. help text 1/1
-#: 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"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>進階手動組態</B><BR>\n"
-"請在此處手動編輯開機載入器組態。</P>\n"
-"<P>注意事項:最後的組態檔案可能有不同的縮排。</P>"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
+#, fuzzy
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "儲存開機載入器組態檔案"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b>區段名稱</b><br>\n"
-"使用<b>「區段名稱」</b>,便可指定開機載入器的區段名稱。這個區段名稱\n"
-"必須是獨特名稱。</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "正在建立 initrd..."
-#. help text 1/5
-#: 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>"
-msgstr ""
-"<p><big><b>新區段類型</b></big><br>\n"
-"選取要建立新區段的類型。</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
+#, fuzzy
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "儲存開機載入器組態..."
-#. help text 2/5
-#: 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"
-"selected section.</p>"
-msgstr ""
-"<p>選取<b>「複製選取區段」</b>,便可複製目前選取的\n"
-"區段。接著,修改應該要和\n"
-"此選取區段有所區別的選項。</p>"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "正在儲存開機載入器組態"
-#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:241
-msgid ""
-"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
-"to load and start.</p>"
-msgstr ""
-"<p>選取<b>影像選擇</b>,新增要載入並啟動的新 Linux Kernel 或\n"
-"其他影像。</p>"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "開機載入器的組態摘要"
-#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:245
-msgid ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>選取<b>「Xen 區段」</b>來新增 Linux 核心或其他影像,\n"
-"但是要在 XEN 環境中啟動。</p>"
+#, fuzzy
+#~| msgid "Set a global option"
+#~ msgid "Delete a global option"
+#~ msgstr "設定全域選項"
-#. help text 5/5
-#: 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"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>選取<b>「其他系統 (Chainloader)」</b>,新增將載入並啟動\n"
-"磁碟分割區開機磁區的區段。這個指令可以供其他作業系統\n"
-"進行開機。</p>"
+#~ msgid "Set a global option"
+#~ msgstr "設定全域選項"
-#: src/include/bootloader/routines/helps.rb:254
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>選取<b>選單區段</b>,以新增一個區段\n"
-"來從磁碟的分割區中載入設定檔(開機區段清單)。這個指令是用來使用其他作業系統\n"
-"開機。</p>"
+#~ msgid "Print value of specified option"
+#~ msgstr "列印指定選項的值"
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
-msgid "Order of Hard Disks: %1"
-msgstr "硬碟的順序:%1"
+#~ msgid "The key of the option"
+#~ msgstr "選項的鍵"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:51
-msgid "Do not install any boot loader"
-msgstr "請勿安裝任何開機載入器"
+#~ msgid "The value of the option"
+#~ msgstr "選項的值"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
-msgid "Do Not Install Any Boot Loader"
-msgstr "不安裝任何開機載入器"
+#~ msgid "Value was not specified."
+#~ msgstr "未指定值。"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:60
-msgid "Install the default boot loader"
-msgstr "請安裝預設的開機載入器"
+#~ msgid "Option was not specified."
+#~ msgstr "未指定選項。"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Install Default Boot Loader"
-msgstr "安裝預設的開機載入器"
+#, fuzzy
+#~| msgid "Value: %1"
+#~ msgid "Value: %s"
+#~ msgstr "值:%1"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:68
-msgid "Boot loader"
-msgstr "開機載入器"
+#~ msgid "Specified option does not exist."
+#~ msgstr "指定的選項不存在。"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
-msgid "Boot Loader"
-msgstr "開機載入器"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>開機功能表</b></big><br></p>"
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr ""
-"如果沒有指定開機載入器,\n"
-"就不能使用這項功能。"
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>「從開機分割區開機」</b>是其中一個建議的選項,而另一個是\n"
+#~ "<b>「從根分割區開機」</b>。</p>"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"確定要離開而不儲存開機載入器組態嗎?\n"
-"將會遺失所有的變更。\n"
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr ""
+#~ "<p><b>「從主開機記錄開機」</b>,當您在電腦上安裝了其他的作業系統,\n"
+#~ "便不建議這個選項</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:57
-msgid "The password must not be empty."
-msgstr "密碼不可是空的。"
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "<p><b>「從根分割區開機」</b>是每當有合適分割區時的\n"
+#~ "建議選項。 請視需要選取<b>「開機載入器選項」</b>中的<b>「在分割區表中設定使用中旗標,以做為開機分割區」</b>和<b>「將一般開機碼寫入 MBR」</b>\n"
+#~ "來更新主開機記錄,或請設定您其他的開機管理員\n"
+#~ "來啟動此區段。</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:66
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr ""
-"「密碼」和「重新輸入密碼」\n"
-"不符合。請重新輸入密碼。"
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p><b>「自定開機分割區」</b>可讓您選擇要用來開機的分割區</p>"
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:82
-msgid "%1Set default boot loader location?\n"
-msgstr "%1設定成預設開機載入器位置?\n"
+#~ msgid ""
+#~ "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
+#~ "enable to write GRUB to MBR of both disks.</p>"
+#~ msgstr ""
+#~ "<p>MD 陣列是由 2 磁碟組成。 <b>啟用 MD 磁碟陣列</b>\n"
+#~ "啟用已寫入 GRUB 到兩個磁碟的 MBR。</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:90
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"所選取的名稱已使用。\n"
-"請使用不同的名稱。\n"
+#, fuzzy
+#~| msgid ""
+#~| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+#~ msgid ""
+#~ "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~ "for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p><b>使用序列主控台</b>可讓您設定參數以\n"
+#~ "使用序列控制台。 如需詳細資訊,請參閱 grub 文件 (<code>info grub</code>)。</p>"
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"開機載入器安裝期間\n"
-"發生錯誤。要重試開機載入器組態嗎?\n"
+#, 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 (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>"
+#~ msgstr ""
+#~ "<p><b>終端機定義</b></p><br>\n"
+#~ "可定義您想使用的終端機類型。 若是序列終端機 (例如序列主控台),\n"
+#~ "您則需指定 <code>serial</code>。 您也可以將 <code>console</code> 傳送給\n"
+#~ "指令,做為 <code>serial console</code>。 在這種情況下,讓您在其中按下任意鍵的終端機,\n"
+#~ "將獲選為 GRUB 終端機。</p>"
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"警告!\n"
-"\n"
-"%1 的目前 MBR 現在將會以\n"
-"%2 儲存的 MBR 重新寫入。\n"
-"\n"
-"僅會重新寫入 MBR 中的開機碼。\n"
-"分割區表將維持不變。\n"
-"\n"
-"要繼續嗎?\n"
+#~ msgid ""
+#~ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
+#~ "that will be used for booting in case the default section is unbootable.</p>"
+#~ msgstr ""
+#~ "<p><b>「預設區段失敗時採用後援區段」</b>包含區段號碼清單,可在\n"
+#~ "預設區段無法開機時用來開機。</p>"
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
-msgid "&Yes, Rewrite"
-msgstr "是,重新寫入(&Y)"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "開機載入器位置"
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "因為分割區因素,所以無法正確安裝開機載入器。"
+#~ msgid "Custom Boot Partition"
+#~ msgstr "自定開機分割區"
-#. Represents dialog for modification of device map
-#: src/lib/bootloader/device_map_dialog.rb:53
-msgid "Device map must contain at least one device"
-msgstr "裝置地圖必須包含至少一台裝置"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "從主開機記錄開機"
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
-msgid "Disk order settings"
-msgstr "磁碟順序設定"
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "從開機分割區開機"
-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "磁碟(&I)"
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "從擴充分割區開機"
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "裝置(&D)"
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "序列主控台參數(&P)"
-#. 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 ""
+#~ msgid "Fallback Sections if Default fails"
+#~ 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 ""
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "選單介面的密碼(&S)"
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-msgid "Saving bootloader configuration..."
-msgstr "儲存開機載入器組態..."
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "除錯旗標(&I)"
-#. TRANSLATORS: reboot message
-#. %1 is replaced with additional message from reIPL
-#: src/lib/bootloader/finish_client.rb:145
+#~ msgid "&Password"
+#~ msgstr "密碼(&P)"
+
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "從 Root 分割區開機(&R)"
+
+#~ msgid "Enable Red&undancy for MD Array"
+#~ msgstr "啟用 MD 磁碟陣列(&U)"
+
+#~ msgid "Boot Loader Options"
+#~ msgstr "開機載入器選項"
+
#, fuzzy
-msgid ""
-"\n"
-"Your system will now shut down.%1\n"
-"For details, read the related chapter \n"
-"in the documentation. \n"
-msgstr ""
-"\n"
-"您的系統現在即將關機。%1%2\n"
-"如需詳細資訊,請參閱說明文件中的\n"
-"相關章節。\n"
+#~ msgid "Secure Boot"
+#~ 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 "系統現在將重新開機..."
+#, fuzzy
+#~ msgid "Boot &Loader Location"
+#~ msgstr "開機載入器位置"
-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
-msgid "Booting"
-msgstr "開機"
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>「VGA 模式」</b>可定義<i></i>主控台在核心開機時所使用的 VGA 模式</p>"
-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
-msgid "&Booting"
-msgstr "開機(&B)"
+#~ msgid "&Vga Mode"
+#~ msgstr "Vga 模式(&V)"
-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "未選取要安裝的開機載入器。您的系統可能無法開機。"
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2、%3 位元 (模式 %4)"
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "因為分割區因素,所以無法正確安裝開機載入器"
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "標準 8-像素字型模式。"
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
-#, fuzzy
-msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
-msgstr "已啟用由 MBR 開機 (<a href=\"disable_boot_mbr\">停用</a>"
+#~ msgid "Text Mode"
+#~ msgstr "文字模式"
-#: src/modules/BootGRUB2.rb:172
-#, fuzzy
-msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
-msgstr "已停用由 MBR 開機 (<a href=\"enable_boot_mbr\">啟用</a>"
+#~ msgid "Unspecified"
+#~ msgstr "未指定"
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-#, fuzzy
-msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
-msgstr "已啟用由 /boot 分割區開機 (<a href=\"disable_boot_boot\">停用</a>"
+#~ msgid "Select File"
+#~ msgstr "選取檔案"
-#: src/modules/BootGRUB2.rb:189
-#, fuzzy
-msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
-msgstr "已停用由 /boot 分割區開機 (<a href=\"enable_boot_boot\">啟用</a>"
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "沒有選項可以設定目前的開機載入器。"
-#: src/modules/BootGRUB2.rb:195
-#, fuzzy
-msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
-msgstr "已啟用由 \"/\" 分割區開機 (<a href=\"disable_boot_root\">停用</a>"
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "編輯組態檔案(&D)"
-#: src/modules/BootGRUB2.rb:199
-#, fuzzy
-msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
-msgstr "已停用由 \"/\" 分割區開機 (<a href=\"enable_boot_root\">啟用</a>"
+#~ msgid "&Propose New Configuration"
+#~ msgstr "建議新的組態(&P)"
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
+#~ msgid "&Start from Scratch"
+#~ msgstr "重新啟動(&S)"
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
-#, fuzzy
-msgid "Change Location: %s"
-msgstr "變更位置: %1"
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "從硬碟重新讀取組態(&R)"
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
-msgid "Boot Loader Type: %1"
-msgstr "開機載入器類型:%1"
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "還原硬碟的 MBR"
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
-msgid " (extended)"
-msgstr " (extended)"
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "將開機載入器開機碼寫入磁碟"
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:245
-msgid " (MBR)"
-msgstr " (MBR)"
+#~ msgid "Other"
+#~ msgstr "其他"
-#: src/modules/BootGRUB2.rb:252
-msgid "Status Location: %1"
-msgstr "狀態位置: %1"
+#~ msgid "MBR restored successfully."
+#~ msgstr "成功還原 MBR。"
-#: src/modules/BootGRUB2EFI.rb:108
-#, fuzzy
-msgid "Enable Secure Boot: %1"
-msgstr "啟用 GSS 安全性(&G)"
+#~ msgid "Failed to restore MBR."
+#~ msgstr "還原 MBR 失敗。"
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
-msgid "Unknown bootloader: %1"
-msgstr "不明的開機載入器: %1"
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "寫入開機載入器設定失敗。"
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr "不支援硬體平台 %1 和開機載入器 %2 的組合"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "開機載入器選項(&L)"
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: 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 ""
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "開機載入器安裝詳細資訊(&D)"
-#. 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 "開機裝置在磁碟陣列種類: %1. 系統可能無法開機。"
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr ""
+#~ "<P>透過<B>「其他」</B>按鈕,\n"
+#~ "您就可以手動編輯開機載入器組態檔案、清除目前的\n"
+#~ "組態、建議新的組態、重新啟動,或是重新讀取\n"
+#~ "磁碟所儲存的組態。%1</P>"
-#. 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 "開機裝置在軟體 RAID1。 選擇其他開機載入器位置,例如,主要開機紀錄"
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr ""
+#~ "<P>若要手動編輯開機載入器組態檔案,\n"
+#~ "請按一下<B>「編輯組態檔案」</B>。</P>"
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr ""
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr ""
+#~ "<P> 在表格中,每個區段代表開機功能表中的\n"
+#~ "一個項目。</P>"
-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
-msgstr ""
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr ""
+#~ "<P>按<B>「編輯」</B>會顯示所選取區段的\n"
+#~ "內容。</P>"
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
-msgstr ""
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P> 按<b>「設定為預設」</b>,將選取區段\n"
+#~ "標示為預設設定。進行開機時,開機載入器會提供\n"
+#~ "開機功能表,並等候使用者選取要開機的 kernel 或是其他\n"
+#~ "OS。如果在逾時之前沒有按任何按鍵,就會為預設 kernel 或\n"
+#~ " OS 進行開機。開機載入器功能表的區段順序,\n"
+#~ "可以使用<B>「向上」</B>和<B>「向下」</B>按鈕來加以改變。</P>"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
-msgid "Check boot loader"
-msgstr "檢查開機載入器"
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>按<B>「新增」</B>便可建立新的開機載入器區段,\n"
+#~ "而按<B>「刪除」</B>便可刪除選取區段。</P>"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
-msgid "Read partitioning"
-msgstr "讀取分割區"
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>開機載入器位置</b></big><br>\n"
+#~ "開機管理員(%1) 可以透過下列方式完成安裝:</p>"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
-msgid "Load boot loader settings"
-msgstr "載入開機載入器設定"
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- 使用<b>主開機記錄</b> (MBR)。\n"
+#~ "若電腦上\n"
+#~ "已安裝其他作業系統,則不建議您使用此選項。</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
-msgid "Checking boot loader..."
-msgstr "正在檢查開機載入器..."
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition. This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 使用 <tt>/boot</tt> 或 <tt>/</tt> (根) 分割區的\n"
+#~ "<b>「開機磁區」</b>。若有合適的\n"
+#~ "分割區,建議您使用此選項。\n"
+#~ "若有必要,您可以在<b>開機載入器安裝詳細資訊</b>中設定<b>「啟用開機載入分割區」</b>和\n"
+#~ " <b>「將 MBR 取代為一般碼」</b>\n"
+#~ ",更新主要開機記錄,或是設定其他開機管理員\n"
+#~ " 以啟動 &product;。</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
-msgid "Reading partitioning..."
-msgstr "正在讀取分割區..."
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 使用<b>「其他」</b>分割區。在選取這個選項時,\n"
+#~ "考量您的系統限制。</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
-msgid "Loading boot loader settings..."
-msgstr "正在載入開機載入器設定..."
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>例如,大部分 PC 都會有\n"
+#~ "開機硬碟詞柱不可小於 1024 的\n"
+#~ "BIOS 限制。根據使用的開機管理員,\n"
+#~ "您可能無法從邏輯分割區進行開機。</p>"
-#. dialog header
-#: src/modules/Bootloader.rb:162
-msgid "Initializing Boot Loader Configuration"
-msgstr "正在啟始化開機載入器組態"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "請在輸入欄位中,輸入分割區的設備名稱 (例如,<tt>/dev/hda3</tt> 或 \n"
+#~ "<tt>/dev/sdb</tt>)。</p>"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
-msgid "Create initrd"
-msgstr "建立 initrd"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>開機載入器安裝詳細資訊</b><br>\n"
+#~ "若要調整進階開機載入器安裝選項 (例如,設備\n"
+#~ "對應),請按一下<b>「開機載入安裝詳細資訊」</b>。</p>"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
-msgid "Save boot loader configuration files"
-msgstr "儲存開機載入器組態檔案"
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>開機載入器選項</b><br>\n"
+#~ "若要調整例如逾時等開機載入器選項,請按一下\n"
+#~ "<b>「開機載入器選項」</b>。</p>"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
-msgid "Install boot loader"
-msgstr "安裝開機載入器"
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>進階手動組態</B><BR>\n"
+#~ "請在此處手動編輯開機載入器組態。</P>\n"
+#~ "<P>注意事項:最後的組態檔案可能有不同的縮排。</P>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
-msgid "Creating initrd..."
-msgstr "正在建立 initrd..."
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b>區段名稱</b><br>\n"
+#~ "使用<b>「區段名稱」</b>,便可指定開機載入器的區段名稱。這個區段名稱\n"
+#~ "必須是獨特名稱。</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
-msgid "Saving boot loader configuration files..."
-msgstr "正在儲存開機載入器組態檔案..."
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><big><b>新區段類型</b></big><br>\n"
+#~ "選取要建立新區段的類型。</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
-msgid "Installing boot loader..."
-msgstr "正在安裝開機載入器..."
+#~ 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"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>選取<b>「複製選取區段」</b>,便可複製目前選取的\n"
+#~ "區段。接著,修改應該要和\n"
+#~ "此選取區段有所區別的選項。</p>"
-#. progress line
-#: src/modules/Bootloader.rb:299
-msgid "Saving Boot Loader Configuration"
-msgstr "正在儲存開機載入器組態"
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr ""
+#~ "<p>選取<b>影像選擇</b>,新增要載入並啟動的新 Linux Kernel 或\n"
+#~ "其他影像。</p>"
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr ""
+#~ "<p>選取<b>「Xen 區段」</b>來新增 Linux 核心或其他影像,\n"
+#~ "但是要在 XEN 環境中啟動。</p>"
+
+#~ 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"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>選取<b>「其他系統 (Chainloader)」</b>,新增將載入並啟動\n"
+#~ "磁碟分割區開機磁區的區段。這個指令可以供其他作業系統\n"
+#~ "進行開機。</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>選取<b>選單區段</b>,以新增一個區段\n"
+#~ "來從磁碟的分割區中載入設定檔(開機區段清單)。這個指令是用來使用其他作業系統\n"
+#~ "開機。</p>"
+
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "不安裝任何開機載入器"
+
+#~ msgid "Install the default boot loader"
+#~ msgstr "請安裝預設的開機載入器"
+
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "安裝預設的開機載入器"
+
+#~ msgid "Boot loader"
+#~ msgstr "開機載入器"
+
+#~ msgid "Boot Loader"
+#~ msgstr "開機載入器"
+
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr ""
+#~ "如果沒有指定開機載入器,\n"
+#~ "就不能使用這項功能。"
+
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "確定要離開而不儲存開機載入器組態嗎?\n"
+#~ "將會遺失所有的變更。\n"
+
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "%1設定成預設開機載入器位置?\n"
+
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "所選取的名稱已使用。\n"
+#~ "請使用不同的名稱。\n"
+
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "開機載入器安裝期間\n"
+#~ "發生錯誤。要重試開機載入器組態嗎?\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "警告!\n"
+#~ "\n"
+#~ "%1 的目前 MBR 現在將會以\n"
+#~ "%2 儲存的 MBR 重新寫入。\n"
+#~ "\n"
+#~ "僅會重新寫入 MBR 中的開機碼。\n"
+#~ "分割區表將維持不變。\n"
+#~ "\n"
+#~ "要繼續嗎?\n"
+
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "是,重新寫入(&Y)"
+
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "不明的開機載入器: %1"
+
+#~ msgid "Install boot loader"
+#~ msgstr "安裝開機載入器"
+
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "正在儲存開機載入器組態檔案..."
+
+#~ msgid "Installing boot loader..."
+#~ msgstr "正在安裝開機載入器..."
+
#, fuzzy
#~| msgid "Distribution:"
#~ msgid "D&istributor"
@@ -1355,9 +1203,6 @@
#~ msgid "Section name must be specified."
#~ msgstr "必須指定區段名稱。"
-#~ msgid "Disk Order"
-#~ msgstr "磁碟順序"
-
#~ msgid "Boot Menu"
#~ msgstr "開機功能表"
@@ -1799,9 +1644,6 @@
#~ msgid " (\"/\")"
#~ msgstr " (\"/\")"
-#~ msgid " (default)"
-#~ msgstr " (預設)"
-
#~ msgid "Sections:<br>%1"
#~ msgstr "區段:<br>%1"
@@ -2578,9 +2420,6 @@
#~ msgid "image"
#~ msgstr "影像"
-#~ msgid "Yes"
-#~ msgstr "是"
-
#~ msgid "No"
#~ msgstr "否"
Modified: trunk/yast/zh_TW/po/ca-management.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/ca-management.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/ca-management.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: ca-management\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2011-10-05 20:46+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -139,8 +139,7 @@
#: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
#: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
#: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
msgid "&Password:"
msgstr "密碼(&P):"
@@ -212,8 +211,7 @@
#: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
#: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
#: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
msgid "New passwords do not match."
msgstr "新密碼不符。"
@@ -1908,14 +1906,14 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
msgid "Creating certificate..."
msgstr "正在建立憑證..."
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
@@ -1924,28 +1922,27 @@
"來建立預設憑證。\n"
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
msgid "Finish"
msgstr "完成"
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
msgid "Really save configuration ?"
msgstr "確定要儲存組態?"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
msgid "Exit"
msgstr "離開"
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
msgid "Really exit configuration without saving ?"
msgstr "確定要離開而不儲存組態?"
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
msgid "Details"
msgstr "細節"
@@ -2231,8 +2228,7 @@
msgid "LDAP P&assword:"
msgstr "LDAP 密碼(&A):"
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
#: src/include/ca-management/util.rb:1388
msgid "Certificate &Password:"
msgstr "憑證密碼(&P):"
@@ -2280,28 +2276,23 @@
msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
msgstr "PEM 格式的憑證和未加密的金鑰(&R)"
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
msgid "C&ertificate and the Key Encrypted in PEM Format"
msgstr "PEM 格式的憑證和加密的金鑰(&E)"
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
msgid "&Certificate in DER Format"
msgstr "DER 格式的憑證(&C)"
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
msgid "Cer&tificate and the Key in PKCS12 Format"
msgstr "PKCS12 格式的憑證和金鑰(&T)"
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
msgid "&Like PKCS12 and Include the CA Chain"
msgstr "如同 PKCS12 且包括 CA 鏈(&L)"
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
msgid "&New Password"
msgstr "新密碼(&N)"
Modified: trunk/yast/zh_TW/po/cio.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/cio.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/cio.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-06-23 15:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -43,13 +43,13 @@
msgstr "已使用"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "否"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "yes"
msgstr "是"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "否"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
msgid "Filter channels"
Modified: trunk/yast/zh_TW/po/cluster.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/cluster.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/cluster.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -144,7 +144,7 @@
msgstr "設定音效卡組態時,播放測試聲音"
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
msgid "The Multicast Address has to be fulfilled"
msgstr ""
@@ -174,7 +174,7 @@
msgstr "網路位址(&A):"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
#, fuzzy
msgid "Multicast Address:"
msgstr "最後一個 IP 位址:"
@@ -230,136 +230,136 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
#, fuzzy
msgid "Enable Security Auth"
msgstr "啟用 GSS 安全性(&G)"
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr ""
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr ""
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
msgid "Running"
msgstr "執行中"
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
msgid "Not running"
msgstr "不在執行中"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
msgid "Booting"
msgstr "開機"
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
#, fuzzy
msgid "On -- Start pacemaker during boot"
msgstr "開啟 -- 開機時啟動服務"
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
#, fuzzy
msgid "Off -- Start pacemaker manually"
msgstr "關閉 -- 手動啟動服務"
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
msgid "Switch On and Off"
msgstr "開啟與關閉"
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
msgid "Current Status: "
msgstr "目前狀態:"
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
#, fuzzy
msgid "Start pacemaker Now"
msgstr "馬上啟動 Squid"
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
#, fuzzy
msgid "Stop pacemaker Now"
msgstr "立即停止防火牆"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
#, fuzzy
msgid "Sync Host"
msgstr "主要主機"
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Add"
msgstr "新增"
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
#, fuzzy
msgid "Del"
msgstr "延遲"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Edit"
msgstr "編輯"
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
#, fuzzy
msgid "Sync File"
msgstr "選取檔案"
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
#, fuzzy
msgid "Add Suggested Files"
msgstr "建議的 fstab 行"
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
msgid "Generate Pre-Shared-Keys"
msgstr ""
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
msgid "Csync2 Status Unknown"
msgstr ""
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
msgid "Turn csync2 ON"
msgstr ""
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 OFF"
msgstr ""
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
#, fuzzy
msgid "Enter a hostname"
msgstr "請輸入使用者名稱。"
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
#, fuzzy
msgid "Edit the hostname"
msgstr "寫入主機名稱。"
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
#, fuzzy
msgid "Enter a filename to synchronize"
msgstr "輸入檔案名稱"
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
#, fuzzy
msgid "Edit the filename"
msgstr "輸入檔案名稱"
#. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
#, fuzzy
msgid ""
"Key file %1 already exist.\n"
@@ -369,48 +369,48 @@
"想要改寫它嗎?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
#, fuzzy
msgid "Delete key file %1 failed."
msgstr "分析金鑰檔案失敗。"
#. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
msgstr ""
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
#, fuzzy
msgid "Key generation failed."
msgstr "影像建立失敗。"
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
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:1358
+#: src/include/cluster/dialogs.rb:1360
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
#, fuzzy
#| msgid "The value for pos must be a positive integer."
msgid "The Group Number must be a positive integer"
@@ -516,105 +516,105 @@
msgstr "正在啟始化..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
#, fuzzy
msgid "Initializing cluster Configuration"
msgstr "正在啟始化印表機組態"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
msgid "Read the database"
msgstr "讀取資料庫"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
msgid "Read the previous settings"
msgstr "讀取先前的設定"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
#, fuzzy
msgid "Read SuSEFirewall Settings"
msgstr "讀取防火牆設定。"
#. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
msgid "Reading the database..."
msgstr "正在讀取資料庫..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
msgid "Reading the previous settings..."
msgstr "正在讀取先前的設定..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
#, fuzzy
msgid "Reading SuSEFirewall settings..."
msgstr "正在讀取防火牆設定..."
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
msgid "Finished"
msgstr "已完成"
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
#, fuzzy
msgid "Cannot install required package"
msgstr "無法安裝所需要的套件"
#. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
#, fuzzy
msgid "Cannot load existing configuration"
msgstr "變更現有組態"
#. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
msgid "Cannot read database1."
msgstr "無法讀取資料庫1。"
#. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
msgid "Cannot read database2."
msgstr "無法讀取資料庫2。"
#. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
msgid "Cannot detect devices."
msgstr "無法偵測裝置。"
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
#, fuzzy
msgid "Saving cluster Configuration"
msgstr "正在儲存組態"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
msgid "Write the settings"
msgstr "寫入設定"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
#, fuzzy
msgid "Save changes to SuSEFirewall"
msgstr "儲存設定檔的變更"
#. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
msgid "Writing the settings..."
msgstr "正在寫入設定..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
#, fuzzy
msgid "Saving changes to SuSEFirewall..."
msgstr "正在儲存檔案變更..."
#. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "無法寫入設定。"
Modified: trunk/yast/zh_TW/po/control.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/control.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/control.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2012-05-17 08:53+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -20,315 +20,658 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.4\n"
-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
#, fuzzy
-#| msgid ""
-#| "\n"
-#| "<p><b>Congratulations!</b></p>\n"
-#| "<p>The installation of openSUSE on your machine is complete.\n"
-#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-#| "<p>Visit us at %1.</p>\n"
-#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-#| "\t "
msgid ""
"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-" "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
msgstr ""
"\n"
-"<p><b>恭喜!</b></p>\n"
-"<p>您機器上的 openSUSE 安裝已完成。\n"
-"按一下<b>「完成」</b>之後,您可以登入系統。</p>\n"
-"<p>請造訪我們的網站 %1。</p>\n"
-"<p>Have a lot of fun!<br>您的 openSUSE 開發小組</p>\n"
-"\t "
+"<p>\n"
+"安裝已經成功完成。\n"
+"您的系統已可以開始使用。\n"
+"按一下「完成」便可登入系統。\n"
+"</p>\n"
+"<p>\n"
+"請造訪我們的網站,網址是 http://www.suse.com/。\n"
+"</p>\n"
+"\t"
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments. The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-"桌面環境為您的電腦提供了圖形使用介面,\n"
-"以及成套的應用程式,讓您能擁有 email,\n"
-"網路瀏覽,辦公室產品,遊戲以及工具來\n"
-"管理您的電腦。\n"
-"\n"
-"openSUSE 提供了桌面環境的選擇。最廣泛使用\n"
-"桌面環境是 GNOME 和 KDE,openSUSE 對他們\n"
-"提供了相同的支援。這兩個桌面環境都非常容易\n"
-"使用,並且高度整合,還有吸引人的外表與感覺。\n"
-"每個桌面環境都有獨特的風格,所以個人口味會\n"
-"決定哪個才是最適合您的桌面。"
+#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
+msgid "CIM Server"
+msgstr "CIM 伺服器"
-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
-msgstr "GNOME 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Desktop"
-msgstr "KDE 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:23
-msgid "XFCE Desktop"
-msgstr "XFCE 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "LXDE Desktop"
-msgstr "LXDE 桌面"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr "最小 X 視窗"
-
-#: control/control.openSUSE.glade.translations.glade:26
-#, fuzzy
-#| msgid "Alternate Desktops"
-msgid "Enlightenment Desktop"
-msgstr "替代桌面"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr "最小伺服器選擇 (文字模式)"
-
-#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
msgid "Installation Settings"
msgstr "安裝設定"
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
+msgid "Overview"
+msgstr "綜覽"
+
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+msgid "Expert"
+msgstr "專家"
+
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
msgid "Live Installation Settings"
msgstr "Live 安裝設定"
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
msgid "Update Settings"
msgstr "更新設定"
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Network Configuration"
msgstr "網路組態"
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
msgid "Hardware Configuration"
msgstr "硬體組態"
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
msgid "Preparation"
msgstr "準備"
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
#, fuzzy
msgid "Load linuxrc Network Configuration"
msgstr "網路組態"
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
#, fuzzy
msgid "Network Autosetup"
msgstr "網路啟用"
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
msgid "Welcome"
msgstr "歡迎"
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
msgid "Network Activation"
msgstr "網路啟用"
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
msgid "Disk Activation"
msgstr "磁碟啟用"
-#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
msgid "System Analysis"
msgstr "系統分析"
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
+#, fuzzy
+#| msgid "Online Update"
+msgid "Installer Update"
+msgstr "線上更新"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
+msgid "Add-On Products"
+msgstr "附加產品"
+
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
msgid "Disk"
msgstr "磁碟"
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:69
msgid "Time Zone"
msgstr "時區"
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
-msgid "Online Repositories"
-msgstr "線上套件庫"
-
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
-msgid "Add-On Products"
-msgstr "附加產品"
-
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "桌面選項"
-
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
-#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
msgid "User Settings"
msgstr "使用者設定"
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "安裝"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
msgid "Installation Overview"
msgstr "安裝總覽"
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
#: control/control.openSUSE.glade.translations.glade:54
#: control/control.openSUSE.glade.translations.glade:55
#: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
#: control/control.openSUSE.glade.translations.glade:58
#: control/control.openSUSE.glade.translations.glade:59
#: control/control.openSUSE.glade.translations.glade:60
#: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
#: control/control.openSUSE.glade.translations.glade:75
#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
msgid "Perform Installation"
msgstr "執行安裝"
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "安裝"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
+msgid "Installation"
+msgstr "安裝"
+
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
msgid "System for Update"
msgstr "要更新的系統"
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
msgid "Update"
msgstr "更新"
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
+msgid "Update Summary"
+msgstr "更新摘要"
+
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:122
#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
msgid "Perform Update"
msgstr "執行更新"
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "組態"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
msgid "Base Installation"
msgstr "基本安裝"
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
msgid "AutoYaST Settings"
msgstr "AutoYaST 設定"
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
+msgid "Configuration"
+msgstr "組態"
+
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
msgid "System Configuration"
msgstr "系統組態"
+#: control/control.SLES.glade.translations.glade:3
#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<p>\n"
-#~ "The installation has completed successfully.\n"
-#~ "Your system is ready for use.\n"
-#~ "Click Finish to log in to the system.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ "<p>\n"
-#~ "安裝已經成功完成。\n"
-#~ "您的系統已可以開始使用。\n"
-#~ "按一下「完成」便可登入系統。\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "請造訪我們的網站,網址是 http://www.suse.com/。\n"
-#~ "</p>\n"
-#~ "\t"
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
+msgstr ""
+"\n"
+"<p>\n"
+"安裝已經成功完成。\n"
+"您的系統已可以開始使用。\n"
+"按一下「完成」便可登入系統。\n"
+"</p>\n"
+"<p>\n"
+"請造訪我們的網站,網址是 http://www.suse.com/。\n"
+"</p>\n"
+"\t"
-#~ msgid "CIM Server"
-#~ msgstr "CIM 伺服器"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
+#, fuzzy
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "要更新的系統"
-#~ msgid "Overview"
-#~ msgstr "綜覽"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
-#~ msgid "Expert"
-#~ msgstr "專家"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
-#~ msgid "Network Services Configuration"
-#~ msgstr "網路服務組態"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
-#~ msgid "Installation Summary"
-#~ msgstr "安裝摘要"
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
-#~ msgid "Update Summary"
-#~ msgstr "更新摘要"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
+msgid "KVM Virtualization Host"
+msgstr ""
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+#| msgid "Initialization..."
+msgid "Xen Virtualization Host"
+msgstr "啟始化..."
+
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:48
+msgid "Network Services Configuration"
+msgstr "網路服務組態"
+
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+msgid "Load Linuxrc Network Configuration"
+msgstr "網路組態"
+
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "安裝摘要"
+
+#: control/control.openSUSE.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b>Congratulations!</b></p>\n"
+#| "<p>The installation of openSUSE on your machine is complete.\n"
+#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+#| "<p>Visit us at %1.</p>\n"
+#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+#| "\t "
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+"\n"
+"<p><b>恭喜!</b></p>\n"
+"<p>您機器上的 openSUSE 安裝已完成。\n"
+"按一下<b>「完成」</b>之後,您可以登入系統。</p>\n"
+"<p>請造訪我們的網站 %1。</p>\n"
+"<p>Have a lot of fun!<br>您的 openSUSE 開發小組</p>\n"
+"\t "
+
+#: control/control.openSUSE.glade.translations.glade:10
+#, fuzzy
+#| msgid ""
+#| "The desktop environment on your computer provides the graphical user\n"
+#| "interface for your computer, as well as a suite of applications for\n"
+#| "email, Web browsing, office productivity, games, and utilities to\n"
+#| "manage your computer.\n"
+#| "\n"
+#| "openSUSE offers a choice of desktop environments. The most widely\n"
+#| "used desktop environments are GNOME and KDE, and they are equally\n"
+#| "supported under openSUSE. Both desktop environments are easy to use,\n"
+#| "highly integrated, and have an attractive look and feel. Each desktop\n"
+#| "environment has a distinct style, so personal taste determines which\n"
+#| "is the most appropriate desktop for you."
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"桌面環境為您的電腦提供了圖形使用介面,\n"
+"以及成套的應用程式,讓您能擁有 email,\n"
+"網路瀏覽,辦公室產品,遊戲以及工具來\n"
+"管理您的電腦。\n"
+"\n"
+"openSUSE 提供了桌面環境的選擇。最廣泛使用\n"
+"桌面環境是 GNOME 和 KDE,openSUSE 對他們\n"
+"提供了相同的支援。這兩個桌面環境都非常容易\n"
+"使用,並且高度整合,還有吸引人的外表與感覺。\n"
+"每個桌面環境都有獨特的風格,所以個人口味會\n"
+"決定哪個才是最適合您的桌面。"
+
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "GNOME 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Plasma Desktop"
+msgstr "KDE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+#| msgid "Minimal Server Selection (Text Mode)"
+msgid "Server (Text Mode)"
+msgstr "最小伺服器選擇 (文字模式)"
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+#| msgid "XFCE Desktop"
+msgid "Xfce Desktop"
+msgstr "XFCE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "LXDE Desktop"
+msgstr "LXDE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr "最小 X 視窗"
+
+#: control/control.openSUSE.glade.translations.glade:27
+#, fuzzy
+#| msgid "Alternate Desktops"
+msgid "Enlightenment Desktop"
+msgstr "替代桌面"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "最小伺服器選擇 (文字模式)"
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+msgid "Online Repositories"
+msgstr "線上套件庫"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "桌面選項"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "安裝附加產品"
@@ -358,9 +701,6 @@
#~ "</p>\n"
#~ "\t"
-#~ msgid "Initialization..."
-#~ msgstr "啟始化..."
-
#~ msgid "Configuring network..."
#~ msgstr "正在設定網路..."
@@ -388,9 +728,6 @@
#~ msgid "Customer Center"
#~ msgstr "客戶中心"
-#~ msgid "Online Update"
-#~ msgstr "線上更新"
-
#~ msgid "Release Notes"
#~ msgstr "版本說明"
Modified: trunk/yast/zh_TW/po/country.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/country.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/country.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2013-01-16 11:27+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -663,7 +663,9 @@
#. command line help text for 'set hwclock' option
#: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
msgstr "硬體時鐘的新值"
#. summary label
@@ -850,51 +852,51 @@
"無效的日期 (DD-MM-YYYY) %1。\n"
"請輸入正確的日期。\n"
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
#, fuzzy
msgid "Other &Settings..."
msgstr "進階設定(&X)..."
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
msgid "Date and Time (NTP is configured)"
msgstr "日期與時間 (NTP 已設定)"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
msgid "Date and Time"
msgstr "日期和時間"
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
msgid "&Hardware Clock Set to UTC"
msgstr "硬體時鐘設為 UTC(&H)"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
msgid "&Region"
msgstr "區域(&R)"
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
msgid "Time &Zone"
msgstr "時區(&Z)"
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
#, fuzzy
msgid "Date and Time:"
msgstr "日期和時間"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -903,7 +905,7 @@
"<p><b><big>時區和時鐘設定</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -918,7 +920,7 @@
"</p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -929,12 +931,12 @@
"</p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
msgid "Clock and Time Zone"
msgstr "時鐘和時區"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
msgid "Select a valid time zone."
msgstr "請選取有效的時區。"
@@ -1022,181 +1024,188 @@
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "西班牙文 (拉丁美洲)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Italian"
msgstr "義大利文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese"
msgstr "葡萄牙文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil)"
msgstr "葡萄牙文 (巴西)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Portuguese (Brazil -- US accents)"
msgstr "葡萄牙文 (巴西 -- 美國腔)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Greek"
msgstr "希臘文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Dutch"
msgstr "荷蘭文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Danish"
msgstr "丹麥文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Norwegian"
msgstr "挪威文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Swedish"
msgstr "瑞典文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Finnish"
msgstr "芬蘭文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
msgid "Czech"
msgstr "捷克文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
msgid "Czech (qwerty)"
msgstr "捷克文 (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
msgid "Slovak"
msgstr "斯洛伐克文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
msgid "Slovak (qwerty)"
msgstr "斯洛伐克文 (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
msgid "Slovene"
msgstr "斯洛維尼亞文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "匈牙利文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "波蘭文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "俄文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "塞爾維亞文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "愛沙尼亞文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "立陶宛文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "土耳其文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "克羅埃西亞文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "日文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "比利時文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "Dvorak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "冰島文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "烏克蘭文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "高棉文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "韓文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "阿拉伯"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "塔吉克語"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "繁體中文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "簡體中文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "羅馬尼亞文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr "美國國際"
Modified: trunk/yast/zh_TW/po/crowbar.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/crowbar.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/crowbar.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -23,19 +23,9 @@
msgid "Configuration of crowbar"
msgstr "掃描器的組態"
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr ""
-
#. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr ""
-
-#. target platform name
#: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
+msgid "SLES 12 SP1"
msgstr ""
#. combobox label
@@ -49,11 +39,11 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough 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"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-…</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
@@ -189,32 +179,35 @@
msgstr "IP 位址(&I)"
#. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
msgid "Name"
msgstr "名稱"
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
msgid "URL"
msgstr "URL"
#. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
#, fuzzy
#| msgid "User Found Error"
msgid "Ask On Error"
msgstr "使用者發現錯誤"
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
#, fuzzy
#| msgid "Target Name"
msgid "Target Platform"
msgstr "目標名稱"
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
#. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
#, fuzzy
#| msgid ""
#| "Configuration name %1 already exists.\n"
@@ -227,89 +220,96 @@
"請選取另一個。"
#. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
#, fuzzy
#| msgid "LDAP Server &URL"
msgid "Server &URL"
msgstr "LDAP 伺服器 URL(&U)"
#. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
#, fuzzy
#| msgid "&Repository Name"
msgid "Repository Name"
msgstr "套件庫名稱"
#. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
#, fuzzy
#| msgid "User Found Error"
msgid "&Ask On Error"
msgstr "使用者發現錯誤"
#. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
#, fuzzy
#| msgid "Repository URL"
msgid "Repository &URL"
msgstr "套件庫 URL"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
#, fuzzy
#| msgid "Add Repository"
msgid "A&dd Repository"
msgstr "新增套件庫"
#. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
#, fuzzy
#| msgid "Remote WINS Server"
+msgid "Local SMT Server"
+msgstr "遠端 WINS 伺服器"
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
+#, fuzzy
+#| msgid "Remote WINS Server"
msgid "Remote SMT Server"
msgstr "遠端 WINS 伺服器"
#. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
#, fuzzy
#| msgid "Finger Server"
msgid "SUSE Manager Server"
msgstr "Finger 伺服器"
#. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
msgid "Custom"
msgstr "自訂"
#. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
msgid "User Name"
msgstr "使用者名稱"
#. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
msgid "Password"
msgstr "密碼"
#. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
#, fuzzy
msgid "Repeat the Password"
msgstr "重新輸入密碼(&P)"
#. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
#, fuzzy
#| msgid "Server name cannot be empty."
msgid "User name cannot be empty."
msgstr "伺服器名稱不能是空的。"
#. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -318,7 +318,7 @@
"請再試一次。"
#. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
#, fuzzy
#| msgid ""
#| "Configuration name %1 already exists.\n"
@@ -331,19 +331,19 @@
"請選取另一個。"
#. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
#, fuzzy
#| msgid "The entered URL is not valid."
msgid "The interface format '%1' is not valid"
msgstr "所輸入的 URL 無效。"
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
msgid "disabled"
msgstr "已停用"
#. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
#, fuzzy
msgid ""
"The netmask '%1' is invalid.\n"
@@ -352,7 +352,7 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
#, fuzzy
msgid ""
"The IP address '%1' is invalid.\n"
@@ -360,7 +360,7 @@
msgstr "IP 位址無效。"
#. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
#, fuzzy
msgid ""
"The router address '%1' is invalid.\n"
@@ -368,13 +368,13 @@
msgstr "遠端 IP 位址無效。"
#. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
#, fuzzy
msgid "The router address '%1' is not part of network '%2'."
msgstr "伺服器名稱 '%1' 在網路上可被識別。"
#. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
#, fuzzy
msgid "The IP address '%1' is not part of network '%2'."
msgstr ""
@@ -382,25 +382,25 @@
"目前網路 %2/%3。\n"
#. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
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:1335
+#: src/include/crowbar/complex.rb:1326
#, fuzzy
msgid "Min IP Address"
msgstr "最小 IP 位址(&I)"
#. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
#, fuzzy
msgid "Max IP Address"
msgstr "最大 IP 位址(&X)"
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
#, fuzzy
msgid "The address '%1' is not part of network '%2'."
msgstr ""
@@ -408,55 +408,55 @@
"目前網路 %2/%3。\n"
#. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
msgid "The lowest address must be lower than the highest one."
msgstr "最低的位址必須低於最高的位址。"
#. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
msgid "Ranges '%1' and '%2' are overlapping."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
#, fuzzy
#| msgid "User Settings"
msgid "&User Settings"
msgstr "使用者設定"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
#, fuzzy
#| msgid "Network Mode"
msgid "N&etwork Mode"
msgstr "網路模式"
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
#, fuzzy
#| msgid "Bond Network"
msgid "Bastion Network"
msgstr "Bond 網路"
#. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
#, fuzzy
msgid "Net&works"
msgstr "網路"
#. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
#, fuzzy
#| msgid "Repositories"
msgid "Re&positories"
msgstr "套件庫"
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
msgid ""
"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
@@ -465,7 +465,7 @@
msgstr ""
#. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
#, fuzzy
msgid "Crowbar Configuration Overview"
msgstr "CD 建立程式組態綜覽"
@@ -519,41 +519,41 @@
msgstr "正在啟始化..."
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
#, fuzzy
msgid "Initializing crowbar Configuration"
msgstr "正在啟始化掃描器組態"
#. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
#, fuzzy
msgid "Read the configuraton"
msgstr "讀取組態"
#. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
msgid "Reading the configuration..."
msgstr "正在讀取組態..."
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
msgid "Finished"
msgstr "已完成"
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
#, fuzzy
msgid "Saving crowbar Configuration"
msgstr "正在儲存代理組態"
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
msgid "Write the settings"
msgstr "寫入設定"
#. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
msgid "Writing the settings..."
msgstr "正在寫入設定..."
Modified: trunk/yast/zh_TW/po/dhcp-server.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/dhcp-server.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/dhcp-server.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: dhcp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2012-05-18 13:19+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -61,9 +61,7 @@
msgstr "管理 DHCP 子網路選項"
#. command line help text for an option
-#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
msgid "List all defined hosts with a fixed address"
msgstr "列出所有含固定位址的定義主機"
@@ -103,242 +101,249 @@
msgstr "含固定位址主機的 IP 位址 (或主機名稱)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
msgid "Select the network interface to use"
msgstr "選取要使用的網路介面"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
msgid "Print the currently used interface and list other available interfaces"
msgstr "列印目前使用的介面,並列出其他可用的介面"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
msgid "Print current options"
msgstr "列印目前的選項"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
msgid "Set a global option"
msgstr "設定全域選項"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
msgid "Option key (for example, ntp-servers)"
msgstr "選項金鑰 (例如,NTP 伺服器)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
msgid "Option value (for example, IP address)"
msgstr "選項值 (例如,IP 位址)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
msgid "Lowest IP address of the dynamic address assigning range"
msgstr "動態位址指定範圍中的最低 IP 位址"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
msgid "Highest IP address of the dynamic address assigning range"
msgstr "動態位址指定範圍中的最高 IP 位址"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
msgid "Default lease time in seconds"
msgstr "預設租用時間 (秒)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
msgid "Maximum lease time in seconds"
msgstr "最長租用時間 (秒)"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
msgid "DHCP server is enabled"
msgstr "DHCP 伺服器已啟用"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
msgid "DHCP server is disabled"
msgstr "DHCP 伺服器已停用"
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
msgid "Host: %1"
msgstr "主機: %1"
#. command-line text output, %1 is hardwarre address
#. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
msgid "Hardware: %1"
msgstr "硬體: %1"
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
msgid "IP Address: %1"
msgstr "IP 位址: %1"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
msgid "Hostname not specified."
msgstr "沒有指定主機名稱。"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
msgid "Specified host does not exist."
msgstr "指定的主機不存在。"
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
msgid "None"
msgstr "無"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
msgid "Selected Interfaces: %1"
msgstr "選取的介面: %1"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
msgid "Other Interfaces: %1"
msgstr "其他介面: %1"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
msgid "Specified interface does not exist."
msgstr "指定的介面不存在。"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
msgid "Operation with the interface not specified."
msgstr "使用未指定的介面操作。"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
msgid "Option key must be set."
msgstr "必須設定選項金鑰。"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
msgid "Value must be set."
msgstr "必須設定值。"
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
msgid "Address Range: %1-%2"
msgstr "位址範圍:%1-%2"
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
msgid "Default Lease Time: %1"
msgstr "預設租用時間: %1"
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
msgid "Maximum Lease Time: %1"
msgstr "最長租用時間: %1"
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
msgid "Saving the configuration failed. Change the settings?"
msgstr "儲存組態失敗。要變更設定嗎?"
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+#| msgid "Saving the configuration failed. Change the settings?"
+msgid "Saving the configuration failed"
+msgstr "儲存組態失敗。要變更設定嗎?"
+
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
msgid "DHCP Server Configuration"
msgstr "DHCP 伺服器組態"
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
msgid "Global Options"
msgstr "全域選項"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
msgid "Subnet Configuration"
msgstr "子網路組態"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
msgid "Host with Fixed Address"
msgstr "含固定位址的主機"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
msgid "Shared Network"
msgstr "共用網路"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
msgid "Pool of Addresses"
msgstr "位址池"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
msgid "Group-Specific Options"
msgstr "群組特定選項"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
msgid "Class"
msgstr "類別"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
msgid "&Subnet"
msgstr "子網路(&S)"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
msgid "&Host"
msgstr "主機(&H)"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
msgid "Shared &Network"
msgstr "共用網路(&N)"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
msgid "&Group"
msgstr "群組(&G)"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
msgid "&Pool of Addresses"
msgstr "位址池(&P)"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
msgid "&Class"
msgstr "類別(&C)"
#. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
msgid "Declaration Types"
msgstr "宣告類型"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
msgid "Declaration Type"
msgstr "宣告類型"
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
msgid "Interface Configuration"
msgstr "介面組態"
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
msgid "TSIG Key Management"
msgstr "TSIG 金鑰管理"
@@ -363,190 +368,150 @@
msgstr "秒鐘"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
msgid "DHCP Server: Start-Up"
msgstr "DHCP 伺服器:啟動"
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
msgid "Start-Up"
msgstr "啟動"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
msgid "DHCP Server: Card Selection"
msgstr "DHCP 伺服器:介面卡選項"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
msgid "Card Selection"
msgstr "介面卡選項"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
msgid "DHCP Server: Global Settings"
msgstr "DHCP 伺服器:全域設定"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
msgid "Global Settings"
msgstr "全域設定"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
msgid "DHCP Server: Dynamic DHCP"
msgstr "DHCP 伺服器:動態 DHCP"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
msgid "Dynamic DHCP"
msgstr "動態 DHCP"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
msgid "DHCP Server: Host Management"
msgstr "DHCP 伺服器:主機管理"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
msgid "Host Management"
msgstr "主機管理"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
msgid "DHCP Server: Expert Settings"
msgstr "DHCP 伺服器:進階設定"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
msgid "Expert Settings"
msgstr "精靈設定"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
msgid "When &Booting"
msgstr "開機時(&B)"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
msgid "&Manually"
msgstr "手動(&M)"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
msgid "When Booting"
msgstr "開機時"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
msgid "Manually"
msgstr "手動"
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
-msgid "DHCP server is running"
-msgstr "DHCP 伺服器執行中"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-msgid "DHCP server is not running"
-msgstr "DHCP 伺服器尚未執行"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-msgid "&Start DHCP Server Now"
-msgstr "立即啟動 DHCP 伺服器(&S)"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-msgid "S&top DHCP Server Now"
-msgstr "立即停止 DHCP 伺服器(&T)"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "立即儲存設定並重新啟動 DHCP 伺服器(&N)"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-msgid "Start DHCP Server Now"
-msgstr "立即啟動 DHCP 伺服器(&S)"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-msgid "Stop DHCP Server Now"
-msgstr "立即停止 DHCP 伺服器"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "立即儲存設定並重新啟動 DHCP 伺服器"
-
-#: src/include/dhcp-server/dialogs2.rb:371
+#: src/include/dhcp-server/dialogs2.rb:334
msgid "DHCP Server Start-up Arguments"
msgstr "DHCP 伺服器啟動參數"
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
msgid "Network Cards for DHCP Server"
msgstr "DHCP 伺服器的網路卡"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
msgid "Selected"
msgstr "已選取"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
msgid "Interface Name"
msgstr "介面名稱"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
msgid "Device Name"
msgstr "設備名稱"
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
msgid "IP"
msgstr "IP"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
msgid "&Select"
msgstr "選取(&S)"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
msgid "&Deselect"
msgstr "取消選取(&L)"
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
msgid "DHCP address"
msgstr "DHCP 位址"
#. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
msgid "At least one network interface must be selected."
msgstr "至少必須選取一個網路介面。"
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
#, fuzzy
#| msgid ""
#| "The selected network interface is not configured (no assigned IP address \n"
@@ -562,60 +527,60 @@
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
msgid "&LDAP Support"
msgstr "LDAP 支援(&L)"
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
msgid "DHCP Server &Name (optional)"
msgstr "DHCP 伺服器名稱 (選擇性)(&N)"
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
msgid "&Domain Name"
msgstr "領域名稱(&D)"
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
msgid "&Primary Name Server IP"
msgstr "主要名稱伺服器 IP(&P)"
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
msgid "&Secondary Name Server IP"
msgstr "次要名稱伺服器 IP(&S)"
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
msgid "Default &Gateway (Router) "
msgstr "預設閘道 (路由器)(&G) "
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
msgid "NTP &Time Server"
msgstr "NTP 時間伺服器(&T)"
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
msgid "&Print Server"
msgstr "列印伺服器(&P)"
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
msgid "&WINS Server"
msgstr "WINS 伺服器(&W)"
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
msgid "Default &Lease Time"
msgstr "預設租用時間(&L)"
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
msgid "&Units"
msgstr "單位(&U)"
@@ -623,48 +588,48 @@
#. error popup
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
msgid "The specified value is not a valid hostname or IP address."
msgstr "指定值不是有效的主機或是 IP 位址。"
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
msgid "Subnet Information"
msgstr "子網路資訊"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
msgid "Current &Network"
msgstr "目前網路(&N)"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
msgid "Current Net&mask"
msgstr "目前網路遮罩(&M)"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
msgid "Netmask Bi&ts"
msgstr "網路遮罩位元(&T)"
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
#: src/include/dhcp-server/dns-server-dialogs.rb:81
msgid "Min&imum IP Address"
msgstr "最小 IP 位址(&I)"
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
#: src/include/dhcp-server/dns-server-dialogs.rb:83
msgid "Ma&ximum IP Address"
msgstr "最大 IP 位址(&X)"
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
msgid "IP Address Range"
msgstr "IP 位址範圍"
@@ -672,10 +637,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
msgid "&First IP Address"
msgstr "第一個 IP 位址(&F)"
@@ -683,61 +648,61 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
msgid "&Last IP Address"
msgstr "最後一個 IP 位址(&L)"
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
msgid "Allow Dynamic &BOOTP"
msgstr "允許動態 BOOTP(&B)"
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
msgid "Lease Time"
msgstr "租用時間"
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
msgid "&Default"
msgstr "預設(&D)"
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
msgid "&Maximum"
msgstr "最大(&M)"
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
msgid "Uni&ts"
msgstr "單位(&T):"
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
msgid "Create New DNS Zone from Scratch"
msgstr "重新建立新 DNS 區域"
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
msgid "Edit Current DNS Zone"
msgstr "編輯目前的 DNS 區域"
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
msgid "Get Current Zone Information"
msgstr "取得目前的區域資訊"
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
msgid "&Synchronize DNS Server..."
msgstr "同步化 DNS 伺服器(&S)..."
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -747,8 +712,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
msgid "Enter values for both ends of the IP address range."
msgstr "輸入 IP 位址範圍的最小最大值。"
@@ -756,8 +721,8 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
msgid ""
"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
@@ -766,127 +731,127 @@
"IP %1 與 %2/%3 網路不相符。"
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
msgid "Registered Host"
msgstr "註冊的主機"
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
msgid "Name"
msgstr "名稱"
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
msgid "Hardware Address"
msgstr "硬體位址"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
msgid "Type"
msgstr "類型"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
msgid "List Setup"
msgstr "清單設定"
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
msgid "&Name"
msgstr "名稱(&N)"
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
msgid "&IP Address"
msgstr "IP 位址(&I)"
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
msgid "&Hardware Address"
msgstr "硬體位址(&H)"
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
msgid "&Ethernet"
msgstr "乙太網路(&E)"
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
msgid "&Token Ring"
msgstr "記號環(&T)"
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
msgid "C&hange in List"
msgstr "清單中的變更(&H)"
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "Dele&te from List"
msgstr "自清單中刪除(&T)"
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
msgid "Ethernet"
msgstr "乙太網路"
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
msgid "Token Ring"
msgstr "記號環"
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
msgid "The hardware address is invalid.\n"
msgstr "硬體位址無效。\n"
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
msgid "The hardware address must be unique."
msgstr "硬體位址必須是唯一的。"
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
msgid "The hostname cannot be empty."
msgstr "主機名稱不能是空白。"
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
msgid "A host named %1 already exists."
msgstr "名為 %1 的主機已經存在。"
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
msgid "Enter a host IP."
msgstr "輸入主機 IP。"
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
msgid "The hardware address must be defined."
msgstr "必須定義硬體位址。"
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
msgid "Select a host first."
msgstr "請先選取主機。"
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
msgid "The input value must be defined."
msgstr "必須定義輸入值。"
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -907,15 +872,15 @@
"要繼續嗎?"
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr "\"-%1\" 不是有效的 DHCP 伺服器指令行選項"
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr "DHCP 伺服器指令行選項 \"-%1\" 需要引數"
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -934,7 +899,7 @@
"確定繼續?\n"
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
msgid "DHCP Server Wizard (%1 of 4)"
msgstr "DHCP 伺服器精靈 (%1/4)"
@@ -1224,7 +1189,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
msgid "The last IP address must be higher than the first one."
msgstr "最後的 IP 位址必須高於第一個 IP 位址。"
@@ -1251,7 +1216,7 @@
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
msgid "Invalid hostname."
msgstr "無效的主機名稱。"
@@ -1262,9 +1227,9 @@
#. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
#: src/include/dhcp-server/dns-server-dialogs.rb:462
#: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
msgid "Invalid IP address."
msgstr "無效的 IP 位址。"
@@ -1282,44 +1247,44 @@
"IP 位址 (%2-%3) 範圍內。\n"
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
msgid "Regenerating DNS zone entries..."
msgstr "正在重新產生 DNS 區域項目..."
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
msgid "Adding a New DNS Record"
msgstr "新增 DNS 新記錄"
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "主機名稱(&H)"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr "將 DHCP 範圍 %1-%2 新增至 DNS 伺服器..."
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
msgid "Removing DNS Records Matching Range"
msgstr "移除符合範圍的 DNS 記錄"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr "將範圍 %1-%2 中的記錄從 DNS 伺服器中移除..."
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
@@ -1328,7 +1293,7 @@
"DNS 伺服器無法將任何記錄寫入該區域。\n"
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1338,18 +1303,18 @@
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
#: src/include/dhcp-server/dns-server-wizard.rb:1107
msgid "Cannot create zone %1."
msgstr "無法建立區域 %1。"
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
msgid "Synchronizing DNS reverse records..."
msgstr "正在同步化 DNS 反向記錄..."
#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
@@ -1358,62 +1323,62 @@
"確定取消此操作?\n"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
msgid "&Domain"
msgstr "領域(&D)"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
msgid "&Network"
msgstr "網路(&N)"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "Net&mask"
msgstr "網路遮罩(&M)"
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
msgid "DNS Zone Records"
msgstr "DNS 區域記錄"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
msgid "Hostname"
msgstr "主機名稱"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Assigned IP"
msgstr "指派的 IP"
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
msgid "&Add..."
msgstr "新增(&A)..."
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
msgid "&Special Tasks"
msgstr "特殊工作(&S)"
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
msgid "Add New Range of DNS Records"
msgstr "新增新的 DNS 記錄範圍"
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr "執行精靈以重新開始寫入 DNS 區域"
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
msgid "Synchronize with Reverse Zone %1"
msgstr "與反向區域 %1 同步化"
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
msgid "DHCP Server: DNS Server Synchronization"
msgstr "DHCP 伺服器:DNS 伺服器同步化"
@@ -1708,8 +1673,7 @@
"請稍候...</p>"
#. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1736,20 +1700,9 @@
"只有當防火牆啟用時,才會使用\n"
"此選項。</p>"
-#. help text 1/5
+#. help text 2/5
#: src/include/dhcp-server/helps.rb:39
msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>DHCP 伺服器</big></b></p>\n"
-"<p>若要在每次電腦開機時執行 DHCP 伺服器,請設定\n"
-"<b>「啟動 DHCP 伺服器」</b>。</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-msgid ""
"<p>\n"
"To run the DHCP server in chroot jail, set\n"
"<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1761,7 +1714,7 @@
"是較為安全的做法,強烈建議您採取此種方式。</p>"
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1772,7 +1725,7 @@
"請啟用<b>「LDAP 支援」</b>。</p>"
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
"To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1787,7 +1740,7 @@
"若要刪除宣告,請選取宣告,再按一下<b>「刪除」</b>。</p>"
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1802,7 +1755,7 @@
"TSIG 金鑰。</p>"
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
"Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
@@ -1811,7 +1764,7 @@
"設定子網路的<b>「網路位址」</b>和<b>「網路遮罩」</b>。</p>"
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
"Set the name of the host for which to set the fixed address or other\n"
@@ -1822,7 +1775,7 @@
"固定位址或其他特殊選項的主機名稱。</p>"
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
"Set the name of the group of declarations in <b>Group Name</b>. \n"
@@ -1835,7 +1788,7 @@
"這個名稱並不會影響 DHCP 伺服器的執行。</p>"
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
"Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1848,7 +1801,7 @@
"這個名稱並不會影響 DHCP 伺服器的執行。</p>"
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1861,7 +1814,7 @@
"這個名稱並不會影響 DHCP 伺服器的執行。</p>"
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
@@ -1870,7 +1823,7 @@
"在<b>「類別名稱」</b>中,設定主機類別的名稱。</p>"
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
msgid ""
"<p>\n"
"To edit DHCP options, choose the appropriate\n"
@@ -1885,7 +1838,7 @@
"選項,請選取選項,再按一下<b>「刪除」</b>。</p>"
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
@@ -1894,7 +1847,7 @@
"若要調整這個子網路的主機動態 DNS,請使用<b>「動態 DNS」</b>。</p>"
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1905,7 +1858,7 @@
"<b>「啟用此子網路的動態 DNS」</b>。</p>"
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1920,7 +1873,7 @@
"金鑰。</p>"
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1933,7 +1886,7 @@
"<b>「更新全域動態 DNS 設定」</b>。</p>"
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -1946,7 +1899,7 @@
"則可以將這些欄位留空。</p>"
#. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
"Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -1959,7 +1912,7 @@
"請參閱 dhcpd 操作網頁。如果保留空白,則會使用預設值。</p>"
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
"Select one or more of the listed network cards to use for the DHCP server.</p>\n"
@@ -1968,7 +1921,7 @@
"選取一個或多個列出的網路卡以用於 DHCP 伺服器。</p>\n"
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
@@ -1977,7 +1930,7 @@
"(dhcpServer LDAP 物件的名稱) 與您的主機名稱不同,您也可以指定 DHCP 伺服器名稱。\n"
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1987,7 +1940,7 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
@@ -1996,7 +1949,7 @@
"租用 IP 的領域。</p>"
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -2007,7 +1960,7 @@
"這些值必須為 IP 位址。</p>"
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
@@ -2016,7 +1969,7 @@
"作為預設路徑。</p>"
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
@@ -2025,12 +1978,12 @@
"來達成時間的同步。</p>"
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr "<p><b>「列印伺服器」</b>提供此伺服器作為預設的列印伺服器。</p>"
#. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
@@ -2039,7 +1992,7 @@
"(Windows 網際網路名稱服務)。</p>"
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
msgid ""
"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
@@ -2048,7 +2001,7 @@
"用戶端必須再一次取得 IP。</p>"
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -2061,7 +2014,7 @@
"</p>\n"
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -2078,7 +2031,7 @@
"指定給 BOOTP 客戶端及 DHCP 客戶端</p>。\n"
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -2089,7 +2042,7 @@
"此時可設定用戶端的最佳 IP 重新整理時間。<br></p>"
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
@@ -2098,7 +2051,7 @@
"在這段時間內,DHCP 伺服器會封鎖這個 IP,不讓用戶端取得。</p>"
#. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -2108,7 +2061,7 @@
"<b>「DHCP 伺服器進階組態」</b>。</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
"Use this dialog to edit hosts with static address binding.</p>"
@@ -2117,7 +2070,7 @@
"使用這個對話方塊來編輯靜態位址結合的主機。</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -2132,17 +2085,17 @@
"變更所有值,再按一下<b>「在清單中變更」</b>。</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr "<p>若要移除主機,請選取它後按一下<b>「從清單中刪除」</b>。</p>"
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>Select the type of declaration to add.</p>"
msgstr "<p>選取要新增的宣告類型。</p>"
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
@@ -2151,7 +2104,7 @@
"請選取<b>「子網路」</b>。</p>"
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
@@ -2160,7 +2113,7 @@
"(通常是指固定位址),請選取<b>「主機」</b>。</p>"
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
@@ -2169,7 +2122,7 @@
"請選取<b>「共用網路」</b>。</p>"
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
@@ -2178,7 +2131,7 @@
"是要共用某些設定時),請選取<b>「群組」</b>。</p>"
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2189,7 +2142,7 @@
"請選取<b>「位址池」</b>。</p>"
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
msgid ""
"<p>To create a condition class that can be used for\n"
"handling clients differently depending on the class to which they belong,\n"
@@ -2202,23 +2155,23 @@
#. selection box
#. selection box
#. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
msgid "A&ddresses"
msgstr "位址(&D)"
#. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
msgid "The entered address is not valid."
msgstr "輸入的位址無效。"
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
msgid "At least one address must be specified."
msgstr "至少必須指定一個位址。"
@@ -2228,94 +2181,94 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
msgid "&Values"
msgstr "值(&V)"
#. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
msgid "The entered addresses are not valid."
msgstr "輸入的位址無效。"
#. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
msgid "At least one address pair must be specified."
msgstr "至少必須指定一個位址組。"
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
msgid "On"
msgstr "開啟"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
msgid "Off"
msgstr "關閉"
#. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
msgid "A value must be specified."
msgstr "必須指定值。"
#. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
msgid "&New Address"
msgstr "新位址(&N)"
#. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
msgid "&New Value"
msgstr "新值(&N)"
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
msgid "Separate multiple addresses with spaces."
msgstr "請以空白分隔多個位址。"
#. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
msgid "&Add Address Pair"
msgstr "新增位址組(&A)"
#. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
msgid "The lowest address must be lower than the highest one."
msgstr "最低的位址必須低於最高的位址。"
#. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
msgid "If you change this, also update the syslog configuration."
msgstr "若變更此值,則也要更新 syslog 組態。"
#. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
msgid "&Hardware Type"
msgstr "硬體類型(&H)"
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
msgid "&MAC Address"
msgstr "MAC 位址(&M)"
#. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
msgid "&Lowest IP Address"
msgstr "最低 IP 位址(&L)"
#. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
msgid "&Highest IP Address"
msgstr "最高 IP 位址(&H)"
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
@@ -2324,7 +2277,7 @@
"這樣會遺失所有的變更。確定要離開?"
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2335,7 +2288,7 @@
"要繼續嗎?"
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
"%1\n"
@@ -2346,7 +2299,7 @@
"請執行 YaST 防火牆組態,為它們指派區域。"
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
"Run the YaST firewall configuration to assign it to a zone."
@@ -2356,8 +2309,8 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
@@ -2365,199 +2318,188 @@
"此功能無法在準備自動安裝\n"
"期間使用。"
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-msgid "Restart DHCP Server"
-msgstr "重新啟動 DHCP 伺服器"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-msgid "Save Settings and Restart DHCP Server"
-msgstr "儲存設定並重新啟動 DHCP 伺服器"
-
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
msgid "&Configured Declarations"
msgstr "設定組態的宣告(&C)"
#. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
msgid "&Dynamic DNS"
msgstr "動態 DNS(&D)"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
msgid "Forward Zone TSIG &Key"
msgstr "正向區域 TSIG 金鑰(&K)"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
msgid "Reverse Zone TSIG &Key"
msgstr "反向區域 TSIG 金鑰(&K)"
#. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
msgid "Select File with Authentication Key"
msgstr "選取具有驗證金鑰的檔案"
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-msgid "&Start DHCP Server"
-msgstr "啟動 DHCP 伺服器(&S)"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
msgid "&Run DHCP Server in Chroot Jail"
msgstr "在 Chroot Jail 中執行 DHCP 伺服器(&R)"
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
msgid "Ad&vanced"
msgstr "進階(&V)"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
msgid "Display &Log"
msgstr "顯示記錄(&L)"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
msgid "&Interface Configuration"
msgstr "介面組態(&I)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
msgid "&Network Address"
msgstr "網路位址(&N)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
msgid "Network &Mask"
msgstr "網路遮罩(&M)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
msgid "Group &Name"
msgstr "群組名稱(&N)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
msgid "Pool &Name"
msgstr "池名稱(&N)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
msgid "Shared Network &Name"
msgstr "共用網路名稱(&N)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
msgid "Class &Name"
msgstr "類別名稱(&N)"
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
msgid "Available Interfaces"
msgstr "可用的介面"
#. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
msgid "Open &Firewall for Selected Interfaces"
msgstr "開啟選取介面的防火牆(&F)"
#. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
msgid "&Enable Dynamic DNS for This Subnet"
msgstr "啟用此子網路的動態 DNS(&E)"
#. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
msgid "&Update Global Dynamic DNS Settings"
msgstr "更新全域動態 DNS 設定(&U)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
msgid "&Zone"
msgstr "區域(&Z)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
msgid "&Primary DNS Server"
msgstr "主要 DNS 伺服器(&P)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
msgid "Re&verse Zone"
msgstr "反向區域(&V)"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
msgid "Pr&imary DNS Server"
msgstr "主要 DNS 伺服器(&I)"
#. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
msgid "DHCP Server &Expert Configuration..."
msgstr "DHCP 伺服器進階組態(&E)..."
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
msgid "Initializing DHCP Server Configuration"
msgstr "正在啟始化 DHCP 伺服器組態"
#. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
msgid "Check the environment"
msgstr "檢查環境"
#. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
msgid "Read firewall settings"
msgstr "讀取防火牆設定"
#. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
msgid "Read DHCP server settings"
msgstr "讀取 DHCP 伺服器設定"
#. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
msgid "Read DNS server settings"
msgstr "讀取 DNS 伺服器設定"
#. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
msgid "Checking the environment..."
msgstr "正在檢查環境..."
#. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
msgid "Reading firewall settings..."
msgstr "正在讀取防火牆設定..."
#. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
msgid "Reading DHCP server settings..."
msgstr "正在讀取 DHCP 伺服器設定..."
#. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
msgid "Reading DNS server settings..."
msgstr "正在讀取 DNS 伺服器設定..."
#. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
msgid "Finished"
msgstr "已完成"
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2574,7 +2516,7 @@
"正在中止。"
#. error report
-#: src/modules/DhcpServer.pm:1475
+#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
@@ -2583,7 +2525,7 @@
"無法使用。"
#. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
@@ -2592,87 +2534,87 @@
"要建立新的組態嗎?"
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
msgid "Saving DHCP Server Configuration"
msgstr "正在儲存 DHCP 伺服器組態"
#. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
msgid "Write DHCP server settings"
msgstr "寫入 DHCP 伺服器設定"
#. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
msgid "Write firewall settings"
msgstr "寫入防火牆設定"
#. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
msgid "Restart DHCP server"
msgstr "重新啟動 DHCP 伺服器"
#. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
msgid "Write DNS server settings"
msgstr "寫入 DNS 伺服器設定"
#. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
msgid "Writing DHCP server settings..."
msgstr "正在寫入 DHCP 伺服器設定..."
#. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
msgid "Writing firewall settings..."
msgstr "正在寫入防火牆設定..."
#. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
msgid "Restarting DHCP server..."
msgstr "正在重新啟動 DHCP 伺服器..."
#. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
msgid "Writing DNS server settings..."
msgstr "正在寫入 DNS 伺服器設定..."
#. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
msgid "Error occurred while restarting the DHCP daemon."
msgstr "重新啟動 DHCP 精靈時發生錯誤。"
#. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
msgid "The DHCP server is started at boot time"
msgstr "已在開機時啟動 DHCP 伺服器"
#. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
msgid "The DHCP server is not started at boot time"
msgstr "未在開機時啟動 DHCP 伺服器"
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
msgid "Listen On: %1"
msgstr "傾聽:%1"
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
msgid "Dynamic Address Range: %1"
msgstr "動態位址範圍: %1"
#. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "無效的 LDAP 組態。無法使用 LDAP。"
#. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr "尚未支援多個 dhcpServiceDN 。"
#. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
msgid "DHCP service DN is not defined."
msgstr "未定義 DHCP 服務 DN。"
@@ -2680,27 +2622,69 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
msgid "Error occurred while creating %1."
msgstr "建立 %1 時發生錯誤。"
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#: src/modules/DhcpServer.pm:2754
msgid "Error occurred while updating %1."
msgstr "更新 %1 時發生錯誤。"
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "建立 cn=%2、ou=DHCP、%1 時發生錯誤。"
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "寫入 /etc/dhcpd.conf 時發生錯誤。"
+#~ msgid "DHCP server is running"
+#~ msgstr "DHCP 伺服器執行中"
+
+#~ msgid "DHCP server is not running"
+#~ msgstr "DHCP 伺服器尚未執行"
+
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "立即啟動 DHCP 伺服器(&S)"
+
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "立即停止 DHCP 伺服器(&T)"
+
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "立即儲存設定並重新啟動 DHCP 伺服器(&N)"
+
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "立即啟動 DHCP 伺服器(&S)"
+
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "立即停止 DHCP 伺服器"
+
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "立即儲存設定並重新啟動 DHCP 伺服器"
+
#~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>DHCP 伺服器</big></b></p>\n"
+#~ "<p>若要在每次電腦開機時執行 DHCP 伺服器,請設定\n"
+#~ "<b>「啟動 DHCP 伺服器」</b>。</p>"
+
+#~ msgid "Restart DHCP Server"
+#~ msgstr "重新啟動 DHCP 伺服器"
+
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "儲存設定並重新啟動 DHCP 伺服器"
+
+#~ msgid "&Start DHCP Server"
+#~ msgstr "啟動 DHCP 伺服器(&S)"
+
+#~ msgid ""
#~ "IP address %1 does not match\n"
#~ "the current network %2/%3\n"
#~ msgstr ""
Modified: trunk/yast/zh_TW/po/dns-server.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/dns-server.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/dns-server.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: dns-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2012-05-18 13:22+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -303,8 +303,7 @@
#. TRANSLATORS: commandline error message
#. Both Add and Remove defined => Error!
#: 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:999 src/include/dns-server/cmdline.rb:1049
#: src/include/dns-server/cmdline.rb:1108
#: src/include/dns-server/cmdline.rb:1244
#: src/include/dns-server/cmdline.rb:1303
@@ -375,11 +374,10 @@
#. Table header item - ACL-options
#. Table menu item - Records listing
#: 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:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
msgid "Value"
msgstr "值"
@@ -397,7 +395,7 @@
#. TRANSLATORS: commandline table header item
#. Textentry - DNS adding zone - Name
#: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
msgid "Name"
msgstr "名稱"
@@ -407,9 +405,9 @@
#. Table header item - DNS listing zones
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
msgid "Type"
msgstr "類型"
@@ -422,8 +420,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
#: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
msgid "Forwarders"
msgstr "轉遞者"
@@ -453,12 +451,11 @@
#. TRANSLATORS: commandline table header item
#. TRANSLATORS: commandline table header item
#. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: 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:1905
+#: src/include/dns-server/dialog-main.rb:1639
msgid "Zone"
msgstr "區域"
@@ -487,14 +484,14 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
msgid "Mail Server"
msgstr "郵件伺服器"
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
msgid "Priority"
msgstr "優先程度"
@@ -556,8 +553,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:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
msgid "DNS Zones"
msgstr "DNS 區域"
@@ -579,7 +576,7 @@
#. check box
#. TRANSLATORS: checkbox label, turning LDAP support on or off
#: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
msgid "&LDAP Support Active"
msgstr "LDAP 主動支援(&L)"
@@ -604,137 +601,92 @@
msgstr "DNS 伺服器進階組態(&E)..."
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
msgid "DNS Server"
msgstr "DNS 伺服器"
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#, fuzzy
-#| msgid "Apply Changes to Dialog"
-msgid "Apply Changes"
-msgstr "套用變更到對話"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-msgid "Start-Up"
-msgstr "啟動"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-msgid "Basic Options"
-msgstr "基本選項"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "記錄"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: 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"
-msgstr "ACL"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-msgid "TSIG Keys"
-msgstr "TSIG 金鑰"
-
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
msgid "Local DNS Resolution &Policy"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
msgid "Merging forwarders is disabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
msgid "Automatic merging"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
msgid "Merging forwarders is enabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
#, fuzzy
msgid "Custom configuration"
msgstr "DNS 伺服器組態"
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
msgid "Custom policy"
msgstr "自訂政策"
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
msgid "Local DNS Resolution &Forwarder"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
#, fuzzy
msgid "Using system name servers"
msgstr "區域名稱伺服器"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
#, fuzzy
msgid "This name server (bind)"
msgstr "區域名稱伺服器"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
msgid "Local dnsmasq server"
msgstr ""
#. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
msgid "Add IP Address"
msgstr "新增 IP 位址"
#. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
msgid "IPv4 or IPv6 A&ddress"
msgstr "IPv4 或 IPv6 位址(&D)"
#. Selectionbox for listing current DNS-Forwarders
#. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
msgid "Forwarder &List"
msgstr "轉遞者清單(&L)"
#. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
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:877
+#: src/include/dns-server/dialog-main.rb:611
#, fuzzy
msgid "Cannot find local equivalent for IP %1."
msgstr "無法建立使用者 %1 的帳戶。"
#. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
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"
@@ -742,11 +694,11 @@
msgstr ""
#. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
msgid "Invalid IPv4 or IPv6 address."
msgstr "無效的 IPv4 或 IPv6 位址。"
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
msgid ""
"A valid IPv6 address consists of letters a-f, numbers,\n"
"and colons."
@@ -755,46 +707,46 @@
"和冒號。"
#. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
msgid "The specified forwarder is already present."
msgstr "指定的轉遞者已經存在。"
#. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
msgid "Add or Change Option"
msgstr "新增或變更選項"
#. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
msgid "O&ption"
msgstr "選項(&P)"
#. Textentry for setting the basic-option value
#. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
msgid "&Value"
msgstr "值(&V)"
#. Pushbutton for changing the basic-option
#. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
msgid "C&hange"
msgstr "變更(&H)"
#. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
msgid "Current Options"
msgstr "目前的選項"
#. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
msgid "Option"
msgstr "選項"
#. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
msgid ""
"Really set this\n"
"option without any value?\n"
@@ -803,7 +755,7 @@
"來設定此選項?\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:1173
+#: src/include/dns-server/dialog-main.rb:907
msgid ""
"Option %1 can only have a yes or no value set.\n"
"Really set it to %2?\n"
@@ -812,7 +764,7 @@
"確定要將它設為 %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:1190
+#: src/include/dns-server/dialog-main.rb:924
msgid ""
"Option %1 can only be a number.\n"
"Really set it to %2?\n"
@@ -821,7 +773,7 @@
"確定要將它設為 %2?\n"
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
msgid ""
"Quotes are not used correctly in this option.\n"
"Really set it to %1?\n"
@@ -830,7 +782,7 @@
"確定要將它設為 %1?\n"
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
msgid ""
"Brackets are not used correctly in this option.\n"
"Really set it to %1?\n"
@@ -839,7 +791,7 @@
"確定要將它設為 %1?\n"
#. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
msgid ""
"Option %1 should be set only once.\n"
"Really add another one?\n"
@@ -848,77 +800,77 @@
"確定要新增另一項?\n"
#. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
msgid "Log Type"
msgstr "記錄類型"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
msgid "&System Log"
msgstr "系統記錄(&S)"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
msgid "&File"
msgstr "檔案(&F)"
#. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
msgid "Maximum &Size (MB)"
msgstr "最大大小 (MB)(&S)"
#. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
msgid "Maximum &Versions"
msgstr "最大版本(&V)"
#. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
msgid "Additional Logging"
msgstr "其他記錄"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
msgid "Log All DNS &Queries"
msgstr "記錄所有 DNS 查詢(&Q)"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
msgid "Log Zone &Updates"
msgstr "記錄區域更新(&U)"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
msgid "Log Zone &Transfers"
msgstr "記錄區域轉送(&T)"
#. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
msgid "Select File for Log"
msgstr "選取要記錄的檔案"
#. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
msgid "Option Setup"
msgstr "選項設定"
#. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
msgid "&Name"
msgstr "名稱(&N)"
#. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
msgid "Current ACL List"
msgstr "目前的 ACL 清單"
#. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
msgid "ACL"
msgstr "ACL"
#. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
msgid ""
"This ACL is used by %1 zones.\n"
"Really remove it?\n"
@@ -927,12 +879,12 @@
"確定要移除它嗎?\n"
#. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
msgid "The specified ACL entry already exists."
msgstr "指定的 ACL 項目已存在。"
#. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
msgid "Add New Zone "
msgstr "新增區域"
@@ -941,8 +893,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:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
msgid "Master"
msgstr "主要"
@@ -952,9 +904,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:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
msgid "Slave"
msgstr "從屬"
@@ -963,36 +915,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:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
msgid "Forward"
msgstr "轉遞"
#. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
msgid "Configured DNS Zones"
msgstr "設定的 DNS 區域"
#. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
msgid "A zone with the specified name is already configured."
msgstr "指定名稱的區域已經設定。"
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
msgid "Saving the configuration failed. Change the settings?"
msgstr "儲存組態失敗。要變更設定嗎?"
#. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
+#: src/include/dns-server/dialog-main.rb:1903
#, fuzzy
#| msgid "Save configuration files"
msgid "Saving the configuration failed"
msgstr "儲存組態檔案"
#. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
msgid ""
"All changes will be lost.\n"
"Really leave the DNS server configuration without saving?"
@@ -1000,40 +952,85 @@
"這樣會遺失所有的變更。\n"
"確定要離開 DNS 伺服器組態而不儲存?"
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+#, fuzzy
+#| msgid "Apply Changes to Dialog"
+msgid "Apply Changes"
+msgstr "套用變更到對話"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+msgid "Start-Up"
+msgstr "啟動"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+msgid "Basic Options"
+msgstr "基本選項"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "記錄"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr "ACL"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+msgid "TSIG Keys"
+msgstr "TSIG 金鑰"
+
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
msgid "A&llow Dynamic Updates"
msgstr "允許動態更新(&L)"
#. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
msgid "TSIG &Key"
msgstr "TSIG 金鑰(&K)"
#. check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
msgid "Enable &Zone Transport"
msgstr "啟用區域傳輸(&Z)"
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
msgid "A&utomatically Generate Records From"
msgstr "自動產生紀錄從(&U)"
#. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
msgid "Zon&e"
msgstr "區域(&E)"
#. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
msgid "Connected Reverse Zones"
msgstr "已連線反向區域"
#. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
msgid ""
"This function is not available during\n"
"preparation for autoinstallation.\n"
@@ -1042,34 +1039,34 @@
"期間使用。\n"
#. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
msgid "No TSIG key is defined."
msgstr "未定義 TSIG 金鑰。"
#. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
msgid "&Name Server to Add"
msgstr "要新增的名稱伺服器(&N)"
#. Selectionbox - listing current nameservers
#. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
msgid "Na&me Server List"
msgstr "名稱伺服器清單(&M)"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
msgid "The specified name server already exists."
msgstr "指定的名稱伺服器已經存在。"
#. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
msgid "Mail Server to Add"
msgstr "要新增的郵件伺服器"
#. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
msgid "&Address"
msgstr "位址(&A)"
@@ -1077,116 +1074,116 @@
#. IntField - zone settings - Record Value
#. IntField - zone settings - Record Value
#. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
#: src/include/dns-server/options.rb:435
msgid "&Priority"
msgstr "優先程度(&P)"
#. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
msgid "Mail Relay List"
msgstr "郵件轉送清單"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
msgid "The specified value is not a valid hostname or IP address."
msgstr "指定值不是有效的主機或是 IP 位址。"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
msgid "The specified mail server already exists."
msgstr "指定的郵件伺服器已經存在。"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
msgid "Seconds"
msgstr "秒鐘"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
msgid "Minutes"
msgstr "分鐘"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
msgid "Hours"
msgstr "小時"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
msgid "Days"
msgstr "日"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
msgid "Weeks"
msgstr "週"
#. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
msgid "Seri&al"
msgstr "序號(&A)"
#. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
msgid "TT&L"
msgstr "TTL(&L)"
#. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
msgid "&Unit"
msgstr "單位(&U)"
#. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
msgid "Re&fresh"
msgstr "重新整理(&F)"
#. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
msgid "Un&it"
msgstr "單位(&I)"
#. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
msgid "Retr&y"
msgstr "重試(&Y)"
#. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
msgid "Ex&piration"
msgstr "逾時(&P)"
#. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
msgid "U&nit"
msgstr "單位(&N)"
#. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
msgid "&Minimum"
msgstr "最小值(&M)"
#. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
msgid "Uni&t"
msgstr "單位(&T)"
#. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
msgid "The serial number of the zone must be specified."
msgstr "必須指定區域的序號。"
#. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
msgid "The serial number must be no more than %1 digits long."
msgstr "序號長度不可以超過 %1 個數字。"
#. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
msgid ""
"The expiration time-out is higher than the time period\n"
"of zone refreshes. The zone will not be reachable\n"
@@ -1201,104 +1198,104 @@
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
msgid "&Record Key"
msgstr "記錄金鑰(&R)"
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
msgid "T&ype"
msgstr "類型(&Y)"
#. Textentry - zone settings - Record Value
#. IntField - zone settings - Record Value
#. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
msgid "Val&ue"
msgstr "值(&U)"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
msgid "&Service"
msgstr "服務(&S)"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
msgid "&Protocol"
msgstr "通訊協定(&P)"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
msgid "&Weight"
msgstr "重量(&W)"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
msgid "&Port"
msgstr "埠(&P)"
#. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
msgid "A: IPv4 Domain Name Translation"
msgstr "A:IPv4 領域名稱轉譯"
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
msgid "AAAA: IPv6 Domain Name Translation"
msgstr "AAAA:IPv6 領域名稱轉譯"
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
msgid "CNAME: Alias for Domain Name"
msgstr "CNAME:領域名稱的別名"
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
msgid "NS: Name Server"
msgstr "NS:名稱伺服器"
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
msgid "MX: Mail Relay"
msgstr "MX:郵件轉送"
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
msgid "PTR: Reverse Translation"
msgstr "PTR:反向轉譯"
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
msgid "SRV: Services Record"
msgstr "SRV: 服務紀錄"
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
msgid "TXT: Text Record"
msgstr "TXT: 文字紀錄"
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
msgid "SPF: Sender Policy Framework"
msgstr ""
#. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
msgid "Record Settings"
msgstr "記錄設定"
#. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
msgid "Configured Resource Records"
msgstr "設定的資源記錄"
#. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
msgid "Record Key"
msgstr "記錄金鑰"
#. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
msgid ""
"Invalid IPv6 reverse IP.\n"
"\n"
@@ -1311,13 +1308,13 @@
"或相對於目前區域格式支援。"
#. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
msgid "Invalid IPv6 address."
msgstr "無效的 IPv6 位址。"
#. TRANSLATORS: Error message
#. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
msgid ""
"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
"and must be at least one character long."
@@ -1327,7 +1324,7 @@
#. %{type} - replaced with record type (TXT or SPF)
#. %{max} - replaced with the maximal length
#. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
#, fuzzy
msgid ""
"Maximal length of a %{type} record is %{max} characters.\n"
@@ -1337,72 +1334,66 @@
"此訊息長度為 %2 字元。"
#. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
msgid "CNAME cannot point to itself."
msgstr "CNAME 不可指向它自己。"
#. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
msgid "An internal error has occurred."
msgstr "發生內部錯誤。"
#. Dialog Caption - Expert Settings - Zone Editor
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
msgid "Zone Editor"
msgstr "區域編輯器"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
msgid "&Basics"
msgstr "基本(&B)"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
msgid "NS Recor&ds"
msgstr "NS 記錄(&D)"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
msgid "&SOA"
msgstr "SOA(&S)"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
msgid "R&ecords"
msgstr "記錄(&E)"
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
msgid "M&X Records"
msgstr "MX 記錄(&X)"
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
msgid "Settings for Zone"
msgstr "區域的設定"
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "進階(&V)"
-
#. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
msgid "At least one NS server must be set."
msgstr "至少必須設定一個 NS 伺服器。"
@@ -1410,7 +1401,7 @@
#.
#. Automatically Generate Records From is a feature that makes YaST to generate
#. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
msgid ""
"Current zone records are automatically generated from %1 zone.\n"
"To change records manually disable the Automatically Generate Records From feature."
@@ -1419,17 +1410,17 @@
"要手動變更紀錄,停用\"自動產生紀錄從\"的功能。"
#. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
msgid "&Master DNS Server IP"
msgstr "主 DNS 伺服器 IP(&M)"
#. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
msgid "Missing Master Server"
msgstr "遺失主伺服器"
#. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
msgid ""
"Every slave zone must have its master server IP defined.\n"
"Configuration of a DNS server without a master server would fail.\n"
@@ -1440,32 +1431,32 @@
"如果繼續執行,將會移除目前的區域。"
#. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
msgid "No master DNS server defined."
msgstr "沒有定義主 DNS 伺服器。"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
msgid "The specified master name server is not a valid IP address."
msgstr "指定的主名稱伺服器並非有效的 IP 位址。"
#. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
msgid "New &Forwarder IP Address"
msgstr "新轉遞者的 IP 位址(&F)"
#. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
msgid "Current &Zone Forwarders"
msgstr "目前的區域轉遞者(&Z)"
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
msgid "Forward Zone Editor"
msgstr "轉遞區域編輯器"
#. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
msgid ""
"This forward zone has no forwarders defined, which means\n"
"that all DNS queries for this zone are denied.\n"
@@ -2501,56 +2492,56 @@
msgstr "郵件轉送(&M)"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
msgid "Initializing DNS Server Configuration"
msgstr "正在啟始化 DNS 伺服器組態"
#. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
msgid "Check the environment"
msgstr "檢查環境"
#. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
msgid "Flush caches of the DNS daemon"
msgstr "衝洗 DNS 精靈的快取"
#. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
msgid "Read the firewall settings"
msgstr "讀取防火牆設定"
#. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
msgid "Read the settings"
msgstr "讀取設定"
#. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
msgid "Checking the environment..."
msgstr "正在檢查環境..."
#. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
msgid "Flushing caches of the DNS daemon..."
msgstr "正在衝洗 DNS 精靈的快取..."
#. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
msgid "Reading the firewall settings..."
msgstr "正在讀取防火牆設定..."
#. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
msgid "Reading the settings..."
msgstr "正在讀取設定..."
#. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
msgid "Finished"
msgstr "已完成"
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
msgid ""
"Error occurred while calling netconfig.\n"
"Error: "
@@ -2559,72 +2550,72 @@
"錯誤:"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
msgid "Saving DNS Server Configuration"
msgstr "正在儲存 DNS 伺服器組態"
#. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
msgid "Save configuration files"
msgstr "儲存組態檔案"
#. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
msgid "Restart the DNS daemon"
msgstr "重新啟動 DNS 精靈"
#. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
msgid "Update zone files"
msgstr "更新區域檔案"
#. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
msgid "Adjust the DNS service"
msgstr "調整 DNS 服務"
#. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
msgid "Call netconfig"
msgstr "呼叫 netconfig"
#. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
msgid "Write the firewall settings"
msgstr "寫入防火牆設定"
#. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
msgid "Saving configuration files..."
msgstr "正在儲存組態檔案..."
#. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
msgid "Restarting the DNS daemon..."
msgstr "正在重新啟動 DNS 精靈..."
#. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
msgid "Updating zone files..."
msgstr "正在更新區域檔案..."
#. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
msgid "Adjusting the DNS service..."
msgstr "正在調整 DNS 服務..."
#. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
msgid "Calling netconfig..."
msgstr "正在呼叫 netconfig..."
#. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
msgid "Writing the firewall settings..."
msgstr "正在寫入防火牆設定..."
#. Cannot start service 'named', because of error that follows Error:. Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
#, fuzzy
msgid ""
"Error occurred while starting service named.\n"
@@ -2634,43 +2625,43 @@
"錯誤:"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
msgid "Stub"
msgstr "存根(T)"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
msgid "Hint"
msgstr "提示"
#. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
msgid "The DNS server starts when booting the system."
msgstr "啟動系統時,啟動 DNS 伺服器。"
#. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
msgid "The DNS server does not start when booting the system."
msgstr "啟動系統時,不啟動 DNS 伺服器。"
#. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
#, perl-format
msgid "Configured Zones: %s"
msgstr "設定組態的區域:%s"
#. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "無效的 LDAP 組態。無法使用 LDAP。"
#. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
msgid "Enable LDAP support?"
msgstr "啟用 LDAP 支援嗎?"
#. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
msgid ""
"Installation of required packages failed.\n"
"LDAP support will not be active."
@@ -2679,30 +2670,33 @@
"LDAP 支援將不會啟用。"
#. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
msgid "Unknown LDAP initialization error."
msgstr "未知的 LDAP 啟始化失敗。"
#. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
msgid "Error occurred while creating %1."
msgstr "建立 %1 時發生錯誤。"
#. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
msgstr "建立 cn=defaultDNS,%1 時發生錯誤。未使用 LDAP。"
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
msgid "Error occurred while updating %1."
msgstr "更新 %1 時發生錯誤。"
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
msgid "Error occurred while creating %1. Not using LDAP."
msgstr "建立 %1 時發生錯誤。未使用 LDAP。"
+#~ msgid "Ad&vanced"
+#~ msgstr "進階(&V)"
+
#~ msgid "When &Booting"
#~ msgstr "開機時(&B)"
Modified: trunk/yast/zh_TW/po/docker.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/docker.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/docker.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -17,6 +17,120 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid " Container"
+msgid "Changes in Container"
+msgstr " 容器"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "狀態"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+#, fuzzy
+#| msgid "Exit"
+msgid "&Exit"
+msgstr "離開"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid " Container"
+msgid "Commit Container"
+msgstr " 容器"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+msgid "Repository"
+msgstr "套件庫"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+#, fuzzy
+#| msgid "Tab"
+msgid "Tag"
+msgstr "標籤"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Terminals"
+msgid "Inject Shell"
+msgstr "終端機"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
#. 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."
@@ -82,16 +196,6 @@
msgid "Running Docker Containers"
msgstr "正在執行網際網路連接測試"
-#: src/lib/ydocker/main_dialog.rb:217
-msgid "Repository"
-msgstr "套件庫"
-
-#: src/lib/ydocker/main_dialog.rb:218
-#, fuzzy
-#| msgid "Tab"
-msgid "Tag"
-msgstr "標籤"
-
#: src/lib/ydocker/main_dialog.rb:219
#, fuzzy
#| msgid "Image"
@@ -120,15 +224,11 @@
msgid "Image"
msgstr "影像"
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
msgid "Command"
msgstr "指令"
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "狀態"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
#, fuzzy
#| msgid "Port"
msgid "Ports"
@@ -176,14 +276,65 @@
msgid "&Commit"
msgstr "備註"
-#: src/lib/ydocker/main_dialog.rb:304
-#, fuzzy
-#| msgid "Exit"
-msgid "&Exit"
-msgstr "離開"
-
#: src/lib/ydocker/main_dialog.rb:315
#, fuzzy
#| msgid "Do you really want to delete %1?"
msgid "Do you really want to delete image \"%s\"?"
msgstr "您真的要刪除 %1 嗎?"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid " Container"
+msgid "Run Container"
+msgstr " 容器"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid " Container"
+msgid "Container"
+msgstr " 容器"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""
Modified: trunk/yast/zh_TW/po/drbd.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/drbd.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/drbd.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-28 16:07+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -230,7 +230,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
#, fuzzy
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>DRBD 全域設定</big></b></p>"
@@ -245,15 +245,16 @@
msgid ""
"\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>\"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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. 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"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -279,13 +280,13 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:112
+#: src/include/drbd/helps.rb:113
#, fuzzy
#| msgid "<p><b><big>s390 reIPL Configuration</big></b></p>"
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr "<p><b><big>s390 reIPL 組態</big></b></p>"
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -294,20 +295,22 @@
"\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"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
"\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
+"\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>DRBD 全域設定</big></b></p>"
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr ""
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
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"
@@ -317,7 +320,7 @@
" set it to 0 to disable redrawing completely. </p>"
msgstr ""
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -327,7 +330,7 @@
msgstr ""
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
@@ -337,7 +340,7 @@
"在此設定 drbd 組態。<br></p>\n"
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
#, fuzzy
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
@@ -351,7 +354,7 @@
"然後按 <b>設定</b>。</p>\n"
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
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"
@@ -362,7 +365,7 @@
"組態。</p>\n"
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
@@ -374,7 +377,7 @@
"編輯其組態。<br></p>\n"
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
#, fuzzy
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
@@ -384,7 +387,7 @@
"按 <b>新增</b>以設定 drbd。</p>"
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
#, fuzzy
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
@@ -396,7 +399,7 @@
"然後視需要按 <b>編輯</b>或 <b>刪除</b>。</p>\n"
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -408,7 +411,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -419,7 +422,7 @@
" </p>"
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -430,58 +433,138 @@
" <br></p>\n"
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
#, fuzzy
msgid "LVM Filter Configuration of DRBD"
msgstr "DRBD 全域組態"
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
#, fuzzy
#| msgid "Device type"
msgid "Device Filter"
msgstr "設備類型"
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
#, fuzzy
#| msgid "Writing the SCPM database..."
msgid "Writing the LVM cache"
msgstr "正在寫入 SCPM 資料庫..."
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
#, fuzzy
#| msgid "Enable Microphone."
msgid "Enable LVM Cache"
msgstr "啟用麥克風。"
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning! Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning! Should not use lvmetad for cluster."
+msgstr ""
+
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:144
msgid "Resource Name"
msgstr "來源名稱"
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:151
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:156
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:188
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:336
msgid "Protocol"
msgstr "協定"
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
-msgid "Node names must be different."
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:560
+msgid "OK"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:561
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:575
+#, fuzzy
+#| msgid "Node names must be different."
+msgid "Node name can not be empty."
msgstr "結點名稱必須不同。"
-#: src/include/drbd/resource_conf.rb:578
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:719
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:739
#, fuzzy
msgid "Please fill out all fields."
msgstr "請填寫所有區域。"
+#: src/include/drbd/resource_conf.rb:754
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:789
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:795
+#, fuzzy
+#| msgid "Node names must be different."
+msgid "Node name must be different."
+msgstr "結點名稱必須不同。"
+
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar <mlazar(a)suse.cz>
@@ -587,87 +670,87 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:114
msgid "Failed to merge separated DRBD conf files\n"
msgstr ""
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:136
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr ""
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:191
msgid "Initializing DRBD Configuration"
msgstr "正在啟始化 DRBD 組態"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:199
msgid "Read global settings"
msgstr "讀取全域設定"
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:200
msgid "Read resources"
msgstr "讀取資源"
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:201
#, fuzzy
#| msgid "Read configurations"
msgid "Read LVM configurations"
msgstr "讀取組態"
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:202
msgid "Read daemon status"
msgstr "讀取精靈狀態"
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
#, fuzzy
#| msgid "Read Firewall Settings."
msgid "Read SuSEFirewall Settings"
msgstr "讀取防火牆設定。"
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:206
msgid "Reading global settings..."
msgstr "讀取全域設定..."
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:207
msgid "Reading resources..."
msgstr "正在讀取資源..."
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:208
#, fuzzy
#| msgid "Reading the configurations..."
msgid "Reading LVM configurations..."
msgstr "正在讀取組態..."
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:209
msgid "Reading daemon status..."
msgstr "正在讀取精靈狀態..."
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
msgid "Finished"
msgstr "已完成"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:514
msgid "Failed to backup drbd.conf"
msgstr ""
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:523
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr ""
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:547
msgid ""
"Invalid configuration of resource %1\n"
"%2"
msgstr ""
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:566
msgid "Failed to bring drbd.conf back"
msgstr ""
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:637
msgid "Writing DRBD Configuration"
msgstr "正在寫入 DRBD 組態"
@@ -675,55 +758,55 @@
#. 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:617
+#: src/modules/Drbd.rb:649
msgid "Write global settings"
msgstr "寫入全域設定"
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:650
msgid "Write resources"
msgstr "寫入資源"
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:651
#, fuzzy
#| msgid "Write configuration"
msgid "Write LVM configurations"
msgstr "寫入組態"
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:652
msgid "Set daemon status"
msgstr "設定精靈狀態"
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:653
#, fuzzy
#| msgid "Write the firewall settings"
msgid "Write the SuSEfirewall settings"
msgstr "寫入防火牆設定"
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:656
msgid "Writing global settings..."
msgstr "正在寫入全域設定..."
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:657
msgid "Writing resources..."
msgstr "正在寫入資源..."
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:658
#, fuzzy
#| msgid "Writing configuration..."
msgid "Writing LVM configurations..."
msgstr "正在寫入組態..."
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:659
msgid "Setting daemon status..."
msgstr "正在設定精靈狀態..."
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:660
#, fuzzy
#| msgid "Writing the firewall settings..."
msgid "Writing the SuSEFirewall settings"
msgstr "正在寫入防火牆設定..."
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:671
msgid "Failed to make directory /etc/drbd.d"
msgstr ""
Modified: trunk/yast/zh_TW/po/fcoe-client.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/fcoe-client.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/fcoe-client.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-29 01:00+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -556,36 +556,36 @@
msgstr "<p>要現在安裝嗎?</p>"
#. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
msgid "Cannot start service 'lldpad'"
msgstr ""
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
#, fuzzy
msgid "Cannot start service 'fcoe'"
msgstr "無法偵測裝置。"
#. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
msgid "Cannot start lldpad systemd socket"
msgstr ""
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
#, fuzzy
msgid "Cannot start lldpad service."
msgstr "無法偵測裝置。"
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
msgid "Cannot start fcoemon systemd socket."
msgstr ""
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
#, fuzzy
msgid "Cannot start fcoe service."
msgstr "無法偵測裝置。"
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -596,112 +596,112 @@
"VLAN 介面來取得可用的設定。"
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
msgid "Initializing fcoe-client Configuration"
msgstr "正在啟始化 fcoe-client 組態"
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
msgid "Check installed packages"
msgstr "檢查安裝的套件"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
msgid "Check services"
msgstr "檢查服務"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
msgid "Detect network cards"
msgstr "偵測網路卡"
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
msgid "Read /etc/fcoe/config"
msgstr "讀取 /etc/fcoe/config"
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
msgid "Checking for installed packages..."
msgstr "檢查已安裝的套件..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
msgid "Checking for services..."
msgstr "正在檢查服務..."
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
msgid "Detecting network cards..."
msgstr "正在偵測網路卡..."
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
msgid "Reading /etc/fcoe/config"
msgstr "正在讀取 /etc/fcoe/config"
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
msgid "Finished"
msgstr "已完成"
#. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
msgid "Starting of services failed."
msgstr "啟動服務失敗。"
#. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
msgid "Cannot detect devices."
msgstr "無法偵測裝置。"
#. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
msgid "Cannot read /etc/fcoe/config."
msgstr "無法讀取 /etc/fcoe/config 。"
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
msgid "Saving fcoe-client Configuration"
msgstr "正在儲存 fcoe-client 組態"
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
msgid "Write the settings"
msgstr "寫入設定"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
msgid "Restart FCoE service"
msgstr "重新啟動 FCoE 服務"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
msgid "Adjust start of services"
msgstr "調整服務啟動"
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
msgid "Writing the settings..."
msgstr "正在寫入設定..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
msgid "Restarting FCoE service..."
msgstr "正在重新啟動 FCoE 服務..."
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
msgid "Adjusting start of services..."
msgstr "正在調整服務啟動..."
#. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
msgid "Cannot write settings to /etc/fcoe/config."
msgstr "無法將設定寫入 /etc/fcoe/config。"
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
@@ -710,43 +710,43 @@
"細節請參考 see /var/log/YaST2/y2log。"
#. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
msgid "Restarting of service fcoe failed."
msgstr "啟動 fcoe 服務失敗。"
#. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr "無法寫入 /etc/sysconfig/network/ifcfg-files。"
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
msgid "<b>General FCoE configuration</b>"
msgstr "<b>一般 FCoE 組態</b>"
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
msgid "<b>Interfaces</b>"
msgstr "<b>介面</b>"
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
msgid "<i>Netcard</i>:"
msgstr "<i>網路卡</i>:"
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
msgid "<b>Starting of services</b>"
msgstr "<b>啟動服務</b>"
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
msgid "enabled"
msgstr "已啟用"
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
msgid "disabled"
msgstr "已停用"
Modified: trunk/yast/zh_TW/po/firewall.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/firewall.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/firewall.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-29 23:54+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -20,6 +20,16 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.4\n"
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
#. TRANSLATORS: message popup
#: src/clients/firewall_proposal.rb:113
msgid ""
@@ -180,7 +190,7 @@
#. TRANSLATORS: tree menu item
#: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
#: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
msgid "Logging Level"
msgstr "記錄層級"
@@ -702,7 +712,7 @@
#: src/include/firewall/subdialogs.rb:349
#: src/include/firewall/subdialogs.rb:509
#: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
msgid "Source Network"
msgstr "來源網路"
@@ -713,8 +723,8 @@
#: src/include/firewall/subdialogs.rb:351
#: src/include/firewall/subdialogs.rb:511
#: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
msgid "Protocol"
msgstr "協定"
@@ -768,28 +778,28 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
msgid "Req. IP"
msgstr "要求 IP"
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
msgid "Req. Port"
msgstr "申請埠"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
msgid "Redir. to IP"
msgstr "重新指向 IP"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
msgid "Redir. to Port"
msgstr "重新指向埠"
@@ -911,10 +921,10 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
msgid "Zone"
msgstr "區域"
@@ -1414,219 +1424,221 @@
msgstr "選取要刪除的項目。"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
msgid "Firewall configuration"
msgstr "防火牆組態"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
msgid "Start-up settings"
msgstr "啟動設定"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
msgid "Known firewall zones"
msgstr "已知的防火牆區域"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
msgid "Network interfaces configuration"
msgstr "網路介面組態"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
msgid "Allowed services, ports, and protocols"
msgstr "允許的服務、埠與協定"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
msgid "Broadcast packet settings"
msgstr "廣播封包設定"
#. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
msgid "Masquerading settings"
msgstr "偽裝設定"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
msgid "Redirect requests to masqueraded IP"
msgstr "將要求重新指向偽裝 IP"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
msgid "Logging settings"
msgstr "記錄設定"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
msgid "Firewall configuration summary"
msgstr "防火牆組態摘要"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
#, fuzzy
msgid "Enables firewall"
msgstr "啟用防火牆"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
#, fuzzy
msgid "Disables firewall"
msgstr "停用防火牆"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
msgid "Show current settings"
msgstr "顯示目前設定"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
msgid "Start firewall in the boot process"
msgstr "在開機程序中啟動防火牆"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
msgid "Start firewall manually"
msgstr "手動啟動防火牆"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
msgid "List configured entries"
msgstr "列出已設定組態的項目"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
msgid "Zone short name"
msgstr "區域縮寫"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
msgid "Add a new record"
msgstr "新增記錄"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
msgid "Remove a record"
msgstr "移除記錄"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
msgid "Network interface configuration name"
msgstr "網路介面組態名稱"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
msgid "Logging accepted packets (all|crit|none)"
msgstr "記錄接受的封包 (所有|關鍵|無)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
msgid "Logging not accepted packets (all|crit|none)"
msgstr "記錄不接受的封包 (所有|關鍵|無)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
msgid "Logging broadcast packets (yes|no)"
msgstr "記錄廣播封包 (是|否)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
msgid "Set value"
msgstr "設定值"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
msgid "Port name or number; comma-separate multiple ports"
msgstr "埠名稱或號碼;以逗號分隔多個埠"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
msgid "Known firewall service; comma-separate multiple services"
msgstr "已知的防火牆服務;以逗號分隔多個服務"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
msgid "TCP port name or number; comma-separate multiple ports"
msgstr "TCP 埠名稱或號碼;以逗號分隔多個埠"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
msgid "UDP port name or number; comma-separate multiple ports"
msgstr "UDP 埠名稱或號碼;以逗號分隔多個埠"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
msgid "RPC port name; comma-separate multiple ports"
msgstr "RPC 埠名稱;以逗號分隔多個埠"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
msgid "IP protocol name; comma-separate multiple protocols"
msgstr "IP 協定名稱;以逗號分隔多個協定"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
msgid "Set zone protection (yes|no)"
msgstr "設定區域保護 (是|否)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
msgid "Detailed information"
msgstr "詳細資訊"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
msgid "Enable option"
msgstr "啟用選項"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
msgid "Disable option"
msgstr "停用選項"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
msgstr "來源網路,例如 0/0 或 145.12.35.0/255.255.255.0"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
msgid "Protocol (tcp|udp)"
msgstr "協定 (tcp|udp)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
msgid "Requested external IP (optional)"
msgstr "要求的外部 IP (選擇性)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
msgid "Requested port name or number"
msgstr "要求的埠名稱或號碼"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
msgid "Redirect to internal IP"
msgstr "重新指向內部 IP"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
msgid "Redirect to port on internal IP (optional)"
msgstr "重新指向內部 IP 上的埠 (選擇性)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
msgid "Record number"
msgstr "記錄號碼"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
msgid "Use port names instead of port numbers"
msgstr "使用埠名稱而非埠號碼"
#. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
msgid "Unknown zone %1."
msgstr "未知區域 %1。"
@@ -1639,180 +1651,180 @@
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
msgid "Parameter %1 must be set."
msgstr "必須設定參數 %1。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
msgid "Listing Known Firewall Zones:"
msgstr "列出已知的防火牆區域:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
msgid "Shortcut"
msgstr "捷徑"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
msgid "Zone Name"
msgstr "區域名稱"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
msgid "Summary:"
msgstr "摘要:"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
msgid "Only one parameter is allowed."
msgstr "只允許一個參數。"
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
msgid "Start-Up:"
msgstr "啟動:"
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
msgid "Enabling firewall in the boot process..."
msgstr "正在開機程序中啟用防火牆..."
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
msgid "Removing firewall from the boot process..."
msgstr "正在從開機程序中移除防火牆..."
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
msgid "Firewall is enabled in the boot process"
msgstr "已在開機程序中啟用防火牆"
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
msgid "Firewall needs manual starting"
msgstr "防火牆需要手動啟動"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
msgid "Network Interfaces in Firewall Zones:"
msgstr "防火牆區域的網路介面:"
#. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
msgid "Special firewall string"
msgstr "特殊防火牆字串"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
msgid "Interface"
msgstr "介面"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
msgid "Device Name"
msgstr "設備名稱"
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
msgid "Adding special string %1 into zone %2..."
msgstr "正在新增特殊字串 %1 到區域 %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
msgid "Adding interface %1 into zone %2..."
msgstr "正在新增介面 %1 到區域 %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
msgid "Removing special string %1 from zone %2..."
msgstr "正在移除區域 %2 中的特殊字串 %1..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
msgid "Removing interface %1 from zone %2..."
msgstr "正在移除區域 %2 中的介面 %1..."
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
msgid "Log all"
msgstr "記錄所有"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
msgid "Log only critical"
msgstr "只記錄關鍵"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
msgid "Do not log any"
msgstr "完全不記錄"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
msgid "Global Logging Settings:"
msgstr "全域記錄設定:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
msgid "Rule Type"
msgstr "規則類型"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
msgid "Value"
msgstr "值"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
msgid "Accepted"
msgstr "接受"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
msgid "Not accepted"
msgstr "不接受"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
msgid "Logging Broadcast Packets:"
msgstr "記錄廣播封包:"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
msgid "Logging enabled"
msgstr "記錄已啟用"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
msgid "Logging disabled"
msgstr "記錄已停用"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
msgid "Short"
msgstr "簡短的"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
msgid "Logging Status"
msgstr "記錄狀態"
@@ -1821,168 +1833,181 @@
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
msgid "Value %1 is not allowed for option %2."
msgstr "值 %1 不允許用於選項 %2。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
msgid "Allowed Broadcast Ports:"
msgstr "允許的廣播埠:"
#. TRANSLATORS: CommandLine header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
msgid "Port"
msgstr "埠"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
msgid "Only one action command is allowed here."
msgstr "在此只允許一個動作指令。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
msgid "Defined Firewall Services:"
msgstr "定義的防火牆服務:"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
msgid "ID"
msgstr "ID"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
msgid "Service Name"
msgstr "服務名稱"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
msgid "TCP port"
msgstr "TCP 埠"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
msgid "UDP port"
msgstr "UDP 埠"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
msgid "RPC port"
msgstr "RPC 埠"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
msgid "IP protocol"
msgstr "IP 協定"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
msgid "Allowed Services in Zones:"
msgstr "允許的區域服務:"
#. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
msgid "All services"
msgstr "所有服務"
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
msgid "Entire zone unprotected"
msgstr "整個區域未受到保護"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
msgid "Service ID"
msgstr "服務 ID"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
msgid "Additional Allowed Ports:"
msgstr "其他的允許埠:"
#. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
msgid "All ports"
msgstr "所有埠"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
msgid "Allowed Additional IP Protocols in Zones:"
msgstr "區域中允許的其它 IP 協定:"
#. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
msgid "All IP protocols"
msgstr "所有 IP 協定"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
msgid "IP Protocol"
msgstr "IP 協定"
#. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
msgid "Unknown service %1."
msgstr "未知服務 %1。"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
msgid "Protection can only be set for internal zones."
msgstr "可以只為內部區域設定保護。"
#. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
msgid "At least one of %1 must be set."
msgstr "至少必須設定一個 %1。"
#. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
msgid "At least one action command from %1 must be set."
msgstr "至少必須設定一個 %1 的動作指令。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
msgid "Redirect Requests to Masqueraded IP:"
msgstr "將要求重新指向偽裝 IP:"
#. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
msgid "Unknown port name %1."
msgstr "未知的埠名稱 %1。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
msgid "Masquerading Settings:"
msgstr "偽裝設定:"
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
#. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
msgstr "偽裝為 %1"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
msgid "enabled"
msgstr "已啟用"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
msgid "disabled"
msgstr "已停用"
Modified: trunk/yast/zh_TW/po/firstboot.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/firstboot.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/firstboot.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-18 13:24+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -118,13 +118,13 @@
msgstr "標籤"
#: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "狀態"
+
+#: src/clients/firstboot_config.rb:68
msgid "Module Name"
msgstr "模組名稱"
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "狀態"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
@@ -296,7 +296,7 @@
"</p>\n"
#. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
msgid "There is not enough space to install all additional packages."
msgstr "沒有足夠的空間可安裝所有額外的套件。"
Modified: trunk/yast/zh_TW/po/fonts.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/fonts.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/fonts.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -20,63 +20,63 @@
#. 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
+#: src/lib/fonts/fonts-config-state.rb:59
#, fuzzy
#| msgid "Bitmap Editors"
msgid "Bitmap Fonts"
msgstr "點陣圖編輯器"
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
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
+#: src/lib/fonts/fonts-config-state.rb:107
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
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
+#: src/lib/fonts/fonts-config-state.rb:127
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
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
+#: src/lib/fonts/fonts-config-state.rb:147
msgid "Default"
msgstr "預設"
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
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
+#: src/lib/fonts/fonts-config-state.rb:167
#, fuzzy
#| msgid "Fonts"
msgid "CFF Fonts"
msgstr "字型"
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
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
+#: src/lib/fonts/fonts-config-state.rb:210
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
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
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: trunk/yast/zh_TW/po/geo-cluster.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/geo-cluster.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/geo-cluster.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -60,10 +60,8 @@
#.
#. $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:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
#, fuzzy
#| msgid "Printer Configurations"
@@ -121,17 +119,17 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:819
msgid "Add"
msgstr "新增"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:820
msgid "Edit"
msgstr "編輯"
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:821
msgid "Delete"
msgstr "刪除"
@@ -139,19 +137,18 @@
msgid "site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
msgid "ticket"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:106
#, fuzzy
#| msgid "Authentication"
-msgid "Authentification"
+msgid "Authentication"
msgstr "驗證"
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
#, fuzzy
#| msgid "Cancel"
msgid "Ca&ncel"
@@ -159,9 +156,9 @@
#. 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
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
msgid "OK"
msgstr "確定"
@@ -174,193 +171,196 @@
#: src/include/geo-cluster/dialogs.rb:128
#, fuzzy
#| msgid "Authentication Key"
-msgid "Authentification file"
+msgid "Authentication file"
msgstr "驗證鑰匙"
#: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:146
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:151
#, fuzzy
#| msgid "Authentication Key"
-msgid "Generate Authentification Key File"
+msgid "Generate Authentication Key File"
msgstr "驗證鑰匙"
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:159
#, fuzzy
#| msgid "&Basics"
msgid "Basic"
msgstr "基本(&B)"
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
msgid "Cancel"
msgstr "取消"
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
#, fuzzy
#| msgid "Enter a valid e-mail address"
msgid "Please enter a valid ip address"
msgstr "請輸入有效的電子郵件地址"
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
msgid "timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
#, fuzzy
#| msgid "NFS entries"
msgid "retries"
msgstr "NFS 項目"
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
#, fuzzy
#| msgid "Height"
msgid "weights"
msgstr "高度"
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
#, fuzzy
#| msgid "Expired"
msgid "expire"
msgstr "過期"
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
#, fuzzy
#| msgid "Required patterns"
msgid "acquire-after"
msgstr "需要的樣式"
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
#, fuzzy
#| msgid "Action is invalid."
msgid "timeout is invalid"
msgstr "動作無效。"
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
#, fuzzy
#| msgid "' is not valid."
msgid "expire is invalid"
msgstr "' 無效。"
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
#, fuzzy
#| msgid "URL entered is not valid"
msgid "acquireafter is invalid"
msgstr "輸入的位址無效"
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
#, fuzzy
#| msgid "URL entered is not valid"
msgid "retries is invalid"
msgstr "輸入的位址無效"
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
#, fuzzy
#| msgid "' is not valid."
msgid "weights is invalid"
msgstr "' 無效。"
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
#, fuzzy
#| msgid "Port field cannot be empty"
msgid "ticket can not be empty"
msgstr "埠號不可空白"
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407
-#: src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr "防火牆組態"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:569
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Enter an IP address of your arbitrator"
msgstr "機器的本地 IP 位址(&L)"
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:580
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Edit IP address of your arbitrator"
msgstr "機器的本地 IP 位址(&L)"
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:596
msgid "Enter an IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:607
msgid "Edit IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:629
#, fuzzy
#| msgid "The target already exists"
msgid "Ticket name already exist!"
msgstr "目標已存在"
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:661
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be empty."
msgstr "組態名稱不能是空白。"
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:664
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be duplicated."
msgstr "組態名稱不能是空白。"
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:672
#, fuzzy
#| msgid "Key is invalid."
msgid "port is invalid!"
msgstr "金鑰無效。"
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:678
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:684
#, fuzzy
#| msgid "Software to be installed:"
msgid "arbitrator have to be filled!"
msgstr "將被安裝的軟體:"
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:689
#, fuzzy
#| msgid "Software to be installed:"
msgid "site have to be filled!"
msgstr "將被安裝的軟體:"
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:694
#, fuzzy
#| msgid "Software to be installed:"
msgid "ticket have to be filled!"
@@ -368,20 +368,24 @@
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
+#: src/include/geo-cluster/dialogs.rb:748
#, fuzzy
#| msgid "Failed to create the installation RAM disk."
-msgid "Failed to create authentification file "
+msgid "Failed to create authentication file "
msgstr "無法建立安裝 RAM 磁碟。"
-#: src/include/geo-cluster/dialogs.rb:736
+#: src/include/geo-cluster/dialogs.rb:751
#, fuzzy
-#| msgid "Set the authentication for proxy"
-msgid "Succeed to created authentification file "
-msgstr "設定代理的驗證"
+#| msgid "Authentication Key"
+msgid "Authentication file "
+msgstr "驗證鑰匙"
+#: src/include/geo-cluster/dialogs.rb:751
+msgid " created successfully."
+msgstr ""
+
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:810
#, fuzzy
#| msgid "Host Configuration Summary:"
msgid "GeoCluster Configuration Select"
@@ -389,7 +393,7 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:816
#, fuzzy
#| msgid "Read configuration file"
msgid "Choose configuration file:"
@@ -398,7 +402,7 @@
#: src/include/geo-cluster/wizards.rb:47
#, fuzzy
#| msgid "Autoinstallation - Configuration"
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
msgstr "自動安裝 - 組態"
#. Initialization dialog contents
@@ -555,6 +559,11 @@
msgstr "組態摘要..."
#, fuzzy
+#~| msgid "Set the authentication for proxy"
+#~ msgid "Succeed to created authentification file "
+#~ msgstr "設定代理的驗證"
+
+#, fuzzy
#~| msgid "Software to be installed:"
#~ msgid "site have to be filled"
#~ msgstr "將被安裝的軟體:"
Modified: trunk/yast/zh_TW/po/installation.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/installation.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/installation.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-01-16 09:21+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -40,7 +40,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
msgid "Initializing..."
msgstr "正在初始化..."
@@ -115,29 +115,29 @@
"介面安裝不同。\n"
#. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
msgid "Start service %1"
msgstr "啟動服務 %1"
#. TRANSLATORS: progress stage, %1 stands for service name
#. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
#: src/lib/installation/clients/inst_restore_settings.rb:47
msgid "Starting service %1..."
msgstr "正在啟動服務 %1..."
#. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
msgid "Adjusting Network Settings"
msgstr "調整網路設定"
#. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
msgid "Network settings are being adjusted."
msgstr "網路設定已完成調整。"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
msgid ""
"The previous installation has failed.\n"
"Would you like it to continue?\n"
@@ -150,7 +150,7 @@
"注意: 您可能需要再次輸入某些資訊。"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
msgid ""
"The previous installation has been aborted.\n"
"Would you like it to continue?\n"
@@ -165,7 +165,7 @@
#. popup headline (#x1)
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
#: src/lib/installation/clients/inst_doit.rb:60
msgid "Starting Installation..."
msgstr "開始安裝..."
@@ -208,28 +208,28 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:133
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>若您不確定,請回到上一頁檢查您的設定。</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
+#: src/lib/installation/proposal_runner.rb:121
msgid "Confirm Update"
msgstr "確認更新"
#. 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
+#: src/lib/installation/proposal_runner.rb:125
msgid "<p>Information required to perform an update is now complete.</p>"
msgstr "<p>執行更新所需要的資訊現在都已完成。</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
+#: src/lib/installation/proposal_runner.rb:127
msgid ""
"\n"
"<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -242,7 +242,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:136
msgid "Start &Update"
msgstr "開始更新(&U)"
@@ -282,54 +282,7 @@
msgstr "正在啟動服務 %1..."
#. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr ""
-
-#. TRANSLATORS: help text
-#: 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"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"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 <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-"<p>若您要建立一個 AutoYaST 的設定檔,請使用<b>複製</b>。\n"
-"AutoYaST 是一種不需與使用者互動就能自動完成 SUSE Linux 安裝的方法。AutoYaST\n"
-"需要一個設定檔,才能知道已安裝系統是什麼樣子。若選取此選項,\n"
-"一個針對目前系統的設定檔會被儲存在 <tt>/root/autoyast.xml</tt>。</p>"
-
-#: 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/lib/installation/clients/clone_proposal.rb:71
-#, fuzzy
-msgid "Clone System Configuration"
-msgstr "正在寫入系統組態..."
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-#, fuzzy
-msgid "&Clone System Configuration"
-msgstr "跳過組態(&S)"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
-msgstr ""
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
-msgstr ""
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:83
msgid "Copying files to installed system..."
msgstr "正在複製檔案到已安裝的系統..."
@@ -526,7 +479,7 @@
msgstr "更新 %1 %2"
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:321
msgid "Unknown Product"
msgstr "未知的產品"
@@ -555,54 +508,27 @@
"選擇是否要立即執行線上更新。\n"
"您可跳過此步驟,以後再執行線上更新。\n"
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
msgid "Language, Keyboard and License Agreement"
msgstr ""
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: 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 "語言(&L)"
-
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "鍵盤配置(&K)"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
-msgid "I &Agree to the License Terms."
-msgstr "我同意授權合約的內容(&A)。"
-
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:319
#, fuzzy
-#| msgid "Keyboard &test:"
-msgid "K&eyboard Test"
-msgstr "鍵盤測試(&T):"
+msgid "Re&lease Notes..."
+msgstr "發行摘要"
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "授權合約"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-msgid "License &Translations..."
-msgstr "授權翻譯...(&T)"
-
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -616,7 +542,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -629,7 +555,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -640,7 +566,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -653,7 +579,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
msgid ""
"<p>\n"
"Select <b>Abort</b> to abort the\n"
@@ -665,23 +591,57 @@
"安裝程序。\n"
"</p>\n"
-#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: 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 "Re&lease Notes..."
-msgstr "發行摘要"
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
+msgid "License Agreement"
+msgstr "授權合約"
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:429
+msgid "&Language"
+msgstr "語言(&L)"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
+msgid "&Keyboard Layout"
+msgstr "鍵盤配置(&K)"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
+msgid "I &Agree to the License Terms."
+msgstr "我同意授權合約的內容(&A)。"
+
+#. Report error about missing license acceptance
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
msgid "You must accept the license to install this product"
msgstr ""
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "正在檢查已安裝的系統..."
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
+#, fuzzy
+#| msgid "Keyboard &test:"
+msgid "K&eyboard Test"
+msgstr "鍵盤測試(&T):"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
+msgid "License &Translations..."
+msgstr "授權翻譯...(&T)"
+
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
msgid "&Disable ZMD Service"
@@ -784,7 +744,7 @@
msgstr "尚未安裝 autoyast2 套件,複製停用。"
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
msgid "The system will reboot now..."
msgstr "系統現在將重新開機..."
@@ -793,16 +753,16 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
#: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
msgid "Deploying Images..."
msgstr "正在準備影像..."
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:168
msgid ""
"Deploying images has failed.\n"
"Aborting the installation...\n"
@@ -811,7 +771,7 @@
"正在中止安裝...\n"
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:200
msgid ""
"Debugging has been turned on.\n"
"YaST will open a software manager for you to check the current status of packages."
@@ -820,20 +780,20 @@
"YaST 將為您開啟套件管理員以檢查目前套件的狀態。"
#. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:376
msgid "Downloading image at speed %1/s"
msgstr "正在以速率 %1/s 下載影像"
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:381
msgid "Downloading image %1 at speed %2/s"
msgstr "正在下載影像 %1,以速率 %2/s"
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:441
msgid "Deploying image..."
msgstr "正在準備影像..."
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:444
msgid "Deploying image %1..."
msgstr "正在準備影像 %1..."
@@ -850,43 +810,44 @@
msgid "&Disk to Use"
msgstr ""
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
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/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
msgid "Hard Disk for Image Deployment"
msgstr ""
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
msgid "Detecting Available Controllers"
msgstr "正在偵測可用的控制器"
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
msgid "Disk Activation"
msgstr "磁碟啟用"
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
msgid "Configure &DASD Disks"
msgstr "設定 DASD 磁碟組態(&D)"
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
msgid "Configure &ZFCP Disks"
msgstr "設定 ZFCP 磁碟組態(&Z)"
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
msgid "Configure &FCoE Interfaces"
msgstr "設定 FCoE(&F) 介面"
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
msgid "Configure &iSCSI Disks"
msgstr "設定 iSCSI 磁碟組態(&I)"
-#: src/lib/installation/clients/inst_disks_activate.rb:111
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
#, fuzzy
-msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
msgstr "正在儲存網路組態..."
#. TRANSLATORS: dialog caption
@@ -905,7 +866,7 @@
#. bug #302384
#: 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
+#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "初始化中"
@@ -930,71 +891,74 @@
msgid "Show &package updates"
msgstr "顯示套件更新(&P)"
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+msgid "Calling step %1..."
+msgstr "正在呼叫步驟 %1..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr " * %1"
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "安裝錯誤"
+
#. Adjust a SlideShow dialog if not configured
#. kilobytes
#. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
msgid "Finishing Basic Installation"
msgstr "完成基本安裝"
#. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
msgid "Creating list of finish scripts to call..."
msgstr "正在建立要呼叫的結束程序清單..."
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "已完成"
+
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:456
msgid "Copy files to installed system"
msgstr "複製檔案到已安裝的系統"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:463
msgid "Save configuration"
msgstr "儲存組態"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:470
msgid "Save installation settings"
msgstr "儲存安裝設定"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:479
msgid "Install boot manager"
msgstr "安裝開機管理員"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:486
msgid "Prepare system for initial boot"
msgstr "準備第一次啟動系統"
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
msgid "Checking stage: %1..."
msgstr "正在檢查階段: %1 ..."
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
-msgid "Calling step %1..."
-msgstr "正在呼叫步驟 %1..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
-msgid " * %1"
-msgstr " * %1"
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
-msgid "Finished"
-msgstr "已完成"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
-msgid "Installation Error"
-msgstr "安裝錯誤"
-
#. Button to accept a license agreement
#: src/lib/installation/clients/inst_info.rb:63
msgid "I &Agree"
@@ -1016,23 +980,23 @@
msgstr "正在準備初始系統組態..."
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
#, fuzzy
msgid "Installation Options"
msgstr "安裝模式"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
msgid "&Add Online Repositories Before Installation"
msgstr "在安裝前加入線上套件庫(&A)"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
msgid "In&clude Add-on Products from Separate Media"
msgstr "包含其他媒體中的附加產品(&C)"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
#, fuzzy
msgid "<p><big><b>Installation Options</b></big></p>"
msgstr ""
@@ -1040,7 +1004,7 @@
"選取您要執行的動作:</p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1051,7 +1015,7 @@
"<b>在安裝前加入線上套件庫</b>。</p>"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
msgid ""
"<p>\n"
"To install an add-on product from separate media together with &product;, select\n"
@@ -1062,7 +1026,7 @@
"<b>「包含其他媒體中的附加產品」</b>。</p>\n"
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr ""
@@ -1190,7 +1154,7 @@
#. Use 'zero' if image installation is not used
#. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
msgid "Installing Packages..."
msgstr "正在安裝套件..."
@@ -1224,7 +1188,7 @@
"<b>發行摘要</b>。這份記事提供您關於新功能與變更的簡短摘要。</p>\n"
#. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
msgid "<p>No release notes have been installed.</p>"
msgstr "<p>沒有安裝發行摘要。</p>"
@@ -1249,88 +1213,88 @@
#. This dialog in not interactive
#. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
msgid "Analyzing the Computer"
msgstr "正在分析電腦"
#. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
msgid "Probe USB devices"
msgstr "偵測 USB 裝置"
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
msgid "Probing USB devices..."
msgstr "正在偵測 USB 裝置..."
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
msgid "Probe FireWire devices"
msgstr "偵測 FireWire 裝置"
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
msgid "Probing FireWire devices..."
msgstr "正在偵測 FireWire 裝置..."
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
msgid "Probe floppy disk devices"
msgstr "查探軟碟機裝置"
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
msgid "Probing floppy disk devices..."
msgstr "正在查探軟碟機裝置..."
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
msgid "Probe hard disk controllers"
msgstr "偵測硬碟控制器"
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
msgid "Probing hard disk controllers..."
msgstr "正在偵測硬碟控制器..."
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
msgid "Load kernel modules for hard disk controllers"
msgstr "載入硬碟控制器的核心模組"
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
msgid "Loading kernel modules for hard disk controllers..."
msgstr "正在載入硬碟控制器的核心模組..."
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
msgid "Probe hard disks"
msgstr "偵測硬碟"
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
msgid "Probing hard disks..."
msgstr "正在偵測硬碟..."
#. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
msgid "Search for system files"
msgstr "搜尋系統檔案"
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
msgid "Searching for system files..."
msgstr "正在搜尋系統檔案..."
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
msgid "Initialize software manager"
msgstr "初始化軟體管理員"
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
msgid "Initializing software manager..."
msgstr "正在初始化軟體管理員..."
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
msgid "System Probing"
msgstr "系統偵測"
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
msgid "YaST is probing computer hardware and installed systems now."
msgstr "YaST 現在正在偵測電腦硬體與已安裝的系統。"
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:257
#, fuzzy
msgid ""
"\n"
@@ -1340,7 +1304,7 @@
"請檢查您的硬體!\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:271
#, fuzzy
msgid ""
"No hard disks were found for the installation.\n"
@@ -1350,7 +1314,7 @@
"未發現要進行安裝的硬碟。\n"
"請檢查您的硬體!\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:281
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1361,7 +1325,7 @@
"(尤其在 S/390 或 iSCSI 系統)\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:292
#, fuzzy
msgid ""
"No hard disks and no hard disk controllers were\n"
@@ -1374,7 +1338,7 @@
"請檢查您的硬體。\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:337
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
@@ -1382,6 +1346,52 @@
"無法初始化軟體套件庫。\n"
"中止安裝。"
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:187
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:193
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:265
+msgid ""
+"Downloading the optional installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
+msgstr ""
+
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
msgid "Removed"
@@ -1435,8 +1445,8 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
msgid "&Change..."
msgstr "變更(&C)..."
@@ -1646,7 +1656,7 @@
"設定系統的基本組態。</p>\n"
#. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
msgid "No workflow defined for this kind of installation."
msgstr "沒有為此安裝模式定義的工作流程。"
@@ -1666,7 +1676,7 @@
msgstr "正在設定連結器快取..."
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
msgid "Saving network configuration..."
msgstr "正在儲存網路組態..."
@@ -1720,6 +1730,24 @@
msgid "Saving hardware configuration..."
msgstr "正在儲存硬體組態..."
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+msgid "Import SSH Host Keys and Configuration"
+msgstr "正在寫入系統組態..."
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "跳過組態(&S)"
+
#. progress step title
#: src/lib/installation/clients/ssh_settings_finish.rb:64
msgid "Copying SSH settings to installed system..."
@@ -1787,6 +1815,33 @@
msgid "Copying log files to installed system..."
msgstr "正在複製記錄檔到已安裝的系統..."
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "裝置"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+msgid "Import SSH Configuration"
+msgstr "跳過組態(&S)"
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
#, fuzzy
@@ -1794,34 +1849,22 @@
msgstr "正在搜尋 Linux 分割區..."
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
msgid "Really reset everything to default values?"
msgstr "確定要將所有項目重設成預設值嗎?"
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
msgid "You will lose all changes."
msgstr "您將會遺失所有變更。"
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-#, fuzzy
-msgid "Location of Stored Configuration"
-msgstr "全自動組態"
-
-#. 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 ""
-
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
msgid "Skipping configuration upon user request"
msgstr "依使用者的要求跳過組態"
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
@@ -1830,25 +1873,25 @@
"先解決才能繼續。\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
msgid "Adapting the proposal to the current settings..."
msgstr "正在調整提案到目前的設定..."
#. 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
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
msgid "Analyzing your system..."
msgstr "正在分析您的系統..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
msgid "ERROR: No proposal"
msgstr "錯誤: 無建議"
#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1861,44 +1904,37 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
msgid "&Skip Configuration"
msgstr "跳過組態(&S)"
#. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
msgid "&Use Following Configuration"
msgstr "使用下列組態(&U)"
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-#, fuzzy
-msgid "&Export Configuration"
-msgstr "跳過組態(&S)"
-
#. 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
+#: src/lib/installation/proposal_runner.rb:693
msgid "Click a headline to make changes or use the \"Change...\" menu below."
msgstr "按一下任何標題或使用下面的「變更...」選單來改變設定。"
-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
#, fuzzy
msgid "Click a headline to make changes."
msgstr "按一下任何標題或使用下面的「變更...」選單來改變設定。"
#. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
msgid "&Reset to defaults"
msgstr "重設成預設值(&R)"
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Update"
msgstr "更新(&U)"
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Install"
msgstr "安裝(&I)"
@@ -1933,7 +1969,7 @@
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
msgid ""
"<p>\n"
"Select <b>Install</b> to perform a new installation with the values displayed.\n"
@@ -1946,7 +1982,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:434
msgid ""
"<p>\n"
"Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1958,7 +1994,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:443
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1970,7 +2006,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:451
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -1982,7 +2018,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -1993,12 +2029,12 @@
"</p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr "<P><B>UML 安裝建議</B></P>"
#. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -2009,7 +2045,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:482
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2028,6 +2064,11 @@
msgid "Enabling remote administration..."
msgstr "遠端管理"
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:79
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
#. Writes configuration
#.
#. It creates a snapshot when no second stage is required and
@@ -2035,21 +2076,113 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
#, fuzzy
#| msgid "Copying root filesystem..."
msgid "Creating root filesystem snapshot..."
msgstr "正在複製根檔案系統..."
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+msgid "No previous Linux installation found"
+msgstr ""
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. 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/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. 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/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+#| msgid "Unknown Product"
+msgid "Unknown protocol %1."
+msgstr "未知的產品"
+
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
msgid "Failed to read information about installation images"
msgstr "讀取關於安裝影像的資訊失敗"
#. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
msgid "Deploying..."
msgstr "正在準備..."
@@ -2057,19 +2190,19 @@
#.
#. @see #all_supported_types
#. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
msgid "Storing user preferences..."
msgstr "正在儲存使用者偏好設定..."
#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
#.
#. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
msgid "Restoring user preferences..."
msgstr "正在重新載入使用者偏好設定..."
#. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
msgid ""
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
@@ -2077,6 +2210,22 @@
"安裝程序無法自動解決套件相依性問題。\n"
"軟體管理員將開啟讓您能手動解決這些問題。"
+#, fuzzy
+#~ msgid ""
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "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 <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgstr ""
+#~ "<p>若您要建立一個 AutoYaST 的設定檔,請使用<b>複製</b>。\n"
+#~ "AutoYaST 是一種不需與使用者互動就能自動完成 SUSE Linux 安裝的方法。AutoYaST\n"
+#~ "需要一個設定檔,才能知道已安裝系統是什麼樣子。若選取此選項,\n"
+#~ "一個針對目前系統的設定檔會被儲存在 <tt>/root/autoyast.xml</tt>。</p>"
+
+#, fuzzy
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "全自動組態"
+
#~ msgid "ERROR: Missing Title"
#~ msgstr "錯誤: 遺失標題"
@@ -2194,9 +2343,6 @@
#~ msgid "Network Card"
#~ msgstr "網路卡"
-#~ msgid "Device"
-#~ msgstr "裝置"
-
#~ msgid "Hardware Information of the Selected Network Card"
#~ msgstr "所選取網路卡的硬體資訊"
Modified: trunk/yast/zh_TW/po/iscsi-client.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/iscsi-client.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/iscsi-client.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: iscsi-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-18 13:36+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -113,7 +113,6 @@
msgid "Add"
msgstr "新增"
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
#: src/include/iscsi-client/dialogs.rb:160
msgid "Edit"
msgstr "編輯"
@@ -173,47 +172,64 @@
msgid "Startup"
msgstr "啟動"
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "手動"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr "IP 位址"
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
msgid "Port"
msgstr "埠"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Key"
msgstr "金鑰"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Value"
msgstr "值"
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
msgid "Service"
msgstr "服務"
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
msgid "Connected Targets"
msgstr "已連線目標"
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
msgid "Discovered Targets"
msgstr "已發現目標"
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
msgid "iSCSI Initiator Overview"
msgstr "iSCSI 啟動器綜覽"
#. discovery new target
#. 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/dialogs.rb:407
#: 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>"
@@ -222,9 +238,9 @@
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
msgid "iSCSI Initiator Discovery"
msgstr "iSCSI 啟動器搜索"
@@ -455,29 +471,27 @@
msgid "Error occurred while logging out from the selected target."
msgstr "登出選定目標時發生錯誤。"
-#. toggle all 3 possible values (bnc#457252)
#: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
msgid "No record found."
msgstr "找不到記錄"
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
msgid "No valid IP address"
msgstr "無效的 IP 位址"
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
msgid "Port field cannot be empty"
msgstr "埠號不可空白"
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:393
#, fuzzy
#| msgid "Initiator Name"
msgid "Incorrect Initiator Name"
msgstr "起始者名稱"
-#: src/include/iscsi-client/widgets.rb:429
+#: src/include/iscsi-client/widgets.rb:394
#, fuzzy
#| msgid ""
#| "Incorrect InitiatorName.\n"
@@ -505,13 +519,18 @@
"例如:\n"
"iqn.2007-04.cz.server:storage.disk.sdb\n"
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
msgid "Insert the IP address."
msgstr "插入 IP 位址。"
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
#. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:596
msgid "Insert the port."
msgstr "插入埠。"
@@ -519,36 +538,36 @@
#. ******************* 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:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
msgid "True"
msgstr "真"
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
msgid "False"
msgstr "假"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr "已連線擁有此 TargetName 的目標。 請確定已啟用「多重路徑」來避免資料毀損。"
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Continue"
msgstr "繼續"
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
msgid "Cancel"
msgstr "取消"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:869
msgid "The target is already connected."
msgstr "目標已經連線。"
@@ -638,7 +657,7 @@
msgstr "全部"
#. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:730
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -650,15 +669,16 @@
"並將建立備份。若想使用其他的啟動器名稱,\n"
"請在 BIOS 中變更。\n"
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
#, fuzzy
#| msgid "Image creation failed."
msgid "Target connection failed.\n"
msgstr "影像建立失敗。"
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1208
msgid "Configuration summary..."
msgstr "組態摘要..."
Modified: trunk/yast/zh_TW/po/iscsi-lio-server.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/iscsi-lio-server.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/iscsi-lio-server.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -41,15 +41,14 @@
msgstr "服務"
#. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73
-#: src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
msgid "Global"
msgstr "全球"
#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#: src/modules/IscsiLioServer.rb:443
msgid "Targets"
msgstr "目標"
@@ -66,7 +65,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#, fuzzy
msgid "Portal group"
msgstr "寫入群組"
@@ -93,7 +92,7 @@
msgstr "使用者驗證"
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
msgid "LUN"
msgstr "LUN"
@@ -106,160 +105,165 @@
msgstr "路徑"
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/widgets.rb:453
msgid "Add"
msgstr "新增"
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
msgid "Edit"
msgstr "編輯"
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
+#: src/include/iscsi-lio-server/widgets.rb:454
msgid "Delete"
msgstr "刪除"
-#: src/include/iscsi-lio-server/dialogs.rb:193
-#, fuzzy
-msgid "Client"
-msgstr "用戶端"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
+msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "LUN Mapping"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
#, fuzzy
msgid "Auth"
msgstr "作者"
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
#, fuzzy
msgid "Edit LUN"
msgstr "編輯"
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
#, fuzzy
msgid "Edit Auth"
msgstr "編輯 SOA(&S)"
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
msgid "Copy"
msgstr ""
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "無驗證"
-#: src/include/iscsi-lio-server/dialogs.rb:225
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/widgets.rb:229
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "內送驗證"
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:721
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
msgid "Username"
msgstr "使用者名稱"
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:722
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
msgid "Password"
msgstr "密碼"
-#: src/include/iscsi-lio-server/dialogs.rb:248
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/widgets.rb:242
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "外送驗證"
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
msgid "When &Booting"
msgstr "開機時(&B)"
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
msgid "&Manually"
msgstr "手動(&M)"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "開機時"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "手動"
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Key"
msgstr "金鑰"
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Value"
msgstr "值"
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
#, fuzzy
msgid "iSCSI LIO Target Overview"
msgstr "iSCSI 目標綜覽"
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
msgid "<h1>iSCSI Target</h1>"
msgstr "<h1>iSCSI 目標</h1>"
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
msgid "Add iSCSI Target"
msgstr "新增 iSCSI 目標"
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
#, fuzzy
-msgid "Modify iSCSI Target Client Setup"
+msgid "Modify iSCSI Target Initiator Setup"
msgstr "修改 iSCSI 目標"
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
#, fuzzy
msgid "Modify iSCSI Target Lun Setup"
msgstr "修改 iSCSI 目標"
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
msgid "iSCSI Target Expert Settings"
msgstr "iSCSI 目標進階設定"
@@ -417,22 +421,27 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
msgstr ""
#: src/include/iscsi-lio-server/helps.rb:130
#, fuzzy
-msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+msgid ""
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgstr ""
"選取驗證類型。 使用<b>「無驗證」</b>或<b>「內送」</b>和<b>「外送」</b>其中之一 (亦可兩者皆用)。 然後插入<b>「使用者」</b>和<b>「密碼」</b>。 \n"
"內送驗證可以<b>「新增」</b>更多使用者和密碼組合,也可以<b>「編輯」</b>和<b>「刪除」</b>。"
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
msgstr ""
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
#, fuzzy
msgid ""
"List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
@@ -443,13 +452,13 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
#, fuzzy
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr "<h1>iSCSI 目標</h1>"
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
msgid ""
"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -458,20 +467,20 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
msgid ""
"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
"and port the service will be available. Default for port number is 3260.\n"
"Only ip addresses assigned to one of the network cards are possible."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
#, fuzzy
msgid "Create a new target. Replace template values with the correct values."
msgstr "建立新目標。用正確的值取代範本值。\n"
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
msgid ""
"It is possible to make arbitary block devices or files available under a lun.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -480,11 +489,11 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr "您可<b>新增</b>、<b>編輯</b>或<b>刪除</b>所有額外的組態選項。"
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
#, fuzzy
msgid ""
"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
@@ -494,212 +503,228 @@
"如果 Type=fileio,請將<b>「路徑」</b>設為磁碟設備或檔案。<b>「SCSI ID」</b>與<b>「磁區」</b>是選擇性,非必要設定。"
#. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
#, fuzzy
msgid "Problem changing authentication"
msgstr "啟用指紋驗證"
#. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
#, fuzzy
msgid "Invalid Username"
msgstr "無效的伺服器名稱。"
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
#, fuzzy
msgid "Invalid Password."
msgstr "無效的密碼。"
-#: src/include/iscsi-lio-server/widgets.rb:251
+#: src/include/iscsi-lio-server/widgets.rb:262
#, fuzzy
-msgid "Selected Lun is already in use!"
+msgid "Selected LUN is already in use!"
msgstr "選取的選項已存在"
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
#, fuzzy
msgid "Selected Name is already in use!"
msgstr "指定的佇列名稱 %1 已使用。"
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected Path must be either block device or normal file!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
#, fuzzy
msgid "Selected Path is already in use!"
msgstr "選取的選項已存在"
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
msgid "Path:"
msgstr "路徑:"
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
msgid "Browse"
msgstr "瀏覽"
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
msgid "Select file or device"
msgstr "選取檔案或設備"
-#: src/include/iscsi-lio-server/widgets.rb:436
-#, fuzzy
-msgid "Client Lun"
-msgstr "用戶端"
+#: src/include/iscsi-lio-server/widgets.rb:447
+msgid "Initiator LUN"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
#, fuzzy
msgid "Target LUN"
msgstr "目標名稱"
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
#, fuzzy
msgid "Change:"
msgstr "變更:"
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
msgid "Target LUN %1 used more than once!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
#, fuzzy
msgid "Need to enable at least one Authentification!"
msgstr "選取具有驗證金鑰的檔案"
-#: src/include/iscsi-lio-server/widgets.rb:619
-#, fuzzy
-msgid "Client name:"
-msgstr "用戶端"
+#: src/include/iscsi-lio-server/widgets.rb:630
+msgid "Initiator name:"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
#, fuzzy
msgid "Import LUNs from TPG"
msgstr "從磁碟匯入 CA"
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
#, fuzzy
-msgid "Client name must not be empty!"
+msgid "Initiator name must not be empty!"
msgstr "別名不得空白。"
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. 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:701
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
#, fuzzy
-msgid "Client name already exists!"
+msgid "Initiator name already exists!"
msgstr "組態名稱已存在!"
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
-msgid "New client name:"
+#: src/include/iscsi-lio-server/widgets.rb:689
+msgid "New initiator name:"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
msgid "OK"
msgstr "確定"
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
msgid "Cancel"
msgstr "取消"
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:796
+#, fuzzy
+#| msgid "Disabled"
+msgid "Enabled"
+msgstr "已停用"
+
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
+msgid "Disabled"
+msgstr "已停用"
+
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
msgid "Really delete the selected item?"
msgstr "確定要刪除選取的項目嗎?"
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1015
msgid "Problem creating target %1 with tpg %2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1037
#, fuzzy
msgid "Problem setting network portal to %1"
msgstr "設定 UDP 埠為 %1"
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1058
#, fuzzy
msgid "Problem removing lun %1"
msgstr "移除 %1 時發生錯誤\n"
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1083
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1097
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:1198
+#: src/include/iscsi-lio-server/widgets.rb:1211
msgid "The target cannot be empty."
msgstr "目標不能是空白。"
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1215
#, fuzzy
msgid "The target portal group cannot be empty."
msgstr "目標不能是空白。"
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1226
msgid "The target already exists."
msgstr "目標已存在。"
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1246
msgid "Incoming"
msgstr "內送"
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1249
msgid "Outgoing"
msgstr "外送"
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1251
msgid "None"
msgstr "無"
-#: 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 "已停用"
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1463
msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator 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?"
+"Really want to continue without initiator access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1477
+#, fuzzy
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr ""
+"建立目錄 %1 時發生錯誤:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1492
+#, fuzzy
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr ""
+"建立目錄 %1 時發生錯誤:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1513
+#, fuzzy
+msgid "Problem removing initiator %3 from %1:%2"
msgstr ""
+"建立目錄 %1 時發生錯誤:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1524
+#: src/include/iscsi-lio-server/widgets.rb:1537
#, fuzzy
-msgid "Problem creating client %3 for %1:%2"
+msgid "Problem creating initiator %3 for %1:%2"
msgstr ""
"建立目錄 %1 時發生錯誤:\n"
"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
-msgstr ""
+#: src/include/iscsi-lio-server/widgets.rb:1572
+#, fuzzy
+msgid "Problem changing auth for initiator %3 in %1:%2"
+msgstr "啟用指紋驗證"
#. Initialization dialog caption
#: src/include/iscsi-lio-server/wizards.rb:110
@@ -713,11 +738,11 @@
msgstr "正在啟始化..."
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save lio setup"
msgstr ""
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
msgid "Cannot save tcm setup"
msgstr ""
@@ -821,6 +846,22 @@
msgid "Configuration summary..."
msgstr "組態摘要..."
+#, fuzzy
+#~ msgid "Client"
+#~ msgstr "用戶端"
+
+#, fuzzy
+#~ msgid "Modify iSCSI Target Client Setup"
+#~ msgstr "修改 iSCSI 目標"
+
+#, fuzzy
+#~ msgid "Client Lun"
+#~ msgstr "用戶端"
+
+#, fuzzy
+#~ msgid "Client name:"
+#~ msgstr "用戶端"
+
#~ msgid "Run SuSEconfig"
#~ msgstr "執行 SuSEconfig"
Added: trunk/yast/zh_TW/po/journalctl.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/journalctl.zh_TW.po (rev 0)
+++ trunk/yast/zh_TW/po/journalctl.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -0,0 +1,123 @@
+# Copyright (C) 2016 SuSE Linux Products GmbH, Nuernberg
+# Automatically generated, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: journalctl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"PO-Revision-Date: 2016-08-04 14:55+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr ""
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr ""
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr ""
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr ""
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr ""
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr ""
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr ""
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr ""
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr ""
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:116
+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/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr ""
Modified: trunk/yast/zh_TW/po/kdump.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/kdump.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/kdump.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kdump\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2011-10-05 11:30+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -375,10 +375,8 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
msgid "To apply changes a reboot is necessary."
msgstr "要套用變更需要重開機。"
@@ -1165,152 +1163,167 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
msgid "Use &Firmware-Assisted Dump"
msgstr ""
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:511
msgid "Initializing kdump Configuration"
msgstr "正在啟始化 kdump 組態"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
msgid "Reading the config file..."
msgstr "正在讀取設定檔..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:522
msgid "Reading kernel boot options..."
msgstr "讀取核心開機選項..."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:524
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:530
msgid "Reading partitions of disks..."
msgstr "正在讀取磁碟分割區..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:532
#, fuzzy
#| msgid "Reading available memory..."
msgid "Reading available memory and calibrating usage..."
msgstr "正在讀取可用的記憶體..."
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:544
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "無法讀取設定檔 /etc/sysconfig/kdump"
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:552
msgid "Cannot read kernel boot options."
msgstr "無法讀取核心開機選項。"
#. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:560
msgid "Cannot read available memory."
msgstr "無法讀取可用的記憶體。"
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:586
msgid "Saving kdump Configuration"
msgstr "正在儲存 kdump 組態"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:615
msgid "Write the settings"
msgstr "寫入設定"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:617
msgid "Update boot options"
msgstr "更新開機選項"
#. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:621
msgid "Writing the settings..."
msgstr "正在寫入設定..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:623
msgid "Updating boot options..."
msgstr "正在更新開機選項..."
#. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:625
msgid "Finished"
msgstr "已完成"
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:635
msgid "Cannot write settings."
msgstr "無法寫入設定。"
#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:644
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "加入 crashkernel 參數到開機啟動器錯誤。"
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:764
msgid "Kdump status: %1"
msgstr "Kdump 狀態:%1"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "enabled"
msgstr "已啟用"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "disabled"
msgstr "已停用"
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:772
#, fuzzy
#| msgid "Value of crashkernel option: %1"
msgid "Value(s) of crashkernel option: %1"
msgstr "crashkernel 選項值: %1"
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:779
msgid "Dump format: %1"
msgstr "Dump 格式:%1"
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:786
msgid "Target of dumps: %1"
msgstr "Dump 的目標: %1"
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:793
msgid "Number of dumps: %1"
msgstr "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:879
+#: src/modules/Kdump.rb:885
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:974
+#: src/modules/Kdump.rb:972
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/zh_TW/po/live-installer.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/live-installer.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/live-installer.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: live-installer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-17 09:52+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -42,27 +42,27 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
msgid "Evaluating filesystems to copy..."
msgstr "正在評估將複製的檔案系統..."
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
msgid "Copying root filesystem..."
msgstr "正在複製根檔案系統..."
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
msgid "Copying live image..."
msgstr "正在複製 live 影像..."
#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
msgid "Copying %1..."
msgstr "正在複製 %1..."
#. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -77,71 +77,53 @@
"live 系統。"
#. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
msgid "Copying the live image to hard disk failed."
msgstr "正在複製 Live 影像到硬碟失敗。"
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
msgid "Installation Settings"
msgstr "安裝設定"
#. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
msgid "Analyzing the system..."
msgstr "正在分析系統..."
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
msgid "Use %1%% of disk %2 for Linux"
msgstr "使用磁碟 %2 的 %1%% 給 Linux"
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
msgid "Do not use disk %1"
msgstr "不要使用磁碟 %1"
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
msgid "Partitioning"
msgstr "磁碟分割"
#. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-msgid "System start-up"
-msgstr "系統啟動"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr "詢問要由 Linux 或其他已存在系統開機"
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr "僅由 Linux 開機"
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr "系統啟動逾時: %1 秒"
-
-#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
msgid "Keyboard"
msgstr "鍵盤"
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
msgid "Time Zone"
msgstr "時區"
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
msgid "Change Installation Settings"
msgstr "變更安裝設定"
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
msgid ""
"<p>\n"
"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
@@ -150,7 +132,7 @@
"按<b>「接受」</b>使用畫面中顯示的設定值來執行全新的安裝。</p>"
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
msgid ""
"<p>\n"
"To change the values, click the respective headline\n"
@@ -161,7 +143,7 @@
"或選擇<b>變更安裝設定</b>。</p>\n"
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
msgid ""
"<p>\n"
"Your hard disk has not been modified, you can still safely abort.\n"
@@ -276,7 +258,7 @@
"'Reset' 按鈕來重新啟動。"
#. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
msgid "Copying files to installed system..."
msgstr "正在將檔案複製到已安裝的系統..."
@@ -300,6 +282,18 @@
msgid "Saving time zone..."
msgstr "正在儲存時區..."
+#~ msgid "System start-up"
+#~ msgstr "系統啟動"
+
+#~ msgid "Ask whether to boot Linux or existing system"
+#~ msgstr "詢問要由 Linux 或其他已存在系統開機"
+
+#~ msgid "Boot only Linux"
+#~ msgstr "僅由 Linux 開機"
+
+#~ msgid "System start time-out: %1 seconds"
+#~ msgstr "系統啟動逾時: %1 秒"
+
#~ msgid "Installation settings"
#~ msgstr "安裝設定"
Modified: trunk/yast/zh_TW/po/mail.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/mail.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/mail.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: mail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-18 13:54+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -313,73 +313,80 @@
#. Translators: dialog caption
#. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
msgid "Outgoing Mail"
msgstr "外送郵件"
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+#, fuzzy
+#| msgid "You cannot define local domains for the mail server."
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr "您無法定義郵件伺服器的本地領域。"
+
#. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
msgid "TLS encryption"
msgstr ""
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
msgid "No"
msgstr "無"
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
msgid "Use"
msgstr "使用"
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
msgid "Enforce"
msgstr "強制"
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
msgid "&Masquerading"
msgstr "偽裝(&M)"
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
msgid "&Authentication"
msgstr "驗證(&A)"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
msgid "Incoming Mail"
msgstr "內送郵件"
#. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
msgid "&Details..."
msgstr "詳細資訊(&D)..."
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
msgid "Start &fetchmail"
msgstr "啟動 fetchmail(&F)"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
#, fuzzy
#| msgid "[manually set]"
msgid "manual"
msgstr "[手動方式設定]"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
#, fuzzy
#| msgid "FTP daemon"
msgid "daemon"
msgstr "FTP 精靈"
#. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
msgid "&Downloading"
msgstr "下載(&D)"
#. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
msgid "&Aliases..."
msgstr "別名(&A)..."
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
msgid "&Virtual domains..."
msgstr "虛擬領域(&V)..."
@@ -387,7 +394,7 @@
#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
#. %2: file name (eg. /etc/sysconfig/postfix)
#. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
msgid ""
"To be able to deliver mail to your local MTA,\n"
"the value of %1 in %2 will be set to\n"
@@ -401,7 +408,7 @@
#. correct and complete. The login name may contain only
#. certain characters and must begin with a letter.
#. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
msgid ""
"The user login may contain only\n"
"lower case letters, digits, \"-\" and \"_\"\n"
@@ -414,39 +421,39 @@
"請再試一次。\n"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
msgid "Sender address rewriting"
msgstr "重新寫入寄件者地址"
#. Translators: text entry label
#. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
#: src/include/mail/widgets.rb:269
msgid "&Local user"
msgstr "本地使用者(&L)"
#. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
msgid "&Display as"
msgstr "顯示為(&D)"
#. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
msgid "The address for this user is already defined."
msgstr "已定義這個使用者的地址。"
#. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
msgid "The mail address format is incorrect."
msgstr "郵件地址格式不正確。"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
msgid "Masquerading"
msgstr "偽裝"
#. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
msgid "Masquerade &local domains"
msgstr "偽裝本地領域(&L)"
@@ -456,23 +463,23 @@
#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
#. ),
#. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
msgid "Ma&squerade other domains"
msgstr "偽裝其他領域(&S)"
#. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
msgid "Do&mains to masquerade"
msgstr "要偽裝的領域(&M)"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
msgid "Local user"
msgstr "本地使用者"
#. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
msgid "Display as"
msgstr "顯示為"
@@ -481,23 +488,23 @@
#. ["holly", "jane", "tarzan"])),
#. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly(a)red.dwarf"))
#. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
msgid "A&dd"
msgstr "新增(&D)"
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
msgid "&Edit"
msgstr "編輯(&E)"
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
msgid "Dele&te"
msgstr "刪除(&T)"
#. Translators: error popup
#. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
msgid "The domain name is incorrect"
msgstr "領域名稱不正確"
@@ -505,106 +512,106 @@
#. list<string> lmod = [];
#. list<map> mu = Mail::masquerade_users;
#. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
msgid "Outgoing Server Authentication"
msgstr "外送伺服器驗證"
#. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
msgid "Outgoing &Server"
msgstr "外送伺服器(&S)"
#. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
msgid "&User name"
msgstr "使用者名稱(&U)"
#. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
msgid "&Password"
msgstr "密碼(&P)"
#. Translators: popup dialog heading
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
msgid "Mail downloading"
msgstr "郵件下載"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
msgid "Server"
msgstr "伺服器"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
msgid "Protocol"
msgstr "協定"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
msgid "User"
msgstr "使用者"
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
msgid "De&lete"
msgstr "刪除(&L)"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
msgid "Incoming mail redirection"
msgstr "內送郵件重新指向"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
msgid "&Alias"
msgstr "別名(&A)"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
msgid "&Destinations"
msgstr "目的地(&D)"
#. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
msgid "The alias format is incorrect."
msgstr "別名格式不正確。"
#. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
msgid "The destinations for this alias are already defined."
msgstr "已定義這個別名的目的地。"
#. Translators: dialog caption
#. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
msgid "Aliases"
msgstr "別名"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
msgid "Alias"
msgstr "別名"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
msgid "Destinations"
msgstr "目的地"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
msgid "Virtual domains"
msgstr "虛擬領域"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
msgid "Mail configuration"
msgstr "郵件組態"
#. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
msgid "Initializing..."
msgstr "正在啟始化..."
@@ -874,12 +881,12 @@
msgstr "到 Cyrus IMAP 伺服器"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr "會安裝 AMaViS (防毒掃描軟體)。\n"
#. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
msgid ""
"AMaViS needs a virus scanner such as ClamAV\n"
"to do the actual scanning, but ClamAV was not found.\n"
@@ -890,57 +897,57 @@
" 手動設定掃描器。"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr "會安裝 Fetchmail (郵件下載公用程式)。\n"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
#, fuzzy
msgid "Dovecot IMAP server, will be installed.\n"
msgstr "將安裝 Cyrus-imapd (IMAP 伺服器)。\n"
#. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
msgid "Initializing mail configuration"
msgstr "正在啟始化郵件組態"
#. Translators: progress label
#. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
msgid "Determining Mail Transport Agent (MTA)"
msgstr "正在決定郵件轉送代辦程式 (MTA)"
#. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
msgid "Reading general settings"
msgstr "正在讀取一般設定"
#. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
msgid "Reading masquerading settings"
msgstr "正在讀取偽裝設定"
#. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
msgid "Reading downloading settings"
msgstr "正在讀取下載設定"
#. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
msgid "Reading alias tables"
msgstr "正在讀取別名表"
#. Translators: progress label
#. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
msgid "Reading authentication settings..."
msgstr "正在讀取驗證設定..."
#. Translators: error message,
#. %1 is a file name,
#. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
msgid ""
"Error reading file %1. The file must have\n"
"a fixed format to be readable by YaST. For details, see\n"
@@ -951,18 +958,18 @@
"%2"
#. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
msgid "Error writing the fetchmail configuration."
msgstr "寫入 fetchmail 組態時發生錯誤。"
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
msgid "Error writing file %1"
msgstr "寫入檔案 '%1' 時發生錯誤"
#. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
#, fuzzy
msgid "Error running config.postfix"
msgstr "執行 SuSEconfig 時發生錯誤。"
@@ -970,144 +977,144 @@
#. Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
msgid "Error starting service %1."
msgstr "啟動服務 %1 時發生錯誤。"
#. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
msgid "Writing general settings"
msgstr "正在寫入一般設定"
#. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
msgid "Writing masquerading settings"
msgstr "正在寫入偽裝設定"
#. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
msgid "Writing alias tables"
msgstr "正在寫入別名表"
#. Write them unconditionally, because it is now possible to
#. enter them also in the Permanent mode. Bug #17417.
#. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
msgid "Writing downloading settings"
msgstr "正在寫入下載設定"
#. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
msgid "Writing authentication settings..."
msgstr "正在寫入驗證設定..."
#. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
msgid "Finishing writing configuration files"
msgstr "正在完成寫入組態檔"
#. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
#, fuzzy
msgid "Running Config Postfix"
msgstr "路由組態"
#. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
msgid "Restarting services"
msgstr "正在重新啟動服務"
#. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
msgid "Saving mail configuration"
msgstr "正在儲存郵件組態"
#. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
msgid "Other"
msgstr "其他"
#. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
msgid "Permanent"
msgstr "永久"
#. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
msgid "Dial-up"
msgstr "撥號"
#. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
msgid "None"
msgstr "無"
#. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
msgid "MTA"
msgstr "MTA"
#. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
msgid "Connection Type"
msgstr "連接類型"
#. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
msgid "Outgoing Mail Server"
msgstr "外送郵件伺服器"
#. summary header; the "From: foo(a)bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
msgid "From Header"
msgstr "寄件者標題"
#. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
msgid "Local Domains"
msgstr "本地領域"
#. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
msgid "Masquerade Other Domains"
msgstr "偽裝其他領域"
#. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
msgid "Masquerade Users"
msgstr "偽裝使用者"
#. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
msgid "Accept remote SMTP connections"
msgstr "接受遠端 SMTP 連接"
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
msgid "Yes"
msgstr "是"
#. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
msgid "Use AMaViS"
msgstr "使用 AMaViS"
#. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
msgid "Use DKIM"
msgstr "使用 DKIM"
#. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
msgid "Fetchmail"
msgstr "Fetchmail"
#. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
msgid "Virtual Users"
msgstr "虛擬使用者"
#. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
msgid "Authentication"
msgstr "驗證"
@@ -1580,9 +1587,6 @@
#~ "密碼不符合。\n"
#~ "請再試一次。"
-#~ msgid "You cannot define local domains for the mail server."
-#~ msgstr "您無法定義郵件伺服器的本地領域。"
-
#~ msgid "Defined Domains"
#~ msgstr "已定義的領域"
Modified: trunk/yast/zh_TW/po/network.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/network.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/network.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-01-16 11:33+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -239,7 +239,7 @@
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
msgid "Host Configuration Summary:"
msgstr "主機組態摘要:"
@@ -360,13 +360,13 @@
msgstr "下載的發行記事安裝失敗。"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
msgid "Opening of Connection"
msgstr "開啟連接"
#. popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
@@ -375,13 +375,13 @@
"記錄,以取得詳細資訊。\n"
#. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
+#: src/clients/inst_do_net_test.rb:870
msgid "No URL for the release notes defined. Internet test cannot be performed."
msgstr "沒有定義發行記事的 URL。無法完成網際網路測試。"
#. popup informing user about the failure to retrieve release notes
#. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
msgid ""
"Download of latest release notes failed due to server-side error. \n"
"This does not necessarily imply a faulty network configuration.\n"
@@ -398,7 +398,7 @@
"請按 '取消'。\n"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
msgid ""
"Download of latest release notes failed. View\n"
"the logs for details."
@@ -407,12 +407,12 @@
"記錄,以取得詳細資訊。"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
msgid "Check for Patches"
msgstr "檢查修補程式"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
@@ -421,7 +421,7 @@
"記錄,以取得詳細資訊。\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
msgid "Closing of Connection"
msgstr "關閉連接"
@@ -511,7 +511,7 @@
#. 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
+#: src/clients/lan_auto.rb:108
msgid "Configuration Error: uninitialized interface."
msgstr "組態錯誤: 未啟始化的介面。"
@@ -600,7 +600,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
msgid "Routing Configuration"
msgstr "路由組態"
@@ -689,7 +689,7 @@
msgstr "閘道"
#. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
msgid "Netmask"
msgstr "網路遮罩"
@@ -707,83 +707,83 @@
#. Handler for action "list"
#. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
msgid "No entry for destination '%1' in routing table"
msgstr "在路由表中的目的地 '%1' 無項目"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
#, fuzzy
msgid "%s forwarding is enabled"
msgstr "IP 轉遞已開啟"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
#, fuzzy
msgid "%s forwarding is disabled"
msgstr "IP 轉遞已停用"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
#, fuzzy
msgid "Enabling %s forwarding..."
msgstr "啟用 IP 轉遞..."
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
#, fuzzy
msgid "Disabling %s forwarding..."
msgstr "停用 IP 轉遞..."
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
#, fuzzy
msgid "IPv4 Forwarding:"
msgstr "IP 轉遞"
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
#, fuzzy
msgid "IPv6 Forwarding:"
msgstr "IP 轉遞"
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
#, fuzzy
msgid "IPv4 and IPv6 Forwarding:"
msgstr "IP 轉遞"
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
msgid "At least destination and gateway IP addresses must be specified."
msgstr "至少必須指定目的地和閘道位址。"
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
msgid "Adding '%1' destination to routing table ..."
msgstr "正在將目的地 '%1' 到路由表..."
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
msgid "Destination IP address must be specified."
msgstr "必須指定目的地 IP 位址。"
-#: src/clients/routing.rb:348
+#: src/clients/routing.rb:349
msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
msgstr "至少要指定下列參數之一(閘道,遮罩,裝置,選項)"
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
msgid "Updating '%1' destination in routing table ..."
msgstr "正在路由表中更新目的地 '%1' ..."
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
msgid "Deleting '%1' destination from routing table ..."
msgstr "正在由路由表中刪除目的地 '%1'..."
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
msgid "Warning: no encryption is used."
msgstr "警告:未使用加密。"
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
msgid "Change."
msgstr "變更。"
@@ -884,70 +884,70 @@
msgstr "USB 無線網路卡"
#. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
msgid "Unknown Network Device"
msgstr "未知的網路設備"
#. Modem status (%1 is device)
#. ISDN device status (%1 is device)
#. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
msgid "Configured as %1"
msgstr "設定為 %1"
#. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
msgid "Configured as %1 with provider %2"
msgstr "以供應者 %2 配置為 %1"
#. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
msgid "Configured as %1 with provider %2 (protocol %3)"
msgstr "設定為 %1,供應商 %2 (協定 %3)"
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
msgid "Configured without address (NONE)"
msgstr "沒有位址的設定"
#. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
msgid "Configured without an address"
msgstr "沒有位址的設定"
#. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
msgid "Configured with address %1"
msgstr "設定為位址 %1"
#. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
msgid "Configured with address %1 (remote %2)"
msgstr "設定為位址 %1 (遠端 %2)"
#. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
msgid "Configured with %1"
msgstr "設定為 %1"
#. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
msgid "Configured as %1 with address %2"
msgstr "以位址 %2 配置為 %1"
#. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
msgid "Configured as %1 with address %2 (remote %3)"
msgstr "以位址 %2 (遠端 %3) 配置為 %1"
#. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
msgid "Configured as %1 with %2"
msgstr "以 %2 配置為 %1"
#. Abbreviation for "The interface is Managed by NetworkManager"
#. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
msgid "Managed"
msgstr "管理的"
@@ -1086,28 +1086,28 @@
msgstr "選取記錄(&S):"
#. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
msgid "Additional Addresses"
msgstr "其他位址"
#. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
#, fuzzy
msgid "IPv4 Address Label"
msgstr "IP 位址"
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "IP 位址"
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/lan/address.rb:108
+#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "新增(&D)"
@@ -1116,8 +1116,8 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/lan/address.rb:110
+#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1127,158 +1127,158 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/lan/address.rb:112
+#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
msgstr "刪除(&L)"
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
msgid "&Name of Interface"
msgstr "介面名稱(&N)"
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
msgid "<p>TODO kind of vague!</p>"
msgstr "<p>TODO 不太清楚!</p>"
#. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
msgid "Assign Interface to Firewall &Zone"
msgstr "指定介面到防火牆區域(&Z)"
#. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
msgid "&Mandatory Interface"
msgstr "強制介面(&M)"
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
#: src/include/network/lan/hardware.rb:351
msgid "&Device Type"
msgstr "裝置類型(&D)"
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
#: src/include/network/lan/hardware.rb:337
msgid "&Configuration Name"
msgstr "組態名稱(&C)"
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
msgid "Tunnel owner"
msgstr "通道擁有者"
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
msgid "Tunnel group"
msgstr "通道群組"
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
msgid "Bridged Devices"
msgstr "橋接設備"
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
msgid "Real Interface for &VLAN"
msgstr "VLAN 的真實介面(&V)"
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
msgid "VLAN ID"
msgstr "VLAN ID"
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
msgid "Bond Slaves and Order"
msgstr "Bond 從屬以及其他"
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
msgid "Up"
msgstr "向上"
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
msgid "Down"
msgstr "向下"
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
msgid "Bond &Slaves"
msgstr "Bond 從屬(&S)"
#. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
msgid "&Bond Driver Options"
msgstr "Bond 驅動程式選項(&B)"
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr "<p>選取 bond 驅動程式選項,必要時加以編輯。 </p>"
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr "沒有連線和 IP 設定 (Bonding Slaves)"
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
#, fuzzy
msgid "Use iBFT Values"
msgstr "使用 iBFT 值"
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
msgid "Dynamic Address"
msgstr "動態位址"
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
msgid "DHCP both version 4 and 6"
msgstr "第4版和第6版的 DHCP"
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
msgid "DHCP version 4 only"
msgstr "僅第4版的 DHCP"
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
msgid "DHCP version 6 only"
msgstr "僅第6版的 DHCP"
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
#, fuzzy
msgid "Statically Assigned IP Address"
msgstr "靜態指定 IP 位址"
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
msgid "&IP Address"
msgstr "IP 位址(&I)"
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
msgid "&Subnet Mask"
msgstr "子網路遮罩(&S)"
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
msgid "&Hostname"
msgstr "主機名稱(&H)"
#. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
msgid "R&emote IP Address"
msgstr "遠端 IP 位址(&E)"
#. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
msgid "The remote IP address is invalid."
msgstr "遠端 IP 位址無效。"
#. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
msgid "&S/390"
msgstr "S/390(&S)"
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1030
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1289,13 +1289,13 @@
"在您發現偵測錯誤的時候。"
#. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1050
msgid "Configuration %1 already present."
msgstr "組態 %1 已存在。"
#. 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:1062
+#: src/include/network/lan/address.rb:1074
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1309,20 +1309,20 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1094
msgid "No valid IP address."
msgstr "沒有可用的 IP 位址。"
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1101
msgid "No valid netmask or prefix length."
msgstr "沒有可用的網路遮罩或前置長度。"
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1109
msgid "Invalid hostname."
msgstr "無效的主機名稱。"
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1116
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1337,7 +1337,7 @@
"真的要將主機名稱留白嗎?\n"
#. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1134
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1347,61 +1347,61 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1187
msgid "&General"
msgstr "一般(&G)"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1198
msgid "Device Activation"
msgstr "裝置啟用"
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1202
msgid "Firewall Zone"
msgstr "防火牆區域"
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1207
msgid "Maximum Transfer Unit (MTU)"
msgstr "最大轉送單位 (MTU)"
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1217
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>在此處設定詳細的網路卡設定。</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1284
msgid "&Address"
msgstr "位址(&A)"
#. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1287
msgid "<p>Configure your IP address.</p>"
msgstr "<p>設定 IP 位址。</p>"
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1293
msgid "&Hardware"
msgstr "硬體(&H)"
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1300
msgid "&Bond Slaves"
msgstr "Bond 從屬(&B)"
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1314
msgid "&Wireless"
msgstr "無線(&W)"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1398
#, fuzzy
msgid "Ifplugd Priority"
msgstr "Ifplugd 優先程度"
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1404
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"
@@ -1416,12 +1416,23 @@
" 每個介面的優先程度。 </p>\n"
#. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1486
msgid "Network Card Setup"
msgstr "網路卡設定"
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
#, fuzzy
msgid ""
"At least one selected device is already configured.\n"
@@ -1618,23 +1629,23 @@
#. @param [Hash{String => String}] options action options
#. Handler for action "edit"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
msgid "Impossible value for bootproto."
msgstr "非 bootproto 的可能值。"
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
msgid "Impossible value for startmode."
msgstr "非 startmode 的可能值。"
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
msgid "For static configuration, the \"ip\" option is needed."
msgstr "靜態組態設定需設定 \"ip\" 選項。"
#. Handler for action "delete"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
msgid "The device was deleted."
msgstr "設備已刪除。"
@@ -1696,7 +1707,7 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
msgid ""
"Firmware is needed. Install it from \n"
"the add-on CD.\n"
@@ -1708,7 +1719,7 @@
"請將「附加 CD」新增到 YaST 軟體套件庫,並回到\n"
"此組態對話方塊。\n"
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
msgid ""
"The device needs a firmware to function properly. Usually, it can be\n"
"downloaded from your driver vendor's Web page. \n"
@@ -1726,20 +1737,20 @@
#. - kernel modules (InstallKernel): before loaded
#. - wlan firmware: here, just because it is copied from modems
#. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
msgid "Installing firmware"
msgstr "正在安裝韌體"
-#: src/include/network/lan/complex.rb:233
+#: src/include/network/lan/complex.rb:232
msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
msgstr "為了成功安裝韌體,需要執行 'install_bcm43xx_firmware' 腳本。馬上執行嗎? "
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
msgid "An error occurred during firmware installation."
msgstr "安裝韌體期間發生錯誤。"
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -1754,12 +1765,12 @@
"介面就不會再由 NetworkManager 管理。\n"
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:453
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr "您選定的裝置有 STARTMODE=nfsroot 。確定要刪除嗎?"
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
msgid "Network Setup Method"
msgstr "網路設定方法"
@@ -1768,7 +1779,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:519
+#: src/include/network/lan/complex.rb:515
msgid "Network Settings"
msgstr "網路設定"
@@ -1958,7 +1969,7 @@
#. Selection box label
#. Selection box title
#: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
msgid "&Network Card"
msgstr "網路卡(&N)"
@@ -1968,7 +1979,7 @@
msgstr "搜尋(&S)"
#. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
msgid ""
"Configuration name %1 already exists.\n"
"Choose a different one."
@@ -1977,7 +1988,7 @@
"請選取另一個。"
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
msgid "S/390 Network Card Configuration"
msgstr "S/390 網路卡組態"
@@ -1985,131 +1996,131 @@
#. Frame label
#. Frame label
#. Frame label
-#: 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
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
msgid "S/390 Device Settings"
msgstr "S/390 裝置設定"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
msgid "&Port Name"
msgstr "埠名稱(&P)"
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
msgid "Port Number"
msgstr "埠號"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
msgid "&Enable IPA Takeover"
msgstr "啟用 IPA Takeover(&E)"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
msgid "Enable &Layer 2 Support"
msgstr "啟用層 2 支援(&L)"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
msgid "Layer2 &MAC Address"
msgstr "層 2 MAC 位址(&M)"
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
msgid "Read Channel"
msgstr "讀取頻道"
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
msgid "Write Channel"
msgstr "寫入頻道"
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
msgid "Control Channel"
msgstr "控制頻道"
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr "<p>輸入此介面的<b>「埠名稱」</b>(需區分大小寫)。</p>"
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:950
msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
msgstr "<p>輸入此介面其他的<b>「選項」</b>(以空格分隔)。</p>"
-#: src/include/network/lan/hardware.rb:954
+#: src/include/network/lan/hardware.rb:953
msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
msgstr "<p>選取<b>「啟用 IPA Takeover」</b>,如果此介面的 IP 位址 Takeover 應該啟用。</p>"
-#: src/include/network/lan/hardware.rb:957
+#: src/include/network/lan/hardware.rb:956
msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>如果這個卡已經以層 2 支援設定,請選取<b>「啟用層 2 支援」</b>。</p>"
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:959
msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>如果這個卡已經以層 2 支援設定,請輸入<b>「層 2 MAC 位址」</b>。</p>"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
msgid "&Port Number"
msgstr "埠號碼(&P)"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
msgid "&LANCMD Time-Out"
msgstr "LANCMD 逾時(&L)"
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr "<p>選擇此介面的<b>「埠號碼」</b>。</p>"
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr "<p>指定這個介面的<b>「LANCMD 逾時」</b>。</p>"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
msgid "Compatibility Mode"
msgstr "相容模式"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
msgid "Extended Mode"
msgstr "延伸模式"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr "CTC 式 tty (Linux 對 Linux 連線)"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr "具有 OS/390 與 z/OS 的相容模式"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
msgid "&Protocol"
msgstr "通訊協定(&P)"
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr "<p>選擇此介面的<b>「通訊協定」</b>。</p>"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
msgid "&Peer Name"
msgstr "對等名稱(&P)"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
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"
@@ -2117,8 +2128,7 @@
"<p>輸入 IUCV 對等的名稱,\n"
"例如,用來連線的 z/VM 使用者名稱 (需區分大小寫)。</p>\n"
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
msgid ""
"An error occurred while creating device.\n"
"See YaST log for details."
@@ -2128,7 +2138,7 @@
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
msgid "Hardware Dialog"
msgstr "硬體對話框"
@@ -2780,30 +2790,30 @@
"請參閱相同目錄中的 'wireless' 檔案。</p>"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
#, fuzzy
msgid "IPv4 &Address Label"
msgstr "IP 位址"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
msgid "Net&mask"
msgstr "網路遮罩(&M)"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
msgid "Label is too long."
msgstr "標籤太長。"
#. Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
msgid "The IP address is invalid."
msgstr "IP 位址無效。"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
msgid "The subnet mask is invalid."
msgstr "子網路遮罩無效。"
@@ -2983,127 +2993,127 @@
#. Wireless authentication modes:
#. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
msgid "No Encryption"
msgstr "無加密"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
msgid "WEP - Open"
msgstr "WEP - 開放"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
msgid "WEP - Shared Key"
msgstr "WEP - 共用金鑰"
#. ComboBox item
#. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
msgid "WPA-PSK (WPA version 1 or 2)"
msgstr "WPA-PSK (WPA 版本 1 或 2)"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
msgid "WPA-EAP (WPA version 1 or 2)"
msgstr "WPA-EAP (WPA 版本 1 或 2)"
#. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
msgid "Wireless Network Card Configuration"
msgstr "無線網路卡組態"
#. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
msgid "Wireless Device Settings"
msgstr "無線裝置設定"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
msgid "O&perating Mode"
msgstr "操作模式(&P)"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
msgid "Ad-Hoc"
msgstr "臨機操作"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
msgid "Master"
msgstr "主要"
#. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
msgid "Ne&twork Name (ESSID)"
msgstr "網路名稱 (ESSID)(&T)"
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
msgid "Scan Network"
msgstr "掃描網路"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
msgid "&Authentication Mode"
msgstr "驗證模式(&A)"
#. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
msgid "&Encryption Key"
msgstr "加密金鑰(&E)"
#. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
msgid "E&xpert Settings"
msgstr "專家設定(&X)"
#. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
msgid "&WEP Keys"
msgstr "WEP 金鑰(&W)"
#. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:558
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr "WPA 驗證模式僅能用於管理的操作模式中。"
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:569
msgid "Specify the network name for this mode."
msgstr "指定此模式的網路名稱。"
#. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:576
msgid "The network name must be shorter than 32 characters."
msgstr "網路名稱必須短於 32 個字元。"
#. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:596
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "通關密語必須介於 8 - 63 個字元之間 (包含)。"
#. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:607
msgid "The key must have %1 hexadecimal digits."
msgstr "金鑰必須具有 %1 個 16 進位數字。"
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:619
+#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "加密金鑰無效。"
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:627
msgid "The encryption key must be specified for this authentication mode."
msgstr "必須為此驗證模式指定加密金鑰。"
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:634
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3201,27 +3211,27 @@
msgstr "AP 掃描模式"
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
msgid "Enter Encryption Key"
msgstr "輸入加密金鑰"
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
msgid "&Key"
msgstr "金鑰(&K)"
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
msgid "Help"
msgstr "說明"
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
msgid "Wireless Keys"
msgstr "無線金鑰"
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
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"
@@ -3236,7 +3246,7 @@
"一個金鑰。</p>"
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
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"
@@ -3251,43 +3261,43 @@
"這個值設定成 64。</p>"
#. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
msgid "WEP Keys"
msgstr "WEP 金鑰"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
msgid "&Key Length"
msgstr "金鑰長度(&K)"
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
msgid "No."
msgstr "數字"
#. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
msgid "Key"
msgstr "金鑰"
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
msgid "Default"
msgstr "預設"
#. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
msgid "&Set as Default"
msgstr "設定為預設(&S)"
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1214
msgid "Choose a Certificate"
msgstr "選擇憑證"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1257
msgid ""
"Not using a Certificate Authority (CA) certificate can result in connections\n"
"to insecure, rogue wireless networks. Continue without CA ?"
@@ -3296,7 +3306,7 @@
"不安全無線網路。繼續不用 CA 嗎?"
#. error popup text
-#: src/include/network/lan/wireless.rb:1283
+#: src/include/network/lan/wireless.rb:1285
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
@@ -3305,47 +3315,47 @@
"或用戶端憑證。"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1331
msgid "WPA-EAP"
msgstr "WPA-EAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1353
msgid "Any"
msgstr "任何"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1357
msgid "MD5"
msgstr "MD5"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1359
msgid "GTC"
msgstr "GTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1361
msgid "CHAP"
msgstr "CHAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1363
msgid "PAP"
msgstr "PAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv1"
msgstr "MSCHAPv1"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1369
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1392
msgid "WPA-EAP Details"
msgstr "WPA-EAP 詳細資料"
@@ -3360,24 +3370,44 @@
#. RadioButton label
#: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
msgstr "允許遠端管理(&A)"
#. RadioButton label
#: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "允許遠端管理(&A)"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
msgid "&Do Not Allow Remote Administration"
msgstr "不允許遠端管理(&D)"
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Remote Administration Settings</big></b></p>\n"
+#| "<p>If this feature is enabled, you can\n"
+#| "administer this machine remotely from another machine. Use a VNC\n"
+#| "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
+#| "a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
+#| "This form of remote administration is less secure than using SSH.</p>\n"
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
"administer this machine remotely from another machine. Use a VNC\n"
"client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
msgstr ""
"<p><b><big>遠端管理設定</big></b></p>\n"
"<p>如果開啟此功能,您能夠\n"
@@ -3387,17 +3417,17 @@
"這種遠端管理型態的安全性比使用 SSH 低。</p>\n"
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
msgid "Remote Administration Settings"
msgstr "遠端管理設定"
#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
msgid "These packages need to be installed:"
msgstr "需要安裝這些套件:"
#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3409,111 +3439,61 @@
"\n"
"再試一次嗎?\n"
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
msgid "Unknown"
msgstr "未知的"
-#. Popup headline
-#: src/include/network/routines.rb:279
-msgid "Configuration Successfully Saved"
-msgstr "已經成功儲存組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "已成功儲存 DNS 組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "已成功儲存 DSL 組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "已成功儲存主機組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "已成功儲存 ISDN 組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "已成功儲存網路卡組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "已成功儲存數據機組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "已成功儲存代理組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "已成功儲存提供者組態"
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "已成功儲存路由組態"
-
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "要現在設定郵件嗎?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "要執行 %1 的組態嗎?"
-
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:829
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:1064
+#: src/include/network/routines.rb:889
msgid "Network Cards"
msgstr "網路卡"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:893
msgid "Modems"
msgstr "數據機"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:897
msgid "ISDN Cards"
msgstr "ISDN 卡"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:901
msgid "DSL Devices"
msgstr "DSL 裝置"
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:906
msgid "All Network Devices"
msgstr "所有網路裝置"
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:387
msgid "The hostname is invalid."
msgstr "主機名稱無效。"
@@ -3586,8 +3566,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
msgid "Hostname and Domain Name"
msgstr "主機名稱和領域名稱"
@@ -3613,28 +3593,28 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
msgstr "不建議使用 .local 作為網域名稱導致 Multicast DNS。 自負風險 使用使用它嗎?"
#. Popup::Error text
-#: src/include/network/services/dns.rb:520
+#: src/include/network/services/dns.rb:513
msgid "The search list can have at most %1 domains."
msgstr "搜尋清單可以有最多 %1 個領域。"
#. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
msgid "The search list can have at most %1 characters."
msgstr "搜尋清單可以有最多 %1 個字元。"
#. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
msgid "The search domain '%1' is invalid."
msgstr "搜尋領域 '%1' 無效。"
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
msgid "Hostname and Name Server Configuration"
msgstr "主機名稱和名稱伺服器組態"
@@ -3668,27 +3648,27 @@
"<b>「主機別名」</b>(以空格隔開)。</p>\n"
#. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
msgid "Current Hosts"
msgstr "目前的主機"
#. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
msgid "Hostnames"
msgstr "主機名稱"
#. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
msgid "Host Aliases"
msgstr "主機別名"
#. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:340
msgid "Hos&t Aliases"
msgstr "主機別名(&T)"
#. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:403
msgid "Alias name \"%1\" is invalid."
msgstr "別名 \"%1\" 無效。"
@@ -3726,40 +3706,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
msgid "&Destination"
msgstr "目的地(&D)"
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:171
msgid "Ge&nmask"
msgstr "網路遮罩(&N)"
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:180
msgid "&Gateway"
msgstr "閘道(&G)"
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:188
msgid "De&vice"
msgstr "裝置(&V)"
#. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:247
msgid "Destination is invalid."
msgstr "目的地無效。"
#. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:255
msgid "Gateway IP address is invalid."
msgstr "閘道 IP 位址無效。"
#. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:263
msgid "Subnetmask is invalid."
msgstr "子網路遮罩無效。"
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:422
msgid "The default gateway is invalid."
msgstr "預設閘道無效。"
@@ -4011,35 +3991,35 @@
"(knetworkmanager 在 KDE 以及 nm-applet 在 GNOME)所控制。\n"
"請確定他正在運作,如果沒有請手動啟動。"
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
msgid "General Network Settings"
msgstr "一般網路設定"
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
msgid "IPv6 Protocol Settings"
msgstr "IPv6 協定設定"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
msgid "Enable IPv6"
msgstr "啟用 IPv6"
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
msgid "Unknown device"
msgstr "不明的裝置"
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
msgid "DHCP address"
msgstr "DHCP 位址"
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
msgid "No IP address assigned"
msgstr "無已指定的 IP 位址"
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
msgid ""
"%1 \n"
"%2 - %3"
@@ -4048,12 +4028,12 @@
"%2 - %3"
#. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
msgid "&Change Device"
msgstr "變更裝置(&C)"
#. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
msgid "Network Device Select"
msgstr "網路設備選取"
@@ -4062,7 +4042,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
#, fuzzy
#| msgid "Unconfigured"
msgid "configured"
@@ -4116,7 +4096,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
msgid "Update configuration"
msgstr "更新組態"
@@ -4139,7 +4119,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
msgid "Updating configuration..."
msgstr "正在更新組態..."
@@ -4151,100 +4131,100 @@
msgstr "正在更新 /etc/resolv.conf ..."
#. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
msgid "Hostname: Set by DHCP"
msgstr "主機名稱:由 DHCP 設定"
#. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
msgid "Hostname: %1"
msgstr "主機名稱:%1"
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
msgid "Hostname will not be written to /etc/hosts"
msgstr "主機名稱不會寫入 /etc/hosts"
#. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
msgid "Name Servers: %1"
msgstr "名稱伺服器:%1"
#. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
msgid "Search List: %1"
msgstr "搜尋清單:%1"
#. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
msgid "Update /etc/hosts"
msgstr "更新 /etc/hosts"
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
msgid "Saving Hostname Configuration"
msgstr "正在儲存主機名稱組態"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
msgid "Updating /etc/hosts ..."
msgstr "正在更新 /etc/hosts ..."
#. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:276
msgid "Initializing Network Configuration"
msgstr "正在啟始化網路組態"
#. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:289
msgid "Detect network devices"
msgstr "偵測網路裝置"
#. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:291
msgid "Read driver information"
msgstr "讀取驅動程式資訊"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:293
msgid "Read device configuration"
msgstr "讀取裝置組態"
#. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:295
msgid "Read network configuration"
msgstr "讀取網路組態"
#. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:297
msgid "Read firewall settings"
msgstr "讀取防火牆設定"
#. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:299
msgid "Read hostname and DNS configuration"
msgstr "讀取主機名稱和 DNS 組態"
#. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:301
msgid "Read installation information"
msgstr "讀取安裝資訊"
#. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:303
msgid "Read routing configuration"
msgstr "讀取路由組態"
#. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:305
msgid "Detect current status"
msgstr "偵測目前的狀態"
#. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:319
msgid "Detecting ndiswrapper..."
msgstr "正在偵測 ndiswrapper..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:338
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
@@ -4254,7 +4234,7 @@
"但核心模組未啟用偵測。\n"
"您想要核心偵測 ndiswrapper 嗎?\n"
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:346
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
@@ -4263,287 +4243,280 @@
"請手動檢查組態。\n"
#. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:360
msgid "Detecting network devices..."
msgstr "正在偵測網路裝置..."
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:368
msgid "Reading device configuration..."
msgstr "正在讀取裝置組態..."
#. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:374
msgid "Reading network configuration..."
msgstr "正在讀取網路組態..."
#. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:383
msgid "Reading firewall settings..."
msgstr "正在讀取防火牆設定..."
#. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:391
msgid "Reading hostname and DNS configuration..."
msgstr "正在讀取主機名稱和 DNS 組態..."
#. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:398
msgid "Reading installation information..."
msgstr "正在讀取安裝資訊..."
#. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:404
msgid "Reading routing configuration..."
msgstr "正在讀取路由組態..."
#. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:410
msgid "Detecting current status..."
msgstr "正在偵測目前的狀態..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
msgid "Finished"
msgstr "已完成"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:441
msgid "To apply this change, a reboot is needed."
msgstr "要套用此變更需要重開機。"
#. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:509
msgid "Saving Network Configuration"
msgstr "正在儲存網路組態"
#. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:516
msgid "Write drivers information"
msgstr "寫入驅動程式資訊"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:518
msgid "Write device configuration"
msgstr "寫入裝置組態"
#. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:520
msgid "Write network configuration"
msgstr "寫入網路組態"
#. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:522
msgid "Write routing configuration"
msgstr "寫入路由組態"
#. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:524
msgid "Write hostname and DNS configuration"
msgstr "寫入主機名稱和 DNS 組態"
#. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:526
msgid "Set up network services"
msgstr "設定網路服務"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr "寫入防火牆設定"
#. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:534
msgid "Activate network services"
msgstr "啟用網路服務"
#. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:550
msgid "Writing /etc/modprobe.conf..."
msgstr "正在寫入 /etc/modprobe.conf..."
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:555
msgid "Writing device configuration..."
msgstr "正在寫入裝置組態..."
#. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:561
msgid "Writing network configuration..."
msgstr "正在寫入網路組態..."
#. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:567
msgid "Writing routing configuration..."
msgstr "正在寫入路由組態..."
#. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:575
msgid "Writing hostname and DNS configuration..."
msgstr "正在寫入主機名稱和 DNS 組態..."
#. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:588
msgid "Setting up network services..."
msgstr "正在設定網路服務..."
#. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr "正在寫入防火牆設定..."
#. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:606
msgid "Activating network services..."
msgstr "正在啟用網路服務..."
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:642
msgid "No network running"
msgstr "沒有網路運作"
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: 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:782
+#: src/modules/Lan.rb:759
msgid "Network Mode"
msgstr "網路模式"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:764
msgid "Interfaces controlled by NetworkManager"
msgstr "由 NetworkManager 控制介面"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:766
msgid "Disable NetworkManager"
msgstr "停用 NetworkManager"
#. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:770
msgid "Traditional network setup with NetControl - ifup"
msgstr "傳統網路設定使用 NetControl - ifup"
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:773
msgid "Enable NetworkManager"
msgstr "啟用 NetworkManager"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:779
msgid "Support for IPv6 protocol is enabled"
msgstr "已啟用 IPv6 通訊協定的支援"
#. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:781
msgid "Disable IPv6"
msgstr "停用 IPv6"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:785
msgid "Support for IPv6 protocol is disabled"
msgstr "已停用 IPv6 通訊協定的支援"
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:198
#, fuzzy
msgid "connected"
msgstr "未連線"
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:199
msgid "datagram"
msgstr ""
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
msgid "Started automatically at boot"
msgstr "開機時自動啟動"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1280
msgid "Started automatically on cable connection"
msgstr "在電纜連線上自動啟動"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1284
msgid "Managed by NetworkManager"
msgstr "由 NetworkManager 管理"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1288
msgid "Will not be started at all"
msgstr "完全不會啟動"
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1294
msgid "Started manually"
msgstr "手動啟動"
#. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1306
msgid "IP address assigned using"
msgstr "指定 IP 位址使用"
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1310
#, fuzzy
msgid "IP address: %s/%s"
msgstr "IP 位址: %1/%2"
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1313
#, fuzzy
msgid "IP address: %s, subnet mask %s"
msgstr "IP 位址:%1,子網路遮罩 %2"
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1337
msgid "Not configured"
msgstr "未設定"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
#, fuzzy
msgid "Device Name: %s"
msgstr "設備名稱:%1"
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1380
msgid "Bonding slaves"
msgstr "Bonding 從屬"
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1394
msgid "enslaved in %s"
msgstr ""
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1395
msgid "Bonding master"
msgstr "Bonding 主要"
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1409
msgid "Not connected"
msgstr "未連線"
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1410
msgid "No hwinfo"
msgstr "無硬體資訊"
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1427
#, 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>無法設定網路卡,因為核心裝置 (eth0, wlan0) 未出現。 這很可能是因為遺失韌體 (無線網路裝置) 所造成的。請參考 dmesg 輸出獲得更多的細節。</p>"
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1433
#, fuzzy
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
@@ -4552,52 +4525,55 @@
"<p>此裝置未組態。按 <b>編輯</b>\n"
"來組態。</p>\n"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "Needed firmware"
msgstr "需要韌體"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "unknown"
msgstr "不明的"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:158
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
msgstr ""
#. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:203
msgid "Configure display manager"
msgstr "設定顯示管理員"
#. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:208
msgid "Restart the services"
msgstr "重新啟動服務"
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:211
msgid "Saving Remote Administration Configuration"
msgstr "正在儲存遠端管理組態"
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:220
msgid "Configuring display manager..."
msgstr "正在設定顯示管理員..."
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:224
msgid "Restarting the service..."
msgstr "正在重新啟動服務..."
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#. Install required packages
+#: src/modules/Remote.rb:261
msgid "Enabling service %{service} has failed"
msgstr ""
+#: src/modules/Remote.rb:267
+msgid "Disabling service %{service} has failed"
+msgstr ""
+
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:295
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4605,30 +4581,30 @@
msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is enabled."
msgstr "已啟用遠端管理。"
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is disabled."
msgstr "已停用遠端管理。"
#. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
msgid "Write IP forwarding settings"
msgstr "寫入 IP 轉遞設定"
#. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
msgid "Write routing settings"
msgstr "寫入路由設定"
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
msgid "Saving Routing Configuration"
msgstr "正在儲存路由組態"
#. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
msgid "Writing IP forwarding settings..."
msgstr "正在寫入 IP 轉遞設定..."
@@ -4637,24 +4613,24 @@
#. 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:281
+#: src/modules/Routing.rb:284
msgid "Writing routing settings..."
msgstr "正在寫入路由設定..."
#. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
#, fuzzy
msgid "Gateway: %s"
msgstr "閘道:%1"
#. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
#, fuzzy
msgid "IP Forwarding for IPv4: %s"
msgstr "IP 轉遞"
#. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
#, fuzzy
msgid "IP Forwarding for IPv6: %s"
msgstr "IP 轉遞"
@@ -4674,6 +4650,42 @@
msgid "(Unprotected)"
msgstr "(未受保護)"
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "已經成功儲存組態"
+
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "已成功儲存 DNS 組態"
+
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "已成功儲存 DSL 組態"
+
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "已成功儲存主機組態"
+
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "已成功儲存 ISDN 組態"
+
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "已成功儲存網路卡組態"
+
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "已成功儲存數據機組態"
+
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "已成功儲存代理組態"
+
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "已成功儲存提供者組態"
+
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "已成功儲存路由組態"
+
+#~ msgid "Configure mail now?"
+#~ msgstr "要現在設定郵件嗎?"
+
+#~ msgid "Run configuration of %1?"
+#~ msgstr "要執行 %1 的組態嗎?"
+
#~ msgid "Device boot protocol"
#~ msgstr "裝置開機協定"
Modified: trunk/yast/zh_TW/po/nfs.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/nfs.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/nfs.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: nfs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-31 09:06+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -136,7 +136,7 @@
"0-9、A-Z、a-z、半形句點、- 及 _。:"
#. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
msgid ""
"fstab already contains an entry\n"
"with mount point '%1'."
@@ -145,7 +145,7 @@
"具有裝載點 '%1' 的項目。"
#. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
msgid ""
"The path entered is invalid.\n"
"It must be shorter than 70 characters\n"
@@ -388,12 +388,12 @@
msgstr "NFS 用戶端組態"
#. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
msgid "Unable to create directory '%1'."
msgstr "無法建立目錄 '%1'。"
#. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
msgid ""
"Unable to write to /etc/fstab.\n"
"No changes will be made to the\n"
@@ -404,52 +404,52 @@
"NFS 用戶端組態。\n"
#. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
msgid "Writing NFS Configuration"
msgstr "正在寫入 NFS 組態"
#. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
msgid "Stop services"
msgstr "停止服務"
#. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
msgid "Start services"
msgstr "啟動服務"
#. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
msgid "Stopping services..."
msgstr "正在停止服務..."
#. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
msgid "Starting services..."
msgstr "正在啟動服務..."
#. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
msgid "Finished"
msgstr "已完成"
#. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
msgid "Writing NFS client settings. Please wait..."
msgstr "正在寫入 NFS 用戶端設定。請稍候..."
#. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr "無法從 /etc/fstab 裝載 NFS 項目。"
#. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
msgid "NFS Entries"
msgstr "NFS 項目"
#. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
msgid "%1 entries configured"
msgstr "已設定 %1 項目"
Modified: trunk/yast/zh_TW/po/nis.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/nis.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/nis.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-31 09:15+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -265,9 +265,10 @@
msgstr "NIS 伺服器的位址(&A)"
#. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "廣播(&O)"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "廣播(&B)"
#. pushbutton label, find nis servers
#. Shortcut must not conflict with Finish and Next (#29960)
@@ -380,11 +381,6 @@
msgstr "伺服器 (以空格或逗號分隔)(&S)"
#. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "廣播(&B)"
-
-#. checkbox label
#: src/include/nis/ui.rb:859
msgid "&SLP"
msgstr "SLP(&S)"
@@ -592,3 +588,6 @@
#: src/modules/Nis.rb:1260
msgid "NIS server not found."
msgstr "找不到 NIS 伺服器。"
+
+#~ msgid "Br&oadcast"
+#~ msgstr "廣播(&O)"
Modified: trunk/yast/zh_TW/po/ntp-client.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/ntp-client.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/ntp-client.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: ntp-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-31 09:28+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -26,7 +26,7 @@
msgstr "正在寫入 NTP 組態..."
#. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
msgstr "<p>按 <b>立刻同步</b>,使用選定的 NTP 伺服器來校正您的系統時間。如果您要持續使用 NTP ,啟用 <b>儲存 NTP 設定</b>。</p>"
@@ -35,48 +35,48 @@
msgstr "<p>啟用 <b>執行 NTP 精靈</b> 選項, NTP 服務將自動啟動為精靈。否則系統時間將週期性的同步。 預設時間間隔為 15 分鐘。在安裝 <b>yast2 ntp-client</b> 模組後,您可以變更此選項。</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
msgstr "<p>使用 <b>設定</b> 按鈕,開啟進階 NTP 設定。</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
msgstr "<p>與 NTP 伺服器同步只有在網路已設定的情況才能進行。</p>"
#. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
msgid "Invalid NTP server hostname %1"
msgstr "無效的 NTP 伺服器主機名稱 %1"
#. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
msgid "&NTP Server Address"
msgstr "NTP 伺服器位址(&N)"
#. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
msgid "&Run NTP as daemon"
msgstr "背景執行 NTP 精靈(&R)"
#. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
msgid "&Save NTP Configuration"
msgstr "儲存 NTP 組態(&S)"
#. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
msgid "S&ynchronize now"
msgstr "立即同步(&Y)"
#. push button label
#. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
msgid "&Configure..."
msgstr "設定組態(&C)..."
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
#, fuzzy
msgid ""
"Synchronization with NTP server is not possible\n"
@@ -86,12 +86,12 @@
"無法與 NTP 伺服器同步。\n"
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
msgid "Synchronizing with NTP server..."
msgstr "正在與 NTP 伺服器同步..."
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
#, fuzzy
#| msgid "Connection to the LDAP server cannot be established."
msgid "Connection to selected NTP server failed."
@@ -99,7 +99,7 @@
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
#, fuzzy
#| msgid "'Test query to server '%1' failed. If server is not yet accessible or network is not configured click 'No' to ignore. Revisit NTP server configuration?"
msgid ""
@@ -306,273 +306,267 @@
msgstr "JJY 接收器"
#. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
msgid "NTP client configuration module."
msgstr "NTP 用戶端組態模組。"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
msgid "Print the status of the NTP daemon"
msgstr "列印 NTP 精靈的狀態"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
msgid "Print all configured synchronization relationships"
msgstr "列印所有已設定的同步關係"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
msgid "Enable the NTP daemon"
msgstr "啟用 NTP 精靈"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
msgid "Disable the NTP daemon"
msgstr "停用 NTP 精靈"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
msgid "Add new synchronization relationship"
msgstr "新增同步關係"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
msgid "Edit existing synchronization relationship"
msgstr "編輯現有的同步關係"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
msgid "Delete a synchronization relationship"
msgstr "刪除同步關係"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
msgid "The address of the server"
msgstr "伺服器的位址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
msgid "The address of the peer"
msgstr "對等的位址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
msgid "The address to which to broadcast"
msgstr "要廣播的目標位址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
msgid "The address from which to accept broadcasts"
msgstr "接受廣播的位址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
msgid "The options of the relationship"
msgstr "關係的選項"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
msgid "Options for clock driver calibration"
msgstr "時鐘驅動程式校正的選項"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
msgid "Use the server for initial synchronization"
msgstr "使用伺服器進行啟始同步"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
msgid "Do not use the server for initial synchronization"
msgstr "不使用伺服器進行啟始同步"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
msgid "The synchronization peer not specified."
msgstr "未指定同步對等。"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
msgid "Specified synchronization peer not found."
msgstr "找不到指定的同步對等。"
#. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is enabled."
msgstr "已啟用 NTP 精靈。"
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is disabled."
msgstr "已停用 NTP 精靈。"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
msgid "Server"
msgstr "伺服器"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
msgid "Peer"
msgstr "對等"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
msgid "Broadcast"
msgstr "廣播"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
msgid "Accepting Broadcasts"
msgstr "接受廣播"
#. table cell, %1 is integer 0-3
#. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
msgid "Unit Number: %1"
msgstr "單位編號: %1"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
msgid "Local Radio Clock"
msgstr "本地無線電時鐘"
#. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
msgid "Reading the settings failed."
msgstr "讀取設定失敗。"
#. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
msgid "NTP Server Configuration"
msgstr "NTP 伺服器組態"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
msgid "NTP Configuration"
msgstr "NTP 組態"
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "防火牆設定"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
msgid "General Settings"
msgstr "一般設定"
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
msgid "Security Settings"
msgstr "安全性設定"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
msgid "Advanced NTP Configuration"
msgstr "進階 NTP 組態"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
msgid "New Synchronization"
msgstr "新同步化"
#. Server editing dialog
#. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
msgid "Server Settings"
msgstr "伺服器設定"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
msgid "NTP Server"
msgstr "NTP 伺服器"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
msgid "Local NTP Server"
msgstr "本地 NTP 伺服器"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
msgid "Public NTP Server"
msgstr "公用 NTP 伺服器"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
msgid "NTP Peer"
msgstr "NTP 對等"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
msgid "Local Reference Clock"
msgstr "本機參考時鐘"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
msgid "Outgoing Broadcast"
msgstr "外送廣播"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
msgid "Incoming Broadcast"
msgstr "內傳廣播"
#. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
msgid "&Reference ID"
msgstr "參考 ID(&R)"
#. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
msgid "&Stratum"
msgstr "組織層(&S)"
#. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
msgid "Calibration Offset 1"
msgstr "校正偏移量 1"
#. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
msgid "Calibration Offset 2"
msgstr "校正偏移量 2"
#. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
msgid "Flag &1"
msgstr "旗標 1(&1)"
#. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
msgid "Flag &2"
msgstr "旗標 2(&2)"
#. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
msgid "Flag &3"
msgstr "旗標 3(&3)"
#. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
msgid "Flag &4"
msgstr "旗標 4(&4)"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
msgid "Clock Driver Calibration"
msgstr "時鐘驅動程式校正"
#. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
msgid ""
"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -581,7 +575,7 @@
"請稍候...<br></p>"
#. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
msgid ""
"<p><b><big>Aborting Initialization:</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -590,7 +584,7 @@
"要安全地中止組態公用程式,請按<b>「中止」</b>。</p>"
#. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
msgid ""
"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -599,7 +593,7 @@
"請稍候...<br></p>"
#. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -609,17 +603,15 @@
"按<b>「中止」</b>,可中止儲存程序。\n"
"其他的對話方塊會通知您執行此動作是否安全。</p>"
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
#, fuzzy
msgid ""
"<p><b><big>Start NTP Daemon</big></b><br>\n"
"Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
msgstr ""
"<p><b><big>自動啟動 NTP 精靈</big></b><br>\n"
"選擇是否在開機系統時啟動 NTP 精靈。\n"
@@ -652,7 +644,7 @@
"存取控制旗標可以在伺服器概觀表格中微調。如果 NTP 是 經由 DHCP 設定,此選項不可用。</p>\n"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
msgid ""
"<p><b><big>Configuring via DHCP</big></b><br>\n"
"To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -667,7 +659,7 @@
"DHCP 伺服器提供的 NTP 伺服器相關資訊。</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
msgid ""
"<p><b><big>Configured Servers</big></b><br>\n"
"To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -682,7 +674,7 @@
"請選取它,並按一下<b>「刪除」</b>。</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
msgid ""
"<p><b><big>Display Log</big></b></p>\n"
"<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
@@ -691,7 +683,7 @@
"<p>若要在新視窗中檢視 NTP 精靈的記錄,請按一下<b>「顯示記錄」</b>按鈕。</p>\n"
#. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
msgid ""
"<p><b><big>Advanced configuration</big></b><br>\n"
"To configure this host to synchronize against multiple remote hosts or against\n"
@@ -702,7 +694,7 @@
"對本地連線的時鐘進行同步化,請使用<b>「進階組態」</b>。"
#. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
msgid ""
"<p><b><big>Clock Type</big></b><br>\n"
"Select the driver for the clock to configure.</p>"
@@ -711,7 +703,7 @@
"選擇要設定之時鐘的驅動程式。</p>"
#. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
msgid ""
"<p><b><big>Unit Number</big></b><br>\n"
"If you have multiple clocks of the same type, you must set\n"
@@ -722,7 +714,7 @@
"<b>「單位編號」</b>。</p>"
#. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
msgid ""
"<p><b><big>Device</big></b><br>\n"
"To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -741,7 +733,7 @@
"必須手動建立符號連結。"
#. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
msgid ""
"<p><b><big>Driver Calibration</big></b><br>\n"
"To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -750,7 +742,7 @@
"若要校正時鐘驅動程式,請按一下<b>「驅動程式校正」</b>。</p>"
#. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
msgid ""
"<p><b><big>Address of the NTP Server</big></b><br>\n"
"To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -763,7 +755,7 @@
"供應商。</p>"
#. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
msgid ""
"<p><b><big>Selecting a Server</big></b><br>\n"
"To select an NTP server from those found in the local network\n"
@@ -776,7 +768,7 @@
"擇一選取<b>「區域 NTP 伺服器」</b>和<b>「公用 NTP 伺服器」</b>。</p>"
#. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
msgid ""
"<p><b><big>Testing Server Accessibility</big></b><br>\n"
"To test if the selected server is up and responds properly,\n"
@@ -787,7 +779,7 @@
"請按一下<b>「測試」</b>。</p>"
#. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address of the host with which to synchronize mutually,\n"
@@ -798,7 +790,7 @@
"請使用<b>「位址」</b>。</p>"
#. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -809,7 +801,7 @@
"文字欄位。</p>"
#. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address from which to accept broadcast packets, use \n"
@@ -821,7 +813,7 @@
#. help text 2/4, was removed
#. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
msgid ""
"<p><b><big>Options</big></b><br>\n"
"To fine-tune the synchronization source, enter the respective options in the\n"
@@ -833,7 +825,7 @@
"<b>「選項」</b>文字欄位中。如需詳細資料,請參閱\n"
"<i>/usr/share/doc/packages/ntp-doc/html/confopt.htm</i>。</p>\n"
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
msgid ""
"<p><b><big>Access Control Options</big></b><br>\n"
"Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -852,7 +844,7 @@
"選項才可用。</p>\n"
#. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
msgid ""
"<p><b><big>Synchronization Peer Type</big></b><br>\n"
"Select the kind of synchronization peer to add here.</p>"
@@ -861,7 +853,7 @@
"可在此處選取要新增的同步對等類型。</p>"
#. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
msgid ""
"<p>To add an NTP server to which to synchronize,\n"
"select <b>Server</b>.</p>"
@@ -870,7 +862,7 @@
"請選取<b>「伺服器」</b>。</p>"
#. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
msgid ""
"<p>To add an NTP peer to synchronize mutually, select\n"
"<b>Peer</b>.</p>"
@@ -879,7 +871,7 @@
"<b>「對等」</b>。</p>"
#. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
msgid ""
"<p>To configure a local clock connected directly to your computer,\n"
"select <b>Radio Clock</b>.</p>"
@@ -888,7 +880,7 @@
"請選取<b>「無線電時鐘」</b>。</p>"
#. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
msgid ""
"<p>To broadcast time information through your network, select\n"
"<b>Outgoing Broadcast</b>.</p>"
@@ -897,7 +889,7 @@
"<b>「外送廣播」</b>。</p>"
#. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
msgid ""
"<p>To accept NTP packets broadcasted by other hosts on the network\n"
"and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
@@ -906,7 +898,7 @@
"並用它來設定本地時間,請選取<b>「內傳廣播」<b>。</p>"
#. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
msgid ""
"<p><big><b>Server Location</b></big>\n"
"Select if you want to find the NTP server in the local network or select\n"
@@ -917,7 +909,7 @@
"或是從已知的 NTP 伺服器清單中選取 NTP 伺服器,請選取此選項。</p>"
#. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
msgid ""
"<p><big><b>Finding Server in the Local\n"
"Network</b></big><br>\n"
@@ -932,7 +924,7 @@
"然後從已找到伺服器的清單中選取伺服器。</p>"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
msgid ""
"<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
"Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -943,7 +935,7 @@
"特定國家的 NTP 伺服器,請在<b>「國家」</b>中選取。</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
msgid ""
"<p><big><b>Note</b></big><br>\n"
"The listed NTP servers may not be available from any country, but only\n"
@@ -964,7 +956,7 @@
",瞭解離您最近的 NTP 伺服器。</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
msgid ""
"<p><big><b>Testing Server Accessibility</b></big><br>\n"
"To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -974,7 +966,7 @@
#. help text connected with checkbox: "Use Random Server from pool.ntp.org"
#. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
msgid ""
"<p><big><b>Use Random Servers</b></big><br>\n"
"This service is offered by pool.ntp.org. If you select this option,\n"
@@ -989,7 +981,7 @@
"您的 NTP 用戶端每個小時會與不同的伺服器進行同步化。</p>\n"
#. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
msgid ""
"<p><big><b>Clock Driver Calibration</b></big><br>\n"
"The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -1002,7 +994,7 @@
"驅動程式。有些驅動程式不會使用所有的選項。</p>"
#. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
msgid ""
"To learn more about available options, install the package\n"
"<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
@@ -1020,17 +1012,17 @@
"將會遺失所有的變更。"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
msgid "Restart NTP Daemon"
msgstr "重新啟動 NTP 精靈"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
msgid "Save Settings and Restart NTP Daemon"
msgstr "儲存設定並重新啟動 NTP 精靈"
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
msgid ""
"Warning!\n"
"\n"
@@ -1045,7 +1037,7 @@
"精靈可能會無法正常執行。"
#. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
msgid ""
"NTP server '%1' is not a valid hostname,\n"
"fully qualified hostname, IPv4 address, or IPv6 address."
@@ -1054,7 +1046,7 @@
"完全合法的主機名稱、IPv4 位址或 IPv6 位址。"
#. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
msgid ""
"Enabling Random Servers from pool.ntp.org would\n"
"replace the current NTP server.\n"
@@ -1067,44 +1059,44 @@
" 確定取代目前的 NTP 伺服器?"
#. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
msgid "Select the Device"
msgstr "選取裝置"
#. selection box header
#. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
msgid "Public NTP &Servers"
msgstr "公用 NTP 伺服器(&S)"
#. message report (no server selected)
#. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
msgid "Select an NTP server."
msgstr "選取 NTP 伺服器。"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
msgid "All Countries"
msgstr "所有國家"
#. combo box header
#. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
msgid "&Country"
msgstr "國家(&C)"
#. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
msgid "Scanning for NTP servers on your network..."
msgstr "正在掃描您網路上的 NTP 伺服器..."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
#. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
msgid ""
"No NTP server has been found on your network.\n"
"This could be caused by a running SuSEfirewall2,\n"
@@ -1115,205 +1107,205 @@
"SuSEfirewall2 很可能封鎖網路掃描。"
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
msgid "No NTP server has been found on your network."
msgstr "在您的網路上找不到 NTP 伺服器。"
#. combo box label
#. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
msgid "Address"
msgstr "位址"
#. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
msgid "No server is selected."
msgstr "沒有選取伺服器。"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
msgid "A&ddress"
msgstr "位址(&D)"
#. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
msgid "Ad&vanced Configuration"
msgstr "進階組態(&V)"
#. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
msgid "&Driver Calibration"
msgstr "驅動程式校正(&D)"
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
msgid "&Interval of the Synchronization in Minutes"
msgstr "同步時間間隔(分鐘)(&I)"
#. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
msgid "Start NTP Daemon"
msgstr "啟動 NTP 精靈"
#. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
msgid "Only &Manually"
msgstr "僅手動(&M)"
#. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
msgid "&Synchronize without Daemon"
msgstr "同步(不啟動精靈)(&S)"
#. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
msgid "Now and on &Boot"
msgstr "現在和開機時(&B)"
#. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
msgid "Run NTP Daemon in Chroot &Jail"
msgstr "在 Chroot Jail 中執行 NTP 精靈(&J)"
#. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
msgid "&Restrict NTP Service to Configured Servers Only "
msgstr "限制 NTP 服務僅用已組態的伺服器"
#. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
msgid "Manual"
msgstr "手動"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
msgid "Auto"
msgstr "自動"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
msgid "Custom"
msgstr "自訂"
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
msgid "&Runtime Configuration Policy"
msgstr "Runtime 組態政策(&R)"
#. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
msgid "&Custom Policy"
msgstr "自訂政策(&C)"
#. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
msgid "&Use Random Servers from pool.ntp.org"
msgstr "使用來自 pool.ntp.org 的隨機伺服器(&U)"
#. text entry label
#. text entry
#. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
msgid "&Address"
msgstr "位址(&A)"
#. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
msgid "&Select..."
msgstr "選取(&S)..."
#. push button
#. push button
#. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
msgid "&Test"
msgstr "測試(&T)"
#. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
msgid "Synchronization Type"
msgstr "同步化類型"
#. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
msgid "Display &Log..."
msgstr "正在顯示記錄(&L)..."
#. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
msgid "Clock &Type"
msgstr "時鐘類型(&T)"
#. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
msgid "Unit &Number"
msgstr "單位編號(&N)"
#. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
msgid "Create &Symlink"
msgstr "建立符號連結(&S)"
#. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
msgid "&Device"
msgstr "裝置(&D)"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
msgid "Access Control Options"
msgstr "存取控制選項"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
msgid "&Server"
msgstr "伺服器(&S)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
msgid "&Peer"
msgstr "對等(&P)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
msgid "&Radio Clock"
msgstr "無線電時鐘(&R)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
msgid "&Outgoing Broadcast"
msgstr "外送廣播(&O)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
msgid "&Incoming Broadcast"
msgstr "內傳廣播(&I)"
#. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
msgid "Type"
msgstr "類型"
#. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
msgid "Loc&al Network"
msgstr "區域網路(&A)"
#. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
msgid "&Public NTP Server"
msgstr "公用 NTP 伺服器(&P)"
#. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
msgid "NTP Server Location"
msgstr "NTP 伺服器位置"
#. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
msgid "&Lookup"
msgstr "查詢(&L)"
@@ -1327,146 +1319,91 @@
msgid "Initializing ..."
msgstr "正在啟始化..."
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "正在啟始化 NTP 用戶端組態"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "讀取網路組態"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "讀取 NTP 設定"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "正在讀取網路組態..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "正在讀取 NTP 設定..."
-
-#. progress step
#. While calling "yast clone_system" it is possible that
#. the ntp server has not already been installed at that time.
#. (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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
#. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
msgid "Finished"
msgstr "已完成"
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "正在儲存 NTP 用戶端組態"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "寫入 NTP 設定"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "重新啟動 NTP 精靈"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "正在寫入設定..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "正在重新啟動 NTP 精靈..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-msgid "Cannot update the dynamic configuration policy."
-msgstr "無法更新動態組態政策。"
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "無法重新啟動 NTP 精靈。"
-
#. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
msgid "The NTP daemon starts when starting the system."
msgstr "啟動系統時會啟動 NTP 精靈。"
#. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
msgid "The NTP daemon does not start automatically."
msgstr "不會自動啟動 NTP 精靈。"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
msgid "Servers: %1"
msgstr "伺服器: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
msgid "Radio Clocks: %1"
msgstr "無線電時鐘: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
msgid "Peers: %1"
msgstr "對等: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
msgid "Broadcast time information to: %1"
msgstr "廣播時間資訊的目標:%1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
msgid "Accept broadcasted time information from: %1"
msgstr "接受廣播時間資訊的來源:%1"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
msgid "Combine static and DHCP configuration."
msgstr "結合靜態與 DHCP 組態"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
msgid "Static configuration only."
msgstr "僅靜態組態。"
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
msgid "Custom configuration policy."
msgstr "自訂組態政策。"
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
msgid "Testing the NTP server..."
msgstr "正在測試 NTP 伺服器..."
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
msgid "Server is reachable and responds properly."
msgstr "可連接伺服器且伺服器正確回應。"
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
msgid "Server is unreachable or does not respond properly."
msgstr "無法連接伺服器或伺服器沒有正確回應。"
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
@@ -1474,6 +1411,72 @@
"未安裝套件 %1\n"
"無法搜尋區域網路上的 NTP 伺服器。\n"
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "正在啟始化 NTP 用戶端組態"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "讀取網路組態"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "讀取 NTP 設定"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "正在讀取網路組態..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "正在讀取 NTP 設定..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "正在儲存 NTP 用戶端組態"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "寫入 NTP 設定"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "重新啟動 NTP 精靈"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "正在寫入設定..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "正在重新啟動 NTP 精靈..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+msgid "Cannot update the dynamic configuration policy."
+msgstr "無法更新動態組態政策。"
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "無法重新啟動 NTP 精靈。"
+
+#~ msgid "Firewall Settings"
+#~ msgstr "防火牆設定"
+
#~ msgid "Cannot write sysconfig variables."
#~ msgstr "無法寫入 sysconfig 變數。"
Modified: trunk/yast/zh_TW/po/packager.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/packager.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/packager.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-22 11:32+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -411,7 +411,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:95
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr "<p>套件庫管理員正在下載套件庫詳細資料...</p>"
@@ -522,7 +522,7 @@
#. dialog caption
#. dialog caption
#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/modules/AddOnProduct.rb:688
msgid "Initializing..."
msgstr "正在啟始化..."
@@ -546,11 +546,6 @@
msgid "&Media"
msgstr "媒體(&M)"
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-msgid "Saving the software manager configuration..."
-msgstr "正在儲存軟體管理員組態..."
-
#. default (minimal) priority of a repository
#: src/clients/repositories.rb:58
msgid "&Priority"
@@ -586,7 +581,7 @@
#. 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/modules/AddOnProduct.rb:1351
msgid "URL: %1"
msgstr "URL: %1"
@@ -853,7 +848,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:1040 src/modules/Packages.rb:1328
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "詳細資訊:"
@@ -861,7 +856,7 @@
#. 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:1042 src/modules/Packages.rb:1336
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "再試一次?"
@@ -1424,42 +1419,42 @@
"'%2'?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:81
msgid "Adding a New Repository"
msgstr "正在新增套件庫"
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
msgid "Check Repository Type"
msgstr "檢查套件庫類型"
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:86
msgid "Add Repository"
msgstr "新增套件庫"
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:87
msgid "Read Repository License"
msgstr "讀取套件庫合約"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
msgid "Checking Repository Type"
msgstr "正在檢查套件庫類型"
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:91
msgid "Adding Repository"
msgstr "正在新增套件庫"
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:92
msgid "Reading Repository License"
msgstr "正在讀取套件庫合約"
#. 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:156
msgid "Repository"
msgstr "套件庫"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:228
#: src/modules/SourceManager.rb:330
msgid ""
"There is no product information available at the given location.\n"
@@ -1476,8 +1471,8 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -1486,7 +1481,7 @@
"建立套件庫。"
#. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:335
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."
@@ -1495,12 +1490,12 @@
"變更協定或在伺服器端解開 ISO 影像。"
#. popup message part 2
-#: src/include/packager/repositories_include.rb:343
+#: src/include/packager/repositories_include.rb:345
msgid "Change the URL and try again?"
msgstr "變更 URL 並再試一次?"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:422
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
@@ -1508,6 +1503,11 @@
"無法搜尋 SLP 套件庫\n"
"尚未安裝 %1 套件。\n"
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+msgid "Saving the software manager configuration..."
+msgstr "正在儲存軟體管理員組態..."
+
#. New add-on product might add also new agents.
#. Functions Rereads all available agents.
#.
@@ -1515,19 +1515,19 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
msgid "An error occurred while preparing the installation system."
msgstr "準備安裝系統時發生錯誤。"
#. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:659
msgid "Control file %1 not found on media."
msgstr "媒體上找不到控制檔案 %1。"
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:900
#, fuzzy
#| msgid "Package %1 was not installed. The service cannot be edited."
msgid ""
@@ -1535,28 +1535,43 @@
"The add-on product cannot be registered."
msgstr "未安裝套件 %1。無法編輯服務。"
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+msgid "Unknown Product"
+msgstr "未知的產品"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+#| msgid "Please wait..."
+msgid "Re&lease Notes..."
+msgstr "請稍候..."
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
msgid "Unable to use additional products."
msgstr "無法使用附加產品。"
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
msgid "%1, URL: %2"
msgstr "%1, URL:%2"
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1345
msgid "URL: %1, Path: %2"
msgstr "URL: %1,路徑: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1376
msgid "Additional Products"
msgstr "附加產品"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1382
msgid ""
"The installation repository also contains the listed additional repositories.\n"
"Select the ones you want to use.\n"
@@ -1564,39 +1579,32 @@
"安裝套件庫也包含了列表中的附加套件庫。\n"
"選擇您想要使用的。\n"
-#: src/modules/AddOnProduct.rb:1378
+#: src/modules/AddOnProduct.rb:1393
msgid "Additional Products to Select"
msgstr "選擇其他產品"
#. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1400
msgid "Add Selected &Products"
msgstr "新增所選產品(&P)"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1532
#, fuzzy
msgid "Insert the addon %1 medium"
msgstr "插入附加產品 CD"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1537
#, fuzzy
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:1589
msgid "Unable to add product %1."
msgstr "無法新增產品 %1。"
-#. 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/Packages.rb:471
-msgid "Unknown Product"
-msgstr "未知的產品"
-
#. update the trusted flag
#: src/modules/KeyManager.rb:214
msgid ""
@@ -1623,27 +1631,27 @@
msgstr "無法複製金鑰至暫時目錄。"
#. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
msgid "&Show Failed Packages List"
msgstr "顯示失敗的套件清單(&S)"
#. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
msgid "&Show Full Log"
msgstr "顯示完整記錄(&S)"
#. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
msgid "Installation of some Packages Failed"
msgstr "有些套件安裝失敗"
#. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
msgid "Installation aborted by user."
msgstr "安裝被使用者中止。"
#. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
msgid "Medium %1"
msgstr "媒體 %1"
@@ -1651,13 +1659,13 @@
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
msgid ">%1"
msgstr ">%1"
#. Nothing more to install from this CD (very concise - little space!!)
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
msgid "Done."
msgstr "完成。"
@@ -1665,21 +1673,21 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
msgid "Next: %1 -- %2"
msgstr "下一步: %1 -- %2"
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
msgid "Next: %1"
msgstr "下一步:%1"
#. 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:918
+#: src/modules/PackageSlideShow.rb:922
msgid "Total"
msgstr "全部"
@@ -1688,41 +1696,41 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
msgid "Downloading %1 (download size %2)"
msgstr "下載 %1 (下載大小 %2)"
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
msgid " (Remaining: %1%2 packages)"
msgstr " (剩餘: %1%2 套件)"
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
msgid "Downloading Packages..."
msgstr "正在下載套件..."
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
msgid " (Downloaded %1 of %2 packages)"
msgstr " (下載 %1 %2 套件)"
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
msgid "Deleting %1"
msgstr "正在刪除 %1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
msgid "Installing %1 (installed size %2)"
msgstr "正在安裝 %1 (安裝大小 %2)"
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
msgid "Applying delta RPM: %1"
msgstr "套用 delta RPM:%1"
@@ -1853,8 +1861,10 @@
msgstr ""
#: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
-msgstr ""
+#, fuzzy
+#| msgid "%1 packages will be updated"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
+msgstr "將更新 %1 個套件"
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
@@ -1869,12 +1879,12 @@
msgstr ""
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
msgid "No repository found at '%1'."
msgstr "在 '%1' 找不到套件庫。"
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
msgid ""
"<p><b>The release notes for the initial release are part of the installation\n"
"media. If an Internet connection is available during configuration, you can\n"
@@ -1885,31 +1895,31 @@
"伺服器下載更新的發行摘要。</b></p>\n"
#. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
msgid "Integrating booted media..."
msgstr "正在整合已開機的媒體..."
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
msgid "Failed to integrate the service pack repository."
msgstr "無法整合 Service Pack 套件庫。"
#. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
msgid "Initializing repositories..."
msgstr "正在啟始化套件庫..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
msgid "Insert %1 CD 1"
msgstr "插入 %1 CD 1"
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
msgid "%1 CD 1 not found"
msgstr "找不到 %1 CD 1"
#. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1918,7 +1928,7 @@
"請檢查記錄檔案 %1,以取得詳細資訊。"
#. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1927,12 +1937,12 @@
"軟體需求將重新被呼叫。"
#. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
msgid "Evaluating package selection..."
msgstr "正在評估套件選項..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1941,37 +1951,49 @@
#. Sets that the license (file) has been already accepted
#.
#. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
msgid "Cannot read license file %1"
msgstr "無法讀取授權檔案 %1"
-#: src/modules/ProductLicense.rb:151
+#: src/modules/ProductLicense.rb:153
msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
msgstr "要正確顯示產品授權,當建構影像時,請將 license.tar.gz 檔案放在 live 媒體的根目錄。"
#. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
msgid "&Language"
msgstr "語言(&L)"
#. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
#, fuzzy
msgid "I &Agree to the License Terms."
msgstr "是,我同意「授權合約」的內容(&Y)"
#. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+#, fuzzy
+#| msgid ""
+#| "If you want to print this EULA, you can find it\n"
+#| "on the first media in the file %1"
+msgid ""
"If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
msgstr ""
"如果您想列印這份 EULA,您可以在\n"
"第一片媒體中找到 %1 檔"
#. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
@@ -1985,18 +2007,18 @@
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
msgid "License Agreement"
msgstr "授權合約"
#. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
msgid "Really abort the add-on product installation?"
msgstr "確定要中止安裝附加產品?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
msgid ""
"Refusing the license agreement cancels the installation.\n"
"Really refuse the agreement?"
@@ -2005,7 +2027,7 @@
"確定要拒絕合約嗎?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1048
+#: src/modules/ProductLicense.rb:1044
msgid ""
"Refusing the license agreement cancels the add-on\n"
"product installation. Really refuse the agreement?"
@@ -2014,11 +2036,12 @@
"的安裝。確定要拒絕合約嗎?"
#. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1058
+#: src/modules/ProductLicense.rb:1054
msgid "The system is shutting down..."
msgstr "系統正在關閉..."
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
#: src/modules/ProductLicense.rb:1153
#, fuzzy
#| msgid " License Agreement"
@@ -2026,7 +2049,7 @@
msgstr "授權合約"
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
#, fuzzy
msgid ""
"If you want to print this EULA, you can download it from\n"
@@ -2135,7 +2158,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
#, fuzzy
#| msgid "&SMB/CIFS"
msgid "S&MB/CIFS"
@@ -2184,7 +2207,7 @@
msgstr "下載套件庫描述檔(&D)"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
msgid ""
"<p>If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>"
@@ -2193,7 +2216,7 @@
" ISO 影像的檔案,請設定 <b>ISO 影像</b>。</p>"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
msgid ""
"<p>If the repository is on multiple media,\n"
"set the location of the first media of the set.</p>\n"
@@ -2202,86 +2225,86 @@
"設定組合中第一個媒體的位置。</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
msgid "&Server Name"
msgstr "伺服器名稱(&M)"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
msgid "&Path to Directory or ISO Image"
msgstr "目錄或 ISO 影像路徑(&P)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
msgid "&ISO Image"
msgstr "ISO 影像(&I)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
msgid "N&FS v4 Protocol"
msgstr "NFS v4 協定(&F)"
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
msgid "Mount Options"
msgstr "裝載選項"
#. 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:163
+#: src/modules/SourceDialogs.rb:164
msgid "(default)"
msgstr "(預設)"
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
msgid "URL of the Repository"
msgstr "套件庫的 URL"
#. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
msgid "P&rotocol"
msgstr "通訊協定(&R)"
#. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
msgid "&URL of the Repository"
msgstr "套件庫的 URL(&U)"
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
msgid "Repository URL"
msgstr "套件庫 URL"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
msgid "NFS Server"
msgstr "NFS 伺服器"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
msgid "CD or DVD Media"
msgstr "CD 或 DVD 媒體"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
msgid "Hard Disk"
msgstr "硬碟"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
msgid "USB Stick or Disk"
msgstr "USB 隨身碟或磁碟"
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
msgid "Local Directory"
msgstr "本機目錄"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
msgid "Local ISO Image"
msgstr "本機 ISO 影像"
@@ -2290,24 +2313,24 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: 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
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
msgid "Server and Directory"
msgstr "伺服器和目錄"
#. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:469
msgid "The name of the repository cannot be empty."
msgstr "套件庫名稱不能是空白。"
#. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:482
msgid "&Repository Name"
msgstr "套件庫名稱"
#. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:497
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
@@ -2317,12 +2340,12 @@
"YaST 將使用產品名稱(如果有)或 URL 來當成名稱。</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:511
msgid "&Service Name"
msgstr "服務名稱(&S)"
#. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:519
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
@@ -2332,17 +2355,17 @@
"YaST 將使用服務 URL 的一部份來當成名稱。</p>\n"
#. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:554
msgid "URL cannot be empty."
msgstr "URL 不能是空白。"
#. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:568
msgid "&URL"
msgstr "URL(&U)"
#. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:582
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2354,16 +2377,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
msgid "Edit Parts of the URL"
msgstr "編輯部分 URL"
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
msgid "Edit Complete URL"
msgstr "編輯完整 URL"
#. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:774
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2373,7 +2396,7 @@
"使用<b>伺服器名稱</b>與<b>目錄或 ISO 影像路徑</b>\n"
"來指定 NFS 伺服器主機名稱與伺服器上的路徑。<p>"
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:781
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2382,16 +2405,16 @@
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:836
msgid "&CD-ROM"
msgstr "CD-ROM(&C)"
#. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:838
msgid "&DVD-ROM"
msgstr "DVD-ROM(&D)"
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:843
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2400,12 +2423,12 @@
"設定 <b>CD-ROM</b> 或 <b>DVD-ROM</b> 來指定媒體類型。</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:943
msgid "ISO Image File"
msgstr "ISO 影像檔"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:966
msgid ""
"The entered path is not a directory\n"
"or the directory does not exist.\n"
@@ -2414,7 +2437,7 @@
"此目錄不存在。\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:996
msgid ""
"The entered path is not a file\n"
"or the file does not exist.\n"
@@ -2423,7 +2446,7 @@
"此檔案不存在。\n"
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1020
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2434,17 +2457,17 @@
"無論如何要使用它嗎?\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1041
msgid "&Path to Directory"
msgstr "目錄之路徑(&P)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
msgid "&Plain RPM Directory"
msgstr "單純的 RPM 目錄(&P)"
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1064
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2459,20 +2482,20 @@
"選項。</p>\n"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1300
msgid "&USB Mass Storage Device"
msgstr "USB 大量儲存裝置(&U)"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
msgid "&File System"
msgstr "檔案系統(&F)"
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
msgid "Dire&ctory"
msgstr "目錄(&C)"
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1311
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2492,7 +2515,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:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
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"
@@ -2503,11 +2526,11 @@
"請從選單中選取。</p>\n"
#. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1371
msgid "&Disk Device"
msgstr "磁碟裝置(&D)"
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1378
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2526,12 +2549,12 @@
"選項。</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1404
msgid "&Path to ISO Image"
msgstr "ISO 影像的路徑(&P)"
#. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1424
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2542,71 +2565,71 @@
"的路徑。</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1605
msgid "Server &Name"
msgstr "伺服器名稱(&N)"
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1609
msgid "&Port"
msgstr "埠(&P)"
#. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1614
msgid "&Share"
msgstr "共用(&S)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1627
msgid "ISO &Image"
msgstr "ISO 影像(&I)"
#. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1630
msgid "&Directory on Server"
msgstr "伺服器上的目錄(&D)"
#. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1635
msgid "Au&thentication"
msgstr "驗證(&T)"
#. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1642
msgid "&Anonymous"
msgstr "匿名(&A)"
#. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1651
msgid "&Workgroup or Domain"
msgstr "工作群組或領域(&W)"
#. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1660
msgid "&User Name"
msgstr "使用者名稱(&U)"
#. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1667
msgid "&Password"
msgstr "密碼(&P)"
#. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1742
msgid "&FTP"
msgstr "FTP(&F)"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1745
msgid "H&TTP"
msgstr "HTTP(&T)"
#. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1752
msgid "HTT&PS"
msgstr "HTTPS(&P)"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1926
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"
@@ -2631,7 +2654,7 @@
"ISO 影像的檔案,請設定 <b>ISO 影像</b>。</p>\n"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1939
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"
@@ -2642,12 +2665,18 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+msgid "I would li&ke to install an additional Add On Product"
msgstr ""
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+#| msgid "Checking Network Configuration ..."
+msgid "Net&work Configuration..."
+msgstr "正在檢查網路組態..."
+
#. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2136
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2658,7 +2687,7 @@
"或硬碟。</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2669,7 +2698,7 @@
"請準備好產品 CD 組或 DVD。</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2155
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -2684,7 +2713,7 @@
"則只需要基礎路徑。</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2167
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2697,25 +2726,25 @@
"例如 /data1/CD1。</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2182
msgid "Select the media type"
msgstr "選取媒體類型"
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2188
msgid "Insert the add-on product CD"
msgstr "插入附加產品 CD"
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2189
msgid "Insert the add-on product DVD"
msgstr "插入附加產品 DVD"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2207
msgid "No USB disk was detected."
msgstr "偵測不到任何 USB 磁碟。"
#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#: src/modules/SourceDialogs.rb:2415
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2730,12 +2759,12 @@
"自動下載此檔案。</p>\n"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2635
msgid "Media Type"
msgstr "媒體類型"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2659
#, fuzzy
msgid "Add On Product"
msgstr "附加產品"
@@ -2743,7 +2772,7 @@
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2690
#, fuzzy
#| msgid "URL entered is not valid"
msgid "URL scheme '%s' is not valid."
@@ -2937,12 +2966,12 @@
msgstr "在您的網路上找不到 SLP 套件庫。"
#. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
msgid "Partition \"%1\" needs %2 more disk space."
msgstr "分割區 \"%1\" 還需要 %2 磁碟空間。"
#. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
msgid ""
"Deselect packages or delete data or temporary files\n"
"before updating the system.\n"
@@ -2951,7 +2980,7 @@
"或暫時檔案。\n"
#. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
msgid "Deselect some packages."
msgstr "取消選取部分套件。"
@@ -2995,9 +3024,6 @@
#~ msgid "Initialize Software Manager"
#~ msgstr "啟始化軟體管理員"
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "正在檢查網路組態..."
-
#~ msgid "Initializing Software Manager ... "
#~ msgstr "正在啟始化軟體管理員..."
Modified: trunk/yast/zh_TW/po/pkg-bindings.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/pkg-bindings.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/pkg-bindings.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: pkg-bindings\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2010-07-01 01:01+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -47,12 +47,12 @@
msgstr "<P><BIG><B>正在重新整理套件庫</B></BIG></P><P>套件管理員正在更新套件庫內容...</P>"
#. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
msgid "The package cannot be selected to install."
msgstr "套件無法被選取安裝。"
#. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
msgid "The package is not available."
msgstr "套件無法使用。"
Modified: trunk/yast/zh_TW/po/printer.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/printer.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/printer.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: printer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-01-16 11:46+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -198,7 +198,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:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -215,8 +215,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:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -341,7 +341,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
msgid "Description"
msgstr "描述"
@@ -445,8 +445,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:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
msgid "Nothing Selected"
msgstr "未選取任何項目"
@@ -2817,56 +2817,56 @@
#. Authors: Johannes Meixner <jsmeix(a)suse.de>
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
msgid "Show"
msgstr "顯示"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
msgid "&Local"
msgstr "本地(&L)"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
msgid "&Remote"
msgstr "遠端(&R)"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
msgid "Configuration"
msgstr "組態"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
msgid "Name"
msgstr "名稱"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
msgid "Location"
msgstr "位置"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
msgid "Default"
msgstr "預設"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
msgid "Status"
msgstr "狀態"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
msgid "Re&fresh List"
msgstr "重新整理清單(&F)"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
msgid "Print &Test Page"
msgstr "列印測試頁(&T)"
@@ -2876,7 +2876,7 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
#, fuzzy
msgid ""
"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
@@ -2893,7 +2893,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -2908,7 +2908,7 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
@@ -2917,67 +2917,67 @@
"(這可能會花上一些時間)"
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
msgid "Do no longer use the inaccessible CUPS server '%1'?"
msgstr "確定不再使用無法存取的 CUPS 伺服器 '%1'?"
#. Popup::YesNoHeadline body recommendation how to answer the headline question
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:207
+#: src/include/printer/overview.rb:210
msgid "To proceed, you should agree that '%1' will be no longer used."
msgstr "要繼續進行,您應該同意 '%1' 將不會再被使用。"
#. 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:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
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:253
+#: src/include/printer/overview.rb:256
msgid "CUPS Server %1"
msgstr "CUPS 伺服器 %1"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
msgid "Testing if CUPS server is accessible..."
msgstr "測試列印伺服器是否可存取..."
#. 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:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
msgid "Select an entry."
msgstr "選取項目。"
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
msgid "Cannot Delete"
msgstr "無法刪除"
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr "這是一個遠端設定。只有本地組態設定可被刪除。"
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
msgid "Confirm Deletion"
msgstr "確認刪除"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
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:620
+#: src/include/printer/overview.rb:623
msgid "Delete configuration %1"
msgstr "刪除組態 %1"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
msgid "Do not delete it"
msgstr "請勿刪除它"
@@ -2988,33 +2988,33 @@
#. 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:637
+#: src/include/printer/overview.rb:640
msgid "Confirm Deletion of a Class"
msgstr "確認刪除類別"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
msgid "A deleted class cannot be re-created with this tool."
msgstr "刪除的類別無法再使用此工具重新建立。"
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
msgid "Rejecting Print Jobs"
msgstr "拒絕列印工作"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
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:697
+#: src/include/printer/overview.rb:700
msgid "Printout Disabled"
msgstr "停止列印"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
msgid "The testpage cannot be printed because printout is disabled."
msgstr "測試頁無法列印,因為已停止列印。"
@@ -3023,25 +3023,25 @@
#. 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:728
+#: src/include/printer/overview.rb:731
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:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
msgid "Delete Pending Print Jobs For %1"
msgstr "刪除 %1 等待列印的工作"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
msgid "Delete them before printing testpage"
msgstr "在列印測試頁前刪除它們"
#. 'No' 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:762
msgid "Print testpage after the other jobs"
msgstr "在其他工作之後印出測試頁"
@@ -3049,7 +3049,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:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
msgid "Failed to delete all pending jobs for %1."
msgstr "刪除 %1 的待列印工作失敗。"
@@ -3068,28 +3068,28 @@
#. + (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:799
+#: src/include/printer/overview.rb:802
msgid "Test printout"
msgstr "測試列印"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
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:803
+#: src/include/printer/overview.rb:806
msgid "Single test page"
msgstr "單一測試頁"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
msgid "Two test pages"
msgstr "兩頁測試頁"
#. 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:835
+#: src/include/printer/overview.rb:838
msgid "Failed to print testpage for %1."
msgstr "用 %1 列印測試頁失敗。"
@@ -3097,25 +3097,25 @@
#. 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:852
+#: src/include/printer/overview.rb:855
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:856
+#: src/include/printer/overview.rb:859
msgid "Sent testpage to %1. Printing should start soon."
msgstr "傳送測試頁到 %1。它應該很快就會開始列印。"
#. Popup::AnyQuestion 'Yes' button label
#. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:861
+#: src/include/printer/overview.rb:864
msgid "Testpage printout was successful"
msgstr "測試頁列印成功"
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
msgid "Testpage printing failed"
msgstr "測試頁列印失敗"
@@ -3135,53 +3135,53 @@
#. 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:897
+#: src/include/printer/overview.rb:900
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:925
+#: src/include/printer/overview.rb:928
msgid "Delete all pending jobs"
msgstr "刪除所有等待列印工作"
#. 'No' 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:931
msgid "Do not delete them"
msgstr "請勿刪除它們"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr "若需完整紀錄,請參閱 /var/log/cups/error_log 檔。"
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
msgid "CUPS log information while processing the testpage for %1 (English only)"
msgstr "進行測試列印 %1 時的 CUPS 紀錄資訊 (僅有英文)"
#. 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:1065
+#: src/include/printer/overview.rb:1068
msgid "For CUPS log information, see the /var/log/cups/error_log file."
msgstr "若需 CUPS 紀錄資訊,請參閱 /var/log/cups/error_log 檔。"
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1075
+#: src/include/printer/overview.rb:1078
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:1102
+#: src/include/printer/overview.rb:1105
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr "遠端 CUPS 伺服器設定和新增組態設定衝突。"
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
msgid "Cannot Modify"
msgstr "無法修改"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr "這是遠端設定。只有本地設定可被修改。"
Modified: trunk/yast/zh_TW/po/rdp.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/rdp.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/rdp.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -105,56 +105,56 @@
msgstr "防火牆設定"
#. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
msgid "Write firewall settings"
msgstr "寫入防火牆設定"
#. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
#, fuzzy
msgid "Configure xrdp"
msgstr "稍後設定"
#. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
msgid "Restart the services"
msgstr "重新啟動服務"
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
#, fuzzy
msgid "Stop the services"
msgstr "停止服務"
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
msgid "Saving Remote Administration Configuration"
msgstr "正在儲存遠端管理組態"
#. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
msgid "Writing firewall settings..."
msgstr "正在寫入防火牆設定..."
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
#, fuzzy
msgid "Configuring xrdp..."
msgstr "正在設定硬體..."
#. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
msgid "Restarting the service..."
msgstr "正在重新啟動服務..."
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
#, fuzzy
msgid "Stopping the service..."
msgstr "正在停止服務..."
#. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
msgid "Remote administration is enabled."
msgstr "已啟用遠端管理。"
#. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
msgid "Remote administration is disabled."
msgstr "已停用遠端管理。"
Modified: trunk/yast/zh_TW/po/rear.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/rear.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/rear.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -255,13 +255,13 @@
#: src/include/rear/ui.rb:698
#, fuzzy
-msgid "Analyzing system"
-msgstr "正在分析系統..."
+msgid "Reading rear settings"
+msgstr "正在讀取防火牆設定"
#: src/include/rear/ui.rb:698
#, fuzzy
-msgid "Reading rear settings"
-msgstr "正在讀取防火牆設定"
+msgid "Analyzing system"
+msgstr "正在分析系統..."
#: src/include/rear/ui.rb:699
#, fuzzy
Modified: trunk/yast/zh_TW/po/registration.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/registration.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/registration.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
"PO-Revision-Date: 2011-10-05 22:38+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -21,30 +21,6 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.2\n"
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-#, fuzzy
-msgid "Local Registration Servers"
-msgstr "區域註冊伺服器"
-
-#: 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:68
-#, fuzzy
-msgid "No registration server selected."
-msgstr "使用自訂註冊伺服器"
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-#, fuzzy
-msgid "SUSE Customer Center (%s)"
-msgstr "Novell 客戶中心組態"
-
#. popup message
#. popup message
#. popup message
@@ -62,9 +38,9 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -79,25 +55,25 @@
msgstr ""
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
#, fuzzy
msgid "Registration was successfull."
msgstr "註冊成功。"
#. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
msgid "SLP discovery failed, no server found"
msgstr ""
#. download and install the specified SSL certificate to the system
#. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
#, fuzzy
#| msgid "Downloading SMT certificate file failed"
msgid "Downloading SSL Certificate"
msgstr "下載 SMT 憑證檔案失敗"
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
#, fuzzy
#| msgid "Import Certificate"
msgid "Importing SSL Certificate"
@@ -106,8 +82,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
#, fuzzy
msgid "Registering %s ..."
msgstr "註冊代碼"
@@ -264,30 +240,26 @@
msgid "SHA256 Fingerprint: "
msgstr "指紋: "
-#. Error popup
-#: 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 ""
-
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
#: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
+msgid "Connection time out."
msgstr ""
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
-msgid "Connection time out."
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:91
#, fuzzy
msgid "Check that this system is known to the registration server."
msgstr "目的地無效。"
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:97
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -303,34 +275,34 @@
#. 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: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
+#: 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:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
#, fuzzy
-msgid "Registration failed."
-msgstr "註冊代碼"
+msgid "Connection to registration server failed."
+msgstr "區域註冊伺服器"
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:121
#, fuzzy
msgid "Registration client error."
msgstr "註冊無法進行。"
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:123
msgid ""
"Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:165
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:197
+#: src/lib/registration/connect_helpers.rb:198
#, fuzzy
msgid "Details: %s"
msgstr "詳細資料..."
@@ -338,7 +310,7 @@
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:227
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -348,23 +320,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:240
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:260
+#: src/lib/registration/connect_helpers.rb:261
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:279
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -372,6 +344,24 @@
"protocol is installed at the server."
msgstr ""
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+msgid "Invalid URL."
+msgstr ""
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:296
+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:303
+msgid "Network error, check the network configuration."
+msgstr ""
+
#. progress step title
#: src/lib/registration/finish_dialog.rb:35
#, fuzzy
@@ -379,20 +369,20 @@
msgstr "Novell 客戶中心組態"
#. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
msgid ""
"The base product was not found,\n"
"check your system."
msgstr ""
#. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
msgid ""
"The installation medium or the installer itself is seriously broken.\n"
"Report a bug at %s."
msgstr ""
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
msgid ""
"Make sure a product is installed and /etc/products.d/baseproduct\n"
"is a symlink pointing to the base product .prod file."
@@ -401,7 +391,7 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:272
msgid "Registering the System..."
msgstr ""
@@ -410,8 +400,8 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating /etc/hosts ..."
@@ -419,7 +409,7 @@
msgstr "正在更新 /etc/hosts ..."
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:166
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Synchronizing Products..."
@@ -431,33 +421,33 @@
#. @return [Array<Registration::Addon>] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:180
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
msgid "Loading Available Extensions and Modules..."
msgstr "註冊模組說明"
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:195
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
msgstr "正在載入組態 %1..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:213
#, fuzzy
msgid "Register Extensions and Modules"
msgstr "註冊模組說明"
#. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:217
#, fuzzy
#| msgid "<p>Please wait, while volumes are being detected.</p>"
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr "<p>正在偵測區塊,請稍候。</p>"
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:242
#, fuzzy
msgid ""
"The registration server offers update repositories.\n"
@@ -465,7 +455,7 @@
msgstr "使用自訂註冊伺服器"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:246
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
@@ -479,7 +469,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:250
#, fuzzy
#| msgid "Would you like to enable access to the profile repository?"
msgid ""
@@ -496,7 +486,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -507,41 +497,41 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
#, fuzzy
msgid "Unknown product"
msgstr "未知的錯誤"
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
#, fuzzy
msgid "Saving repository configuration failed."
msgstr "正在開始註冊程序..."
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:474
#, fuzzy
#| msgid "No product found in the repository"
msgid ""
@@ -611,35 +601,39 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
#, fuzzy
msgid "Details"
msgstr "詳細資料..."
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
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
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
msgid "%s (not available)"
msgstr ""
#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
msgid "YaST allows to select at most %s extensions or modules."
msgstr ""
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
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_base_dialog.rb:260
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
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 ""
@@ -657,7 +651,7 @@
msgstr "<p>在此可以查看您系統中定義的電視台清單。</p>"
#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
msgid "Available Extensions and Modules"
msgstr ""
@@ -723,7 +717,7 @@
msgstr "正在下載安裝系統語言擴充..."
#. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete '%s'?"
@@ -731,29 +725,29 @@
#. dialog definition for adding/editing an addon
#. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
#, fuzzy
msgid "Extension or Module &Identifier"
msgstr "註冊模組說明"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "&Version"
msgstr "版本(&V)"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
msgid "&Architecture"
msgstr "架構(&A)"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
#, fuzzy
#| msgid "&Release"
msgid "&Release Type"
msgstr "釋出(&R)"
#. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
#, fuzzy
msgid "Registration &Code"
msgstr "註冊代碼"
@@ -781,10 +775,8 @@
msgid "Register the Product"
msgstr "註冊代碼"
-#. 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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
#, fuzzy
#| msgid "&Email Address:"
msgid "&E-mail Address"
@@ -797,39 +789,39 @@
msgstr "正在初始化可用的套件庫"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
#, fuzzy
msgid "Server Settings"
msgstr "SMT 伺服器設定"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
#, fuzzy
msgid "Find Registration Server Using SLP Discovery"
msgstr "區域註冊伺服器"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
msgid "Use Specific Server URL Instead of the Default"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
#, fuzzy
msgid "Optional SSL Server Certificate URL"
msgstr "伺服器 CA 憑證:"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
#, fuzzy
msgid "Optional SSL Server Certificate Fingerprint"
msgstr "伺服器 CA 憑證:"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
msgid "none"
msgstr "無"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
#, fuzzy
#| msgid "Select Certificate File"
msgid "SSL Certificate Fingerprint"
@@ -837,25 +829,35 @@
#. the UI defition for the main dialog
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
#, fuzzy
msgid "Register Extensions or Modules..."
msgstr "註冊模組說明"
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
#, fuzzy
-msgid "&Local Registration Server..."
+msgid "Register System via %s"
+msgstr "註冊代碼"
+
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#, fuzzy
+msgid "Register System via local SMT Server"
+msgstr "註冊伺服器:"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#, fuzzy
+msgid "&Local Registration Server URL"
msgstr "區域註冊伺服器"
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
#, fuzzy
msgid "&Skip Registration"
msgstr "註冊"
#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
#, fuzzy
msgid "&Register Extensions or Modules Again"
msgstr "註冊模組說明"
@@ -864,52 +866,35 @@
#. @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/base_system_registration_dialog.rb:342
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr ""
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
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?"
+"Customer Center for online registration."
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
#, fuzzy
-msgid "Network Configuration..."
+msgid "Net&work Configuration..."
msgstr "Novell 客戶中心組態"
#. SSL error message
@@ -937,22 +922,22 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: 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>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (2/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (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:131
-msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (4/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (5/5)
@@ -960,17 +945,6 @@
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:67
-msgid "Invalid URL."
-msgstr ""
-
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-#, fuzzy
-msgid "&Local Registration Server URL"
-msgstr "區域註冊伺服器"
-
#. TRANSLATORS: error message, %s are details
#. TRANSLATORS: error message, %s are details
#: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -1005,21 +979,21 @@
msgstr "選擇新的目標架構"
#. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
#, fuzzy
#| msgid "Saving Repositories..."
msgid "Manage Repositories..."
msgstr "正在儲存套件庫..."
#. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
#, 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
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
#, fuzzy
#| msgid "Priority"
msgid "Priority: %s"
@@ -1092,19 +1066,19 @@
msgstr "選擇新的目標架構"
#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
msgid "Manually Adjust the Repositories for Migration"
msgstr ""
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
#, fuzzy
#| msgid "Possible &Solutions"
msgid "Possible Migration Targets"
msgstr "可能的解決方案(&S)"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
#, fuzzy
#| msgid "Configuration Summary"
msgid "Migration Summary"
@@ -1116,14 +1090,14 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:214
+#: 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:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
#, fuzzy
#| msgid "Package %1 will be installed."
msgid "%s <b>will be installed.</b>"
@@ -1131,25 +1105,25 @@
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
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:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
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:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
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:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1201,18 +1175,82 @@
"You can manually register the system from scratch."
msgstr ""
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service] List of services to show.
+#. @param heading [String] Text to be shown as dialog heading. A default text
+#. will be used if it's not specified.
+#. @param description [String] Text to be shown as description. A default text
+#. will be used if it's not specified.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:64
#, fuzzy
+msgid "Local Registration Servers"
+msgstr "區域註冊伺服器"
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:65
+msgid ""
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
+msgstr ""
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:67
+#, fuzzy
+msgid "No registration server selected"
+msgstr "使用自訂註冊伺服器"
+
+#. Default registration server
+#.
+#. return [String] Returns a string representing the default SCC service.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:102
+#, fuzzy
+msgid "SUSE Customer Center (%s)"
+msgstr "Novell 客戶中心組態"
+
+#. @return [Array<Yast::SlpServiceClass::Service>]
+#: src/lib/registration/url_helpers.rb:220
+#, fuzzy
msgid "Searching..."
msgstr "正在檢查..."
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:220
#, fuzzy
msgid "Looking up local registration servers..."
msgstr "使用區域註冊伺服器"
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service>] list of services to show
+#. @param heading [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
#, fuzzy
+msgid "Service selection"
+msgstr "SMT 伺服器設定"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+msgid "No service was selected."
+msgstr "使用自訂註冊伺服器"
+
+#, fuzzy
+#~ msgid "Registration failed."
+#~ msgstr "註冊代碼"
+
+#, fuzzy
+#~ msgid "&Local Registration Server..."
+#~ msgstr "區域註冊伺服器"
+
+#, fuzzy
#~| msgid "Additional Repositories"
#~ msgid "Migration Repositories"
#~ msgstr "額外的安裝來源"
Modified: trunk/yast/zh_TW/po/reipl.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/reipl.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/reipl.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: reipl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2009-09-05 01:05+0800\n"
"Last-Translator: Ray Chen <swyear(a)gmail.com>\n"
"Language-Team: <zh(a)li.org>\n"
@@ -28,11 +28,11 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
msgid ""
"\n"
"After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
msgstr ""
#. TRANSLATORS: part of a shutdown message
@@ -40,7 +40,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -49,7 +49,7 @@
"and LUN '%3'.\n"
msgstr ""
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: trunk/yast/zh_TW/po/samba-client.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/samba-client.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/samba-client.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: samba-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2012-05-22 14:26+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -871,81 +871,81 @@
msgstr "正在安裝必要的套件..."
#. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
msgid "PAM Login"
msgstr "PAM 登入"
#. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
msgid "Use Kerberos"
msgstr "使用 Kerberos"
#. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
msgid "Do Not Use Kerberos"
msgstr "不使用 Kerberos"
#. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
msgid "Default Realm"
msgstr "預設範圍"
#. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
msgid "Default Domain"
msgstr "預設領域"
#. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
msgid "KDC Server Address"
msgstr "KDC 伺服器位址"
#. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
msgid "Clock Skew"
msgstr "時鐘誤差"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
msgid "<b>KDC Server</b>: %1<br>"
msgstr "<b>KDC 伺服器</b>: %1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
#, fuzzy
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<p><b>工作群組或領域</b>:%1</p>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
msgid "<b>Default Realm</b>: %1<br>"
msgstr "<b>預設範圍</b>: %1<br>"
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
#, fuzzy
msgid "<b>Kerberos Authentication Enabled</b>: %1"
msgstr "已啟用離線驗證"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "是"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
msgid "No"
msgstr "無"
#. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
msgid "Configuration Acquired via DNS"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
@@ -954,7 +954,7 @@
"請再試一次。\n"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: trunk/yast/zh_TW/po/samba-server.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/samba-server.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/samba-server.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2012-05-22 14:41+0800\n"
"Last-Translator: Ray Chen <swyear(a)opensuse.org>\n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -249,11 +249,17 @@
#. TRANSLATORS: a popup message
#: src/include/samba-server/complex.rb:88
+#, fuzzy
+#| msgid ""
+#| "Because users are currently connected to this Samba server,\n"
+#| "the server configuration has been reloaded instead of restarted.\n"
+#| "To confirm that all settings are applied despite possibly disconnecting the users,\n"
+#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgid ""
"Because users are currently connected to this Samba server,\n"
"the server configuration has been reloaded instead of restarted.\n"
"To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
msgstr ""
"因為目前有使用者連線到此 Samba 伺服器,\n"
"所以已重新載入伺服器組態,而非重新啟動。\n"
Modified: trunk/yast/zh_TW/po/security.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/security.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/security.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: security\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2011-10-06 21:02+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <zh(a)li.org>\n"
@@ -121,205 +121,205 @@
#. Authors: Michal Svec <msvec(a)suse.cz>
#.
#. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
msgid "Unknown"
msgstr "不明"
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
msgid "Use magic SysRq keys"
msgstr "使用魔術 SysRq 金鑰"
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
msgid "Use secure file permissions"
msgstr "使用安全檔案授權"
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
msgid "Remote access to the display manager"
msgstr "顯示管理員的遠端存取"
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
msgid "Write back system time to the hardware clock"
msgstr "寫回系統時間到硬體時鐘"
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
msgid "Always generate syslog message for cron scripts"
msgstr ""
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
msgid "Run the DHCP daemon in a chroot"
msgstr "在 chroot 中執行 DHCP 精靈"
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
msgid "Run the DHCP daemon as dhcp user"
msgstr "以 dhcp 使用者執行 DHCP 精靈"
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
msgid "Remote root login in the display manager"
msgstr "顯示管理員的遠端 root 登入"
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
msgid "Remote access to the X server"
msgstr "X 伺服器的遠端存取"
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
msgid "Remote access to the email delivery subsystem"
msgstr "電子郵件傳遞子系統的遠端存取"
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
msgid "Restart services on update"
msgstr "更新時重新啟動服務"
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
msgid "Stop services on removal"
msgstr "移除時關閉服務"
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
#, fuzzy
msgid "Enable TCP syncookies"
msgstr "啟用密碼規則"
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
msgid "IPv4 forwarding"
msgstr "IPv4 轉遞"
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
msgid "IPv6 forwarding"
msgstr "IPv6 轉遞"
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
#, fuzzy
#| msgid "Enable the service"
msgid "Enable basic system services"
msgstr "啟用服務"
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
#, fuzzy
#| msgid "Disable the service"
msgid "Disable extra services"
msgstr "服務服務"
#. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
msgid "Configure"
msgstr "設定組態"
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
msgid "Enabled"
msgstr "啟用"
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
msgid "Disabled"
msgstr "已停用"
#. table header
#. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
msgid "Security Setting"
msgstr "安全性設定"
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
msgid "Status"
msgstr "狀態"
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
msgid "Security Status"
msgstr "安全性狀態"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
msgid "Help"
msgstr "說明"
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
msgid " or "
msgstr " 或 "
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
#, 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 "<P>這些基本系統服務未啟用在 runlevel %1:<BR><B>%2</B></P>"
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
msgid "<P>All basic services are enabled.</P>"
msgstr "<P>所有基本系統服務已啟用。</P>"
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
#, 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 "<P>這些額外服務已啟用在 runlevel %1:<BR><B>%2</B></P>"
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr "<P>檢查服務清單並停用所有未使用的服務。</P>"
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
msgid "<P>Only basic system services are enabled.</P>"
msgstr "<P>僅基本系統服務啟用。</P>"
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
msgid "Description"
msgstr "描述"
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
msgid "Security Overview"
msgstr "安全性總覽"
#. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
msgid "Change &Status"
msgstr "變更狀態(&S)"
#. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
msgid "&Description"
msgstr "描述(&D)"
#. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
#, fuzzy
#| msgid "Analyzing the system..."
msgid "Analyzing system"
msgstr "正在分析系統..."
#. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr "開機設定"
#. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
msgid "Boot Permissions"
msgstr "開機許可權"
#. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
msgid "Miscellaneous Settings"
msgstr "其他設定"
#. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
msgid "Password Settings"
msgstr "密碼設定"
#. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
msgid "Checks"
msgstr "檢查"
#. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
msgid "Password Age"
msgstr "密碼壽命"
#. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
@@ -328,7 +328,7 @@
"超過最大值。"
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
@@ -337,17 +337,17 @@
"所選加密方法的密碼最大長度為 %1。"
#. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr "登入設定"
#. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
msgid "Login"
msgstr "登入"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -356,7 +356,7 @@
"<br>請稍候...<br></p>"
#. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -365,7 +365,7 @@
"要安全地中止組態公用程式,請按<b>「中止」</b>。</p>"
#. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -374,7 +374,7 @@
"<br>請稍候...<br></p>"
#. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.</p>"
@@ -382,51 +382,9 @@
"<p><b><big>正在中止儲存</big></b><br>\n"
"要中止儲存程序,請按<b>「中止」</b>。</p>"
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>開機安全性</B></BIG><BR>\n"
-"可以在這個對話方塊變更與安全性有關的開機設定。</P>"
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
#: src/include/security/helps.rb:59
msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-"<p><b>Ctrl + Alt + Del 的意義</b>:\n"
-"設定系統應如何回應\n"
-"在主控台按下 CTRL + ALT + DEL 組合鍵時的回應。通常為系統重新開機。有時會希望\n"
-"忽略這個事件。例如,當系統同時作為工作站\n"
-"和伺服器時。</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>\n"
-msgstr ""
-"<p><b>登入管理員的關機行為</b>:\n"
-"設定誰可以從 KDM 關機。</p>\n"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-msgid ""
"<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
"<p>Using predefined defaults, change the local security settings, which include\n"
" booting, login, password, user creation, and file permissions. The default\n"
@@ -440,7 +398,7 @@
"</p>"
#. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
#, fuzzy
#| msgid ""
#| "<p><b>Networked Workstation</b>: For a computer connected\n"
@@ -453,14 +411,14 @@
"任何類型的電腦。</p>"
#. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
msgid ""
"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
"that connects to different networks.</p>"
msgstr ""
#. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
@@ -469,12 +427,12 @@
"的電腦。</p>"
#. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr "<p><b>「自訂設定」</b>來建立您自己的組態。</p>"
#. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -485,7 +443,7 @@
"主要儲存在 /etc/login.defs 檔案。</p>"
#. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
msgid ""
"<p><b>Delay after Incorrect Login Attempt:</b>\n"
"It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -498,7 +456,7 @@
" 合理的值為 3 秒鐘 (<tt>3</tt>)。</p>"
#. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
#, fuzzy
msgid ""
"<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
@@ -512,7 +470,7 @@
"</p>"
#. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
msgid ""
"<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
"to a graphical login screen for this machine over the network. Remote access\n"
@@ -523,14 +481,14 @@
",遠端存取您的機器,可能有安全上的顧慮。</p>"
#. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
msgstr "<p>這些密碼設定主要儲存在 /etc/login.defs 檔。</p>"
#. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
msgid ""
"<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
"cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -541,7 +499,7 @@
"核取這個方塊,可根據這些規則強制檢查您的密碼。</p>"
#. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
"The minimum acceptable size for the new password reduced by the number\n"
@@ -556,7 +514,7 @@
"只有在<b>檢查新密碼</b>被設定時,此選項可被修改。</p>"
#. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -567,12 +525,12 @@
" 如果不應該儲存密碼,請輸入 0。</p>"
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
msgid "<p><b>Password Encryption Method:</b></p>"
msgstr "<p><b>密碼加密方法:</b></p>"
#. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
msgid ""
"<p><b>DES</b>, the Linux default method, works in all network environments,\n"
"but it restricts you to passwords no longer than eight characters. If you need\n"
@@ -583,7 +541,7 @@
"與其他系統相容,請使用此方法。</p>"
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
msgid ""
"<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
"distributions, but not by other systems or old software.</p>"
@@ -593,12 +551,12 @@
"</p>"
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
msgstr "<p><b>SHA-512</b> 是目前的標準 hash 方式,除非您為了相容的目的,否則 不建議使用其他演算法。</p>"
#. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
@@ -607,7 +565,7 @@
"最長可使用的天數。</p>"
#. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
msgid ""
"<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
"number of days users are warned before their passwords expire. The longer the\n"
@@ -618,7 +576,7 @@
"長,密碼被猜中的機率愈小。</p>"
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
@@ -627,7 +585,7 @@
"可以在這個對話方塊變更建立使用者時使用的設定。</P>"
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
@@ -636,7 +594,7 @@
"設定使用者 ID 長度的最小和最大值。"
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
@@ -645,7 +603,7 @@
"設定群組 ID 長度的最小和最大值。"
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
@@ -654,7 +612,7 @@
"可以在這個對話方塊變更與本機安全性相關的雜項設定。</P>"
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
msgid ""
"<p><b>File Permissions</b>: Settings for the permissions\n"
"of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -685,7 +643,7 @@
"您必須決定哪些使用者可以執行 X 應用程式及 setuid 程式。</p>\n"
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
msgid ""
"<p><b>User Launching updatedb</b>: The program updatedb runs \n"
"once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -700,7 +658,7 @@
" (很少的檔案) 或 <b>Root</b> (所有) 。</p>"
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
msgid ""
"<p><b>Current Directory in root's Path</b> On a DOS system,\n"
"the system first searches for executable files (programs) in the current\n"
@@ -713,7 +671,7 @@
"透過搜尋路徑 (變數 PATH) 專門搜尋路徑。</p>"
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
msgid ""
"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
"system first searches for executable files (programs) in the current directory\n"
@@ -725,7 +683,7 @@
"然後才在目前的路徑變數中搜尋。相反的,像 UNIX 型系統則會完全透過搜尋路徑 (變數 PATH) 進行搜尋。</p>"
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
msgid ""
"<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
"search path, enabling files in the current path to be found and executed.\n"
@@ -742,7 +700,7 @@
"暴露系統的弱點並侵入您的系統。</p>"
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
msgid ""
"<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
"path of root, making it the last to be searched.</p>"
@@ -751,7 +709,7 @@
"讓它最後可被搜尋。</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
@@ -760,7 +718,7 @@
"啟動程式。範例:\"./configure\"。</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
msgid ""
"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
"will have some control over the system even if it crashes (for example, during kernel\n"
@@ -771,30 +729,30 @@
"除錯) 。如需詳細資訊,請參閱 /usr/src/linux/Documentation/sysrq.txt</p>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
#, fuzzy
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr "<P><B>安全性總覽</B><BR>這是最重要的安全性設定 的總覽。</P>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
#, fuzzy
msgid "<P>To change the current value, click the link associated to the option.</P>"
msgstr "<P>要變更目前的值,按選項旁邊的連結。</P>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
#, fuzzy
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr "<P>核取標記在 <B>安全性狀態</B> 欄位表示目前此選項的值 是安全的。</P>"
#. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
#, fuzzy
msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
msgstr "<P><B>目前的值無法被讀取。所需的服務可能 尚未安裝或系統中遺失此選項。</B></P>"
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
msgid ""
"<P>A display manager provides a graphical login screen and can be accessed\n"
"across the network by an X server running on another system if so\n"
@@ -806,7 +764,7 @@
"logins, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
msgid ""
"<P>Upon startup, the system time is being set from the hardware clock of the\n"
"computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -814,23 +772,23 @@
"correct log messages.</P>"
msgstr ""
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
msgstr ""
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
msgstr ""
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
msgstr ""
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
msgstr ""
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
msgid ""
"<P>X Window clients, e.g. programs that open a window on your display, connect\n"
"to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -842,13 +800,13 @@
"Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>"
msgstr ""
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
msgid ""
"<P>The email delivery subsystem is always started. However, it does not expose\n"
"itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"updated, the service is restarted after the files in the package have been\n"
@@ -860,7 +818,7 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"uninstalled, the service is stopped before the files of the package are\n"
@@ -872,23 +830,23 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
msgstr ""
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr "<P>此設定僅適用 <EM>IPv4</EM>。</P>"
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr "<P>此設定僅適用 <EM>IPv6</EM>。</P>"
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
#, fuzzy
msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
msgstr ""
@@ -896,19 +854,114 @@
"將會擁有系統的部分控制權,即使系統損毀 (例如,核心\n"
"除錯期間)。如需詳細資訊,請參閱 <i>/usr/src/linux/Documentation/sysrq.txt</i></p>"
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
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:330
#, fuzzy
msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>"
msgstr "<P>基本系統服務必須啟用已提供系統的穩定性以及 執行相關安全性服務。</P>"
-#: src/include/security/helps.rb:352
+#: src/include/security/helps.rb:333
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 "<P>每個執行中的服務都是一個潛在安全攻擊的目標。 因此我們建議所有系統中不用的服務 都要關閉。</P>"
+#: src/include/security/helps.rb:341
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>開機安全性</B></BIG><BR>\n"
+"可以在這個對話方塊變更與安全性有關的開機設定。</P>"
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Ctrl + Alt + Del 的意義</b>:\n"
+"設定系統應如何回應\n"
+"在主控台按下 CTRL + ALT + DEL 組合鍵時的回應。通常為系統重新開機。有時會希望\n"
+"忽略這個事件。例如,當系統同時作為工作站\n"
+"和伺服器時。</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Ctrl + Alt + Del 的意義</b>:\n"
+"設定系統應如何回應\n"
+"在主控台按下 CTRL + ALT + DEL 組合鍵時的回應。通常為系統重新開機。有時會希望\n"
+"忽略這個事件。例如,當系統同時作為工作站\n"
+"和伺服器時。</p>"
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+"<p><b>Ctrl + Alt + Del 的意義</b>:\n"
+"設定系統應如何回應\n"
+"在主控台按下 CTRL + ALT + DEL 組合鍵時的回應。通常為系統重新開機。有時會希望\n"
+"忽略這個事件。例如,當系統同時作為工作站\n"
+"和伺服器時。</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+#, fuzzy
+#| msgid ""
+#| "<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+#| "Set who is allowed to shut down the machine from KDM.</p>\n"
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+"<p><b>登入管理員的關機行為</b>:\n"
+"設定誰可以從 KDM 關機。</p>\n"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+
#. level name
#: src/include/security/levels.rb:54
#, fuzzy
@@ -976,166 +1029,241 @@
"最小使用者 ID 不能超過\n"
"最大值。"
-#. ComboBox label
-#: src/include/security/widgets.rb:100
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "Ctrl + Alt + Del 的意義(&I)"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
+#. 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: include/security/widgets.ycp
+#. * Module: Security configuration
+#. * Summary: Security widgets definitions
+#. * Authors: Michal Svec <msvec(a)suse.cz>
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
msgid "Ignore"
msgstr "忽略"
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
msgid "Reboot"
msgstr "重新開機"
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
msgid "Halt"
msgstr "暫停"
+#: src/include/security/widgets.rb:93
+msgid "Only root"
+msgstr "僅根"
+
+#: src/include/security/widgets.rb:94
+msgid "All Users"
+msgstr "所有使用者"
+
+#: src/include/security/widgets.rb:95
+msgid "Nobody"
+msgstr "無人"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "Ctrl + Alt + Del 的意義(&I)"
+
#. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
msgid "Allow Remote &Graphical Login"
msgstr "允許遠端圖形登入(&G)"
#. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
#, fuzzy
msgid "&Magic SysRq Keys"
msgstr "啟用魔術 SysRq 金鑰(&M)"
#. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
msgid "Disable"
msgstr "關閉"
#. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
msgid "Enable All Functions"
msgstr "啟用所有功能"
#. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
msgid "&Delay after Incorrect Login Attempt"
msgstr "不正確登入次數後的延遲(&D)"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
msgid "Maxim&um"
msgstr "最大(&U)"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
msgid "M&inimum"
msgstr "最小(&I)"
#. ComboBox label
-#: src/include/security/widgets.rb:154
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "KDM 登入管理員的關機行為(&S):"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-msgid "Only root"
-msgstr "僅根"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-msgid "All Users"
-msgstr "所有使用者"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-msgid "Nobody"
-msgstr "無人"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
+#: src/include/security/widgets.rb:164
#, fuzzy
msgid "System Hybernation"
msgstr "系統資訊"
#. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
#, fuzzy
msgid "User on the active console"
msgstr "讀取作用中的設定檔"
#. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
msgid "Anyone can hibernate"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
msgid "Authentication always required"
msgstr "永遠需要驗證"
#. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
msgid "P&assword Encryption Method"
msgstr "密碼加密方法(&A)"
#. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
msgid "&Check New Passwords"
msgstr "檢查新密碼(&C)"
#. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
msgid "Numb&er of Passwords to Remember"
msgstr "要記住的密碼數字(&E)"
#. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
msgid "&Minimum Acceptable Password Length"
msgstr "可接受的最短密碼長度(&M)"
#. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
msgid "&Days before Password Expires Warning"
msgstr "密碼過期前發出警告的天數(&D)"
#. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
msgid "&File Permissions"
msgstr "檔案許可權(&F)"
#. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
msgid "Easy"
msgstr "簡易"
#. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
msgid "Secure"
msgstr "安全"
#. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
msgid "Paranoid"
msgstr "積極保護安全"
#. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
msgid "&User Launching updatedb"
msgstr "使用者啟動 updatedb(&U)"
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
msgid "Ma&ximum"
msgstr "最大(&X)"
#. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
msgid "&Minimum"
msgstr "最小值(&M)"
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+#| msgid "&Shutdown Behaviour of KDM Login Manager:"
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "KDM 登入管理員的關機行為(&S):"
+
#: src/include/security/wizards.rb:53
msgid "Predefined Security Configurations"
msgstr "預先定義的安全性組態"
@@ -1151,64 +1279,64 @@
msgstr "正在啟始化..."
#. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
msgid "Saving Security Configuration"
msgstr "正在儲存安全性組態"
#. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
msgid "Write security settings"
msgstr "寫入安全性設定"
#. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
msgid "Write inittab settings"
msgstr "寫入 inittab 設定"
#. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
msgid "Write PAM settings"
msgstr "寫入 PAM 設定"
#. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
#, fuzzy
msgid "Update system settings"
msgstr "儲存系統設定"
#. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
msgid "Writing security settings..."
msgstr "正在寫入安全性設定..."
#. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
msgid "Writing inittab settings..."
msgstr "正在寫入 inittab 設定..."
#. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
msgid "Writing PAM settings..."
msgstr "正在寫入 PAM 設定..."
#. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
#, fuzzy
msgid "Updating system settings..."
msgstr "正在儲存系統設定..."
#. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
msgid "Finished"
msgstr "已完成"
#. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
msgid "Current Security Level: Custom settings"
msgstr "目前的安全性層級:自訂設定"
#. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
msgid "Current Security Level: %1"
msgstr "目前的安全性層級: %1"
Modified: trunk/yast/zh_TW/po/services-manager.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/services-manager.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/services-manager.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -298,13 +298,13 @@
#. 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
+#: src/modules/services_manager_service.rb:415
#, fuzzy
#| msgid "%1: Could not change state of the device"
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr "%1:無法變更設備的狀態"
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
#, fuzzy
#| msgid "%1: Could not change state of the device"
msgid "Could not %{change} %{service}. "
Modified: trunk/yast/zh_TW/po/snapper.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/snapper.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/snapper.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2011-10-14 13:58+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -50,74 +50,74 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
msgid "Description"
msgstr "描述"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
#, fuzzy
msgid "User data"
msgstr "使用者名稱"
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
#, fuzzy
msgid "Cleanup algorithm"
msgstr "清除程序檔(&L)"
#. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
+#: src/include/snapper/dialogs.rb:161
#, fuzzy
msgid "Modify Snapshot %{num}"
msgstr "修改 %1"
#. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
+#: src/include/snapper/dialogs.rb:167
#, fuzzy
msgid "Modify Snapshot %{pre} and %{post}"
msgstr "修改 %1"
#. label
-#: src/include/snapper/dialogs.rb:161
+#: src/include/snapper/dialogs.rb:169
#, fuzzy
msgid "Pre (%{pre})"
msgstr "PReP (%1)"
#. label
-#: src/include/snapper/dialogs.rb:165
+#: src/include/snapper/dialogs.rb:173
#, fuzzy
msgid "Post (%{post})"
msgstr "主機 %1"
#. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:250
#, fuzzy
msgid "Create New Snapshot"
msgstr "建立新的 "
#. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:263
#, fuzzy
msgid "Single snapshot"
msgstr "快照"
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
msgid "Pre"
msgstr "預先"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:282
msgid "Post, paired with:"
msgstr ""
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:358
#, fuzzy
msgid "Really delete snapshot %{num}?"
msgstr ""
@@ -125,7 +125,7 @@
"刪除共用 '%1'?"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
+#: src/include/snapper/dialogs.rb:365
#, fuzzy
msgid "Really delete snapshots %{pre} and %{post}?"
msgstr ""
@@ -133,200 +133,200 @@
"刪除共用 '%1'?"
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:380
msgid "Snapshots"
msgstr "快照"
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:409
msgid "Single"
msgstr "單一"
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:434
msgid "Pre & Post"
msgstr "之前和之後"
#. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:469
msgid "Reading list of snapshots..."
msgstr "正在讀取快照清單..."
#. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:485
msgid "Current Configuration"
msgstr "目前組態"
#. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:496
msgid "ID"
msgstr "ID"
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:497
msgid "Type"
msgstr "類型"
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:498
msgid "Start Date"
msgstr "開始日期"
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:499
msgid "End Date"
msgstr "結束日期"
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:501
msgid "User Data"
msgstr "使用者資料"
#. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:507
msgid "Show Changes"
msgstr "顯示變更"
#. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:510
#, fuzzy
msgid "Modify"
msgstr "修改(&M)"
#. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:553
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:634
+#: src/include/snapper/dialogs.rb:638
msgid "Selected Snapshot Overview"
msgstr "選取的快照概觀"
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:670
msgid "%1: %2"
msgstr "%1:%2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:689
msgid "Calculating changed files..."
msgstr "正在計算變更的檔案..."
#. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:699
msgid "Calculating file modifications..."
msgstr "正在計算檔案修改..."
#. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:707
msgid "New file was created."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:711
#, fuzzy
msgid "File was removed."
msgstr "音效卡已移除"
#. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:716
msgid "File content was not changed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:722
#, fuzzy
msgid "File does not exist in either snapshot."
msgstr "%1 不存在於快照 %2\n"
#. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:728
#, fuzzy
msgid "File content was modified."
msgstr "尚未變更任何項目。"
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:738
msgid "File mode was changed from '%1' to '%2'."
msgstr "檔案模式已從 '%1' 變更到 '%2'。"
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:753
msgid "File user ownership was changed from '%1' to '%2'."
msgstr "檔案使用者擁有權已由 '%1' 變更到 '%2'。"
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:769
msgid "File group ownership was changed from '%1' to '%2'."
msgstr "檔案群組擁有權已由 '%1' 變更到 '%2'。"
#. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:786
#, fuzzy
msgid "R&estore from First"
msgstr "由第一個還原(&E)"
#. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:788
msgid "Restore"
msgstr "還原"
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:811
#, fuzzy
msgid "Res&tore from Second"
msgstr "由第二個還原(&T)"
#. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:848
msgid "Show the difference between snapshot and current system"
msgstr "顯示快照和目前系統的差別"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:860
msgid "Show the difference between current and selected snapshot:"
msgstr "顯示目前系統和所選取快照間的差別"
#. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:907
msgid "Show the difference between first and second snapshot"
msgstr "顯示第一個和第二個快照間的差別"
#. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:918
msgid "Show the difference between first snapshot and current system"
msgstr "顯示第一個快照和目前系統間的差別"
#. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:929
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:954
+#: src/include/snapper/dialogs.rb:958
msgid "Time of taking the snapshot:"
msgstr "建立快照的時間:"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:966
msgid "Time of taking the first snapshot:"
msgstr "建立第一個快照的時間:"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:971
msgid "Time of taking the second snapshot:"
msgstr "建立第二個快照的時間:"
#. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:994
msgid "&Open"
msgstr "開啟(&O)"
#. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1040
msgid "Restore Selected"
msgstr "還原所選定的"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1125
#, fuzzy
msgid ""
"Do you want to delete the file\n"
@@ -338,7 +338,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:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
#, fuzzy
msgid ""
"Do you want to copy the file\n"
@@ -349,19 +349,19 @@
msgstr "您確定要套用模組'%1'設定到您現在的系統嗎?"
#. popup message
-#: src/include/snapper/dialogs.rb:1187
+#: src/include/snapper/dialogs.rb:1191
#, fuzzy
#| msgid "No file was selected for restoring"
msgid "No file was selected for restoring."
msgstr "沒有選取要還原的檔案"
#. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1201
msgid "Restoring files"
msgstr "正在還原檔案"
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1204
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
Modified: trunk/yast/zh_TW/po/storage.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/storage.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/storage.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2008-05-25 09:38+0800\n"
"Last-Translator: swyear <swyear(a)gmail.com>\n"
"Language-Team: Chinese Traditional <zh(a)li.org>\n"
@@ -99,8 +99,7 @@
msgstr "建立分割區設定...(&C)"
#. popup text
-#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -182,7 +181,12 @@
msgid "Not enough space available to propose separate /home."
msgstr ""
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
+#, fuzzy
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr "正在複製根檔案系統..."
+
+#: src/clients/inst_disk_proposal.rb:304
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -979,7 +983,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6272
msgid "Propose Separate &Home Partition"
msgstr "建議個別主分割區(&H)"
@@ -998,7 +1002,7 @@
msgstr "建議類型"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
#, fuzzy
msgid ""
"You have not assigned a root partition for\n"
@@ -1012,7 +1016,7 @@
"請指派根裝載點 \"/\" 給分割區。\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
#, fuzzy
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
@@ -1026,7 +1030,7 @@
"這些裝載點應使用 Linux 檔案系統,如 ext2 或 reiserfs。\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
#, fuzzy
msgid ""
"You tried to mount a FAT partition to the\n"
@@ -1039,7 +1043,7 @@
"請對此裝載點使用 Linux 檔案系統,例如 ext2 , ext3 或 reiserfs。\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
#, fuzzy
msgid ""
"You have mounted a partition with Btrfs to the\n"
@@ -1053,7 +1057,7 @@
#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1063,7 +1067,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
#, fuzzy
msgid ""
"Warning:\n"
@@ -1085,7 +1089,7 @@
"要變更嗎?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
#, fuzzy
msgid ""
"Warning:\n"
@@ -1101,7 +1105,7 @@
"要如此做嗎?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1113,7 +1117,7 @@
#. 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:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
#, fuzzy
msgid ""
"Warning: There is no partition mounted as /boot.\n"
@@ -1132,7 +1136,7 @@
"要變更您的設定嗎?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
#, fuzzy
msgid ""
"Warning: According to your setup, you intend to\n"
@@ -1153,11 +1157,11 @@
"\n"
"要變更嗎?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
"Really use this setup?\n"
msgstr ""
@@ -1314,7 +1318,7 @@
"要變更您的設定嗎?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1323,7 +1327,7 @@
"編輯設備前,請先從 RAID 移除該設備。\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1332,7 +1336,7 @@
"編輯設備前,請先從卷冊群組移除該設備。\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1341,7 +1345,7 @@
"編輯設備前,請先移除該卷冊。\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1350,7 +1354,7 @@
"刪除設備前,請先從 RAID 移除該設備。\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1358,13 +1362,13 @@
"設備 (%2) 為 %1 使用。\n"
"刪除設備前,請先移除 %1。\n"
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
#, fuzzy
msgid "It cannot be deleted while mounted."
msgstr "無法刪除所選的綱要。"
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
#, fuzzy
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
@@ -1375,7 +1379,7 @@
"邏輯分割區正在使用中。\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
#, fuzzy
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
@@ -1389,7 +1393,7 @@
"除非您有執行的把握,否則請選擇「取消」。\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1404,7 +1408,7 @@
"再刪除延伸分割區。\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1419,7 +1423,7 @@
"再刪除延伸分割區。\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1439,14 +1443,14 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6400
#, fuzzy
msgid "Do not forget what you enter here!"
msgstr "請不要忘記您在此處輸入的密碼。"
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
#, fuzzy
msgid "Empty password allowed."
msgstr "不允許空的密碼。"
@@ -1478,7 +1482,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
#, fuzzy
msgid "&Enter a Password for your File System:"
msgstr "為您的檔案系統輸入密碼(&E):"
@@ -1490,7 +1494,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:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
#, fuzzy
msgid "Reenter the Password for &Verification:"
msgstr "重新輸入密碼以進行確認(&V):"
@@ -1515,7 +1519,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1526,7 +1530,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1905,7 +1909,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6253
msgid "Enable Snapshots"
msgstr ""
@@ -1922,18 +1926,18 @@
msgid "Empty subvolume name not allowed."
msgstr "不允許空的密碼。"
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
#, fuzzy
msgid "Subvolume name %1 already exists."
msgstr "區域名稱 %1 已經存在。"
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -1976,7 +1980,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
#, fuzzy
msgid ""
"<p>\n"
@@ -1996,7 +2000,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -2015,7 +2019,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2047,7 +2051,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2254,7 +2258,7 @@
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
#, fuzzy
msgid ""
"\n"
@@ -2279,12 +2283,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2292,33 +2296,33 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
#, fuzzy
msgid "Unmount"
msgstr "裝載"
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
#, fuzzy
msgid "It is not possible to shrink the file system while it is mounted."
msgstr ""
"無法調整分割區 %1 的大小,\n"
"因為無法裝載檔案系統\n"
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
#, fuzzy
msgid "It is not possible to extend the file system while it is mounted."
msgstr ""
"無法調整分割區 %1 的大小,\n"
"因為無法裝載檔案系統\n"
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
#, fuzzy
msgid "It is not possible to resize the file system while it is mounted."
msgstr ""
@@ -2622,11 +2626,9 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:40
-#: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61
-#: src/include/partitioning/ep-loop.rb:37
-#: src/include/partitioning/ep-lvm.rb:64
-#: src/include/partitioning/ep-raid.rb:38
+#: src/include/partitioning/ep-btrfs.rb:40 src/include/partitioning/ep-dm.rb:36
+#: src/include/partitioning/ep-hd.rb:61 src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38
msgid "Edit"
msgstr "編輯"
@@ -2657,9 +2659,8 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:45
-#: src/include/partitioning/ep-hd.rb:43 src/include/partitioning/ep-hd.rb:64
-#: src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-btrfs.rb:45 src/include/partitioning/ep-hd.rb:43
+#: src/include/partitioning/ep-hd.rb:64 src/include/partitioning/ep-loop.rb:37
#: src/include/partitioning/ep-lvm.rb:44 src/include/partitioning/ep-lvm.rb:66
#: src/include/partitioning/ep-raid.rb:40
#: src/include/partitioning/ep-tmpfs.rb:36
@@ -2682,8 +2683,7 @@
#: src/include/partitioning/ep-btrfs.rb:140
#: src/include/partitioning/ep-btrfs.rb:205
#: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86
-#: src/include/partitioning/ep-loop.rb:54
-#: src/include/partitioning/ep-lvm.rb:86
+#: src/include/partitioning/ep-loop.rb:54 src/include/partitioning/ep-lvm.rb:86
#: src/include/partitioning/ep-raid.rb:59
msgid "Edit..."
msgstr "編輯..."
@@ -2700,8 +2700,7 @@
#. push button text
#: src/include/partitioning/ep-btrfs.rb:145
#: src/include/partitioning/ep-hd.rb:92 src/include/partitioning/ep-loop.rb:56
-#: src/include/partitioning/ep-lvm.rb:90
-#: src/include/partitioning/ep-raid.rb:63
+#: src/include/partitioning/ep-lvm.rb:90 src/include/partitioning/ep-raid.rb:63
#: src/include/partitioning/ep-tmpfs.rb:112
#: src/include/partitioning/ep-tmpfs.rb:170
#, fuzzy
@@ -2773,36 +2772,42 @@
"</p>"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
+#, fuzzy
+msgid "EFI Boot Partition"
+msgstr "分割區的大小。"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
msgid "Operating System"
msgstr "作業系統"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
#, fuzzy
#| msgid "Delta RPM Application Progress"
msgid "Data and ISV Applications"
msgstr "Delta RPM 應用程式進度"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
msgid "Swap"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
msgid "Raw Volume (unformatted)"
msgstr ""
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
#, fuzzy
#| msgid "Role: %s"
msgid "Role"
msgstr "角色:%s"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
#, fuzzy
msgid ""
"<p>First, choose whether the partition should be\n"
@@ -2810,7 +2815,7 @@
msgstr "<p>首先,選擇分割區類型以及是否格式化此分割區。</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2818,7 +2823,7 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
#, fuzzy
msgid ""
"<p>Then, choose whether the partition should\n"
@@ -2826,55 +2831,55 @@
msgstr "<p>接著,輸入裝載點 ( /、/boot、/usr、/var 等)。</p>"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
#, fuzzy
msgid "Formatting Options"
msgstr "記錄選項"
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
#, fuzzy
msgid "Format partition"
msgstr "分割區的大小。"
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
#, fuzzy
msgid "Do not format partition"
msgstr "不要格式化(&N)"
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
#, fuzzy
msgid "Do not mount partition"
msgstr "要分割的磁碟"
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
#, fuzzy
msgid "Mounting Options"
msgstr "裝載選項"
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
#, fuzzy
msgid "Mount partition"
msgstr "正在裝載所有分割區..."
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "裝載點"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
#, fuzzy
msgid "Fs&tab Options..."
msgstr "Fstab 選項(&T)"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
#, fuzzy
msgid "Crypt files must be encrypted."
msgstr "沒有選取規劃。"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
#, fuzzy
msgid ""
"You chose to create the crypt file, but did not specify\n"
@@ -2888,19 +2893,19 @@
"您也要選取格式化選項。\n"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
#, fuzzy
msgid "Crypt files require a mount point."
msgstr "請提供裝載點。"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
#, fuzzy
msgid "Tmpfs requires a mount point."
msgstr "請提供裝載點。"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
#, fuzzy
msgid ""
"<p>\n"
@@ -2916,7 +2921,7 @@
" </p>\n"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2925,22 +2930,22 @@
"</p>\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
#, fuzzy
msgid "All data stored on the volume will be lost!"
msgstr "會遺失所有變更!"
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
msgid "Password"
msgstr "密碼"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
msgid "Resize not supported by underlying device."
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -2950,7 +2955,7 @@
"您無法重新調整選取分割區的大小,因為該分割區的檔案系統\n"
"不支援調整大小。\n"
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
#, fuzzy
msgid ""
"It is not possible to check whether a NTFS\n"
@@ -2958,7 +2963,7 @@
msgstr "無法在 %1 建立分割區。"
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
#, fuzzy
msgid ""
"Partition %1 cannot be resized\n"
@@ -2968,24 +2973,24 @@
"故無法調整分割區 %1 的大小。\n"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
#, fuzzy
msgid "Resize Partition %1"
msgstr "調整分割區的大小(&E)"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
#, fuzzy
msgid "Resize Logical Volume %1"
msgstr "調整邏輯卷冊的大小"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
#, fuzzy
msgid "Current size: %1"
msgstr "目前時區: %1"
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
#, fuzzy
msgid "Currently used: %1"
msgstr ""
@@ -2996,8 +3001,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -3009,7 +3014,7 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
#, fuzzy
@@ -3017,14 +3022,14 @@
msgstr "最大大小 (MB)(&S)"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
#, fuzzy
msgid "Minimum Size (%1)"
msgstr "最大大小 (MB)(&S)"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
#, fuzzy
@@ -3032,7 +3037,7 @@
msgstr "自訂大小(&S)"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
#, fuzzy
msgid "<p>Choose new size.</p>"
msgstr ""
@@ -3042,7 +3047,7 @@
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
#, fuzzy
@@ -3055,7 +3060,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -3064,13 +3069,13 @@
msgstr ""
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
#, fuzzy
msgid "Output of %1"
msgstr "\t輸出目錄: %1"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
#, fuzzy
msgid "Rescanning disks..."
msgstr "讀取磁碟分割區..."
@@ -3286,62 +3291,62 @@
msgstr "輸入的 WWPN 無效。"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
#, fuzzy
msgid "Add Partition on %1"
msgstr "編輯分割區 %1"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
msgid "Edit Partition %1"
msgstr "編輯分割區 %1"
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
#, fuzzy
msgid "No space to moved partition %1."
msgstr "延伸分割區中無剩餘空間。"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
#, fuzzy
msgid "Move partition %1 forward?"
msgstr "新增分割區 %1 為交換分割區"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
msgid "Move partition %1 backward?"
msgstr ""
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
#, fuzzy
msgid "Move partition %1?"
msgstr "正在裝載所有分割區..."
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
msgid "Forward"
msgstr "轉遞"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
#, fuzzy
msgid "Backward"
msgstr "背景"
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
#, fuzzy
msgid "Confirm Deleting of All Partitions"
msgstr "正在裝載所有分割區..."
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
msgid ""
"The disk \"%1\" contains at least one partition.\n"
"If you proceed, the following partitions will be deleted:"
msgstr ""
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
#, fuzzy
msgid "Really delete all partitions on \"%1\"?"
msgstr "確定要刪除 %1上的所有分割區?"
@@ -3349,56 +3354,61 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
#, fuzzy
msgid "No hard disk selected."
msgstr "沒有選取磁碟。"
#. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
msgid "The disk is in use and cannot be modified."
msgstr ""
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
#, fuzzy
msgid "Select new partition table type for %1."
msgstr "刪除分割區表:"
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
msgid "No disk selected."
msgstr "沒有選取磁碟。"
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
msgid "Really delete BIOS RAID %1?"
msgstr "確定刪除 BIOS RAID %1 嗎?"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
#, fuzzy
msgid "Really delete Partitioned RAID %1?"
msgstr "確定要刪除 %1上的所有分割區?"
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
#, fuzzy
msgid "There are no partitions to delete on this disk."
msgstr "此模組沒有選項"
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
msgid "It is not possible to create a partition on %1."
msgstr "無法在 %1 建立分割區。"
@@ -3406,29 +3416,29 @@
#. error popup
#. error popup
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
#, fuzzy
msgid "No partition selected."
msgstr "未選取開機選項。"
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
msgid ""
"The partition %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
#, fuzzy
msgid "An extended partition cannot be edited."
msgstr "無法建立延伸分割區。"
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
#, fuzzy
msgid ""
"The partition %1 is already created on disk\n"
@@ -3436,26 +3446,26 @@
msgstr "無法裝載 /var 分割區 %1。\n"
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
#, fuzzy
msgid "An extended partition cannot be moved."
msgstr "無法建立延伸分割區。"
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
msgid ""
"The partition %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
#, fuzzy
msgid "An extended partition cannot be resized."
msgstr "無法建立延伸分割區。"
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -3465,46 +3475,46 @@
"partitions will be deleted.</p>\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
#, fuzzy
msgid "Really delete these partitions?"
msgstr "確定要刪除所選取的選項嗎?"
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
msgid ""
"There are no partitions on this disk, but a clonable\n"
"disk must have at least one partition.\n"
"Create partitions before cloning the disk.\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
msgid ""
"This disk cannot be cloned. There are no suitable\n"
"disks that could have the same partitioning layout."
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
#, fuzzy
msgid "Clone partition layout of %1"
msgstr "修復 %1 的分割區表"
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
#, fuzzy
msgid "Available target disks:"
msgstr "可用的項目為(&V):"
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
msgid "Select a target disk for creating a clone"
msgstr ""
#. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
@@ -3513,7 +3523,7 @@
"確定要在磁碟 %1 上執行 dasdfmt 嗎?\n"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3559,8 +3569,7 @@
msgstr "向上移(&U)"
#: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43
-#: src/include/partitioning/ep-lvm.rb:65
-#: src/include/partitioning/ep-raid.rb:39
+#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39
#, fuzzy
msgid "Resize"
msgstr "調整大小(&S)"
@@ -3661,8 +3670,7 @@
#. push button text
#. push button text
-#: src/include/partitioning/ep-hd.rb:496
-#: src/include/partitioning/ep-lvm.rb:213
+#: src/include/partitioning/ep-hd.rb:496 src/include/partitioning/ep-lvm.rb:213
#: src/include/partitioning/ep-lvm.rb:337
#: src/include/partitioning/ep-tmpfs.rb:110
#, fuzzy
@@ -3776,12 +3784,12 @@
msgstr "密碼錯誤。"
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
#, fuzzy
msgid "Confirm Deleting Partition Used by LVM"
msgstr "正在刪除分割區 %1$s"
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
#, fuzzy
msgid ""
"The selected partition is used by volume group \"%1\".\n"
@@ -3791,17 +3799,17 @@
"您選取的分割區隸屬於 RAID (%1)。\n"
"請先將其自 RAID 移除後再行編輯。"
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
#, fuzzy
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr "已有項目 '%1'。"
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
#, fuzzy
msgid "Confirm Deleting Partition Used by RAID"
msgstr "正在刪除分割區 %1$s"
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
#, fuzzy
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
@@ -3811,25 +3819,25 @@
"您選取的分割區隸屬於 RAID (%1)。\n"
"請先將其自 RAID 移除後再行編輯。"
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
#, fuzzy
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "刪除分割區 %1$s (%2$s)"
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
msgid "Really delete all partitions on %1?"
msgstr "確定要刪除 %1上的所有分割區?"
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
msgid "Really delete %1?"
msgstr "確定要刪除 %1 嗎?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -3839,7 +3847,7 @@
#. Guarantee some minimal share (1%) of total graph width to the segment.
#. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
#, fuzzy
msgid "Unpartitioned"
msgstr "基於分割區(&P)"
@@ -3848,37 +3856,37 @@
#. or the end of the disk if
#. 1. end +1th cyl is not the next one
#. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
#, fuzzy
msgid "Unallocated"
msgstr "基於分割區(&P)"
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
#, fuzzy
msgid "<p>No changes to partitioning.</p>"
msgstr "<h1>警告</h1>"
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "<h1>警告</h1>"
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
#, fuzzy
msgid "<p>No changes to storage settings.</p>"
msgstr "<p>在此對話方塊,變更不同的 useradd 設定。</p>"
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
#, fuzzy
msgid "<p>Storage settings:</p>"
msgstr "<p>在此對話方塊,變更不同的 useradd 設定。</p>"
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
#, fuzzy
msgid "<p>Packages to install:</p>"
msgstr "<p>在此對話方塊,變更不同的 useradd 設定。</p>"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
#, fuzzy
msgid "<p>No packages need to be installed.</p>"
msgstr "<p>在此對話方塊,變更不同的 useradd 設定。</p>"
@@ -4008,13 +4016,13 @@
"建立旗標。"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
#, fuzzy
msgid "Add Crypt File"
msgstr "編輯加密檔案(&E)"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
#, fuzzy
msgid "Edit Crypt File %1"
msgstr "編輯加密檔案(&E)"
@@ -4355,13 +4363,13 @@
msgstr "使用者"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
#, fuzzy
msgid "Add Logical Volume on %1"
msgstr "編輯邏輯卷冊"
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
#, fuzzy
msgid "Edit Logical Volume %1 on %2"
msgstr "編輯邏輯卷冊"
@@ -4399,9 +4407,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
#, fuzzy
msgid "No logical volume selected."
msgstr "沒有選取規劃。"
@@ -4413,7 +4421,7 @@
msgstr "目前卷冊群組 %1 中沒有可用空間。"
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
#, fuzzy
msgid ""
"The volume %1 is a thin pool.\n"
@@ -4424,7 +4432,7 @@
"無法將其復原。\n"
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
#, fuzzy
msgid ""
"The volume %1 is in use. It cannot be\n"
@@ -4827,19 +4835,19 @@
msgstr "<p>請選取要新增的宣告類型。</p>"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
#, fuzzy
msgid "Add RAID %1"
msgstr "新增 RAID(&D)"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
#, fuzzy
msgid "Resize RAID %1"
msgstr "移除 RAID(&V)"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
#, fuzzy
msgid "Edit RAID %1"
msgstr "編輯 RAID(&E)"
@@ -5132,7 +5140,7 @@
"已安裝的掃描器。</p>"
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
#, fuzzy
msgid "Add tmpfs Mount"
msgstr "新增到區域"
@@ -5998,20 +6006,43 @@
msgstr ""
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:937
+msgid "Operation not permitted on disk %{device}.\n"
msgstr ""
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:942
#, fuzzy
msgid ""
"\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+"\n"
+"在您的磁碟 %1 上的分割區無法由\n"
+"用來變更分割表的\n"
+"分割區工具 parted 進行讀取,或不受到這個工具支援。\n"
+" \n"
+"您可依其原貌使用磁碟 %1 上的分割區,或\n"
+"格式化這些分割區並將裝載點指派給它們,但是您\n"
+"無法在此處新增、編輯、調整大小\n"
+"或移除該磁碟上的分割區。\n"
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:954
+#, fuzzy
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
"supported by the partitioning tool parted used to change the\n"
"partition table.\n"
"\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
"format them and assign mount points, but you cannot add, edit, \n"
"resize, or remove partitions from that disk here.\n"
msgstr ""
@@ -6025,16 +6056,16 @@
"無法在此處新增、編輯、調整大小\n"
"或移除該磁碟上的分割區。\n"
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:966
#, fuzzy
msgid ""
"\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
"compatibility the kernel has automatically generated a\n"
"partition spanning almost the entire disk.\n"
"\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
"format it and assign a mount point, but you cannot resize\n"
"or remove the partition from that disk here.\n"
msgstr ""
@@ -6049,7 +6080,7 @@
"或移除該磁碟上的分割區。\n"
#. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:982
#, fuzzy
msgid ""
"\n"
@@ -6066,7 +6097,7 @@
"損毀。\n"
#. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:992
msgid ""
"\n"
"\n"
@@ -6084,7 +6115,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
msgid "Resize Not Possible:"
msgstr "無法調整大小:"
@@ -6097,7 +6128,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:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
#, fuzzy
msgid ""
"Could not set encryption.\n"
@@ -6111,7 +6142,7 @@
"提供的加密密碼可能不正確。\n"
#. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
#, fuzzy
msgid ""
"The first and the second version\n"
@@ -6123,7 +6154,7 @@
"請再試一次。"
#. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -6136,27 +6167,27 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
#, fuzzy
msgid "&Enter Encryption Password:"
msgstr "輸入加密金鑰"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
#, fuzzy
msgid "Provide Password"
msgstr "輸入提供者密碼"
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
#, fuzzy
msgid "Encrypted Volume Activation"
msgstr " 卷冊群組 "
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6164,13 +6195,13 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
#, fuzzy
msgid "Do you want to provide encryption passwords?"
msgstr "您想要再重試一次嗎?"
#. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6178,55 +6209,55 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
#, fuzzy
msgid "Enter Encryption Password"
msgstr "輸入加密金鑰"
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
#, fuzzy
msgid "Provide password for any of the following devices:"
msgstr "YaST2 偵測到下列裝置"
#. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
#, fuzzy
msgid "Provide password for the following device:"
msgstr "YaST2 偵測到下列裝置"
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
#, fuzzy
msgid "IDE Disk"
msgstr "DASD 磁碟"
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
#, fuzzy
msgid "SCSI Disk"
msgstr "DASD 磁碟"
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
msgid "Disk"
msgstr "磁碟"
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
#, fuzzy
msgid "DM RAID"
msgstr "RAID(&A):"
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
#, fuzzy
msgid "MD RAID"
msgstr "RAID(&A):"
@@ -6234,52 +6265,52 @@
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
msgid "Installing required packages failed."
msgstr "安裝所需的套件時失敗。"
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
#, fuzzy
msgid "Continue despite the error?"
msgstr "要繼續調整 %1 的大小嗎?"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
#, fuzzy
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
"無法調整分割區 %1 的大小,\n"
"因為無法裝載檔案系統。\n"
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6287,7 +6318,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6295,7 +6326,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
#, fuzzy
msgid ""
"\n"
@@ -6306,19 +6337,19 @@
"因為無法裝載檔案系統。\n"
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
#, fuzzy
msgid "Nothing assigned as root filesystem!"
msgstr "正在複製根檔案系統..."
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
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:6032
+#: src/modules/Storage.rb:6042
#, fuzzy
msgid "Adding the following resolvables failed: %1"
msgstr "寫入防火牆規則失敗"
@@ -6980,60 +7011,46 @@
"You must quit that application before you can continue."
msgstr ""
-#. enable snapshots for root volume if desired
+#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
#, fuzzy
msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr "由於不一致的 FS,可能會進行調整。請在 Windows 之下檢查 FS。"
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-#, fuzzy
-msgid "Create &LVM-based Proposal"
-msgstr "建立 LVM 基礎建議(&L)"
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-#, fuzzy
-msgid "Encr&ypt Volume Group"
-msgstr " 卷冊群組 "
-
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6239
#, fuzzy
msgid "File System for Root Partition"
msgstr "檔案系統選項:"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6286
#, fuzzy
msgid "File System for Home Partition"
msgstr "建議個別主分割區(&H)"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6304
#, fuzzy
msgid "Enlarge &Swap for Suspend"
msgstr "啟用暫停(&E)"
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6314
#, fuzzy
msgid "Proposal Settings"
msgstr "特殊設定"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
-#, fuzzy
+#: src/modules/StorageProposal.rb:6329
msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
msgstr ""
-"<p>\n"
-"若要建立基於 LVM 的要求,請選擇對應的按鈕。</p>\n"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6337
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"
@@ -7042,37 +7059,54 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6346
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:6325
+#: src/modules/StorageProposal.rb:6353
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:6350
+#: src/modules/StorageProposal.rb:6378
#, fuzzy
msgid "Enter your password for the proposal encryption."
msgstr "請輸入此加密檔案系統的密碼。"
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6385
msgid "Password:"
msgstr "密碼:"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6396
#, fuzzy
msgid "Reenter the password for verification:"
msgstr "重新輸入密碼以進行確認(&V):"
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6594
+#, fuzzy
+#| msgid "&Partition Based"
+msgid "&Partition-based Proposal"
+msgstr "基於分割區(&P)"
+
+#: src/modules/StorageProposal.rb:6596
+#, fuzzy
+msgid "&LVM-based Proposal"
+msgstr "建立 LVM 基礎建議(&L)"
+
+#: src/modules/StorageProposal.rb:6598
+#, fuzzy
+msgid "&Encrypted LVM-based Proposal"
+msgstr "建立 LVM 基礎建議(&L)"
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -7121,6 +7155,18 @@
msgid "Visible Information on Storage Devices:"
msgstr "使用者資訊來源"
+#, fuzzy
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr " 卷冊群組 "
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+#~ "LVM-based proposal can be encrypted.</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "若要建立基於 LVM 的要求,請選擇對應的按鈕。</p>\n"
+
#~ msgid "No unsaved changes exist."
#~ msgstr "沒有未儲存的變更。"
@@ -7353,9 +7399,6 @@
#~ msgid "Default Filesystem:"
#~ msgstr "本地檔案系統"
-#~ msgid "&Partition Based"
-#~ msgstr "基於分割區(&P)"
-
#~ msgid "&LVM Based"
#~ msgstr "基於 LVM(&L)"
Modified: trunk/yast/zh_TW/po/update.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/update.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/update.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2011-10-05 23:37+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -432,7 +432,7 @@
msgstr "這些檔案都不存在:%1"
#. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -879,19 +879,19 @@
#. -----------------------------------------------------------------------
#. GLOBAL FUNCTIONS
#. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
msgid "Unknown Product"
msgstr "未知的產品"
#. If the current default desktop is not installed, it's a valid use case
#. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
msgid ""
"Cannot select these patterns required for installation:\n"
"%{patterns}"
msgstr ""
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
msgid ""
"Cannot select these packages required for installation:\n"
"%{packages}"
Modified: trunk/yast/zh_TW/po/users.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/users.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/users.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2011-10-06 21:27+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <zh(a)li.org>\n"
@@ -131,627 +131,6 @@
msgid "Do not ask for missing data; return error instead."
msgstr "不要要求遺失的資料,以回應錯誤取代。"
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-msgid "User Authentication Method"
-msgstr "使用者驗證方式"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<b>驗證</b><br>\n"
-"選取使用者要在系統上使用的驗證方法。\n"
-"</p>"
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: 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>若只要使用本地檔案 <i>/etc/passwd</i> 及 <i>/etc/shadow</i> 來驗證使用者,請選取<b>「本地」</b>。</p>"
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr "如果您有上一個安裝或替用系統,則可根據此來源建立使用者。若要如此做,請選取<b>「讀取上一個安裝的使用者資料」</b>。此選項會使用現有資料,或為在此安裝指定位置中的每個使用者建立一個新的主目錄。"
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-msgid "&LDAP"
-msgstr "LDAP(&L)"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-msgid "N&IS"
-msgstr "NIS(&I)"
-
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "Samba(&S)"
-
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-msgid "&Windows Domain"
-msgstr "Windows 領域(&W)"
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-msgid "L&ocal (/etc/passwd)"
-msgstr "本地 (/etc/passwd)(&O)"
-
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-msgid "eDirectory LDAP"
-msgstr "eDirectory LDAP"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>如果您使用 NIS 或 LDAP 伺服器來儲存使用者資料,\n"
-"或者您想要驗證 NT 伺服器的使用者,請選擇適當的值。然後\n"
-"按<b>「下一步」</b>繼續用戶端的設定。</p>"
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>如果您使用 NIS 或 LDAP 伺服器來儲存使用者資料,\n"
-"請選擇適當的值。然後按<b>「下一步」</b>繼續用戶端的設定。</p>"
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>如果您使用 LDAP 伺服器來儲存使用者資料,或者您想要驗證 NT 伺服器的使用者,請選擇適當的值。然後\n"
-"按<b>「下一步」</b>繼續用戶端的設定。</p>"
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>如果您使用 LDAP 伺服器來儲存使用者資料,\n"
-"請選擇適當的值。然後按<b>「下一步」</b>繼續用戶端的設定。</p>"
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr "<p>在設定使用者資料來源後,檢查<b>「設定 Kerberos 驗證」</b>以設定 Kerberos 。</p>"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-msgid "&Read User Data from a Previous Installation"
-msgstr "自上一個安裝讀取使用者資料(&R)"
-
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-msgid "&Choose"
-msgstr "選擇(&C)"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-msgid "Authentication Method"
-msgstr "驗證方式"
-
-#. check box label
-#: src/clients/inst_auth.rb:303
-msgid "Set Up &Kerberos Authentication"
-msgstr "設定 Kerberos 驗證(&K)"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-msgid "&Select Users to Read"
-msgstr "選取要讀取的使用者(&S)"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-msgid "Select or Deselect &All"
-msgstr "全選或取消全選(&A)"
-
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-msgid "Password for the System Administrator \"root\""
-msgstr "系統管理員的密碼 \"root\""
-
-#. advise user to remember his new password
-#. advise users to remember their new password
-#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
-msgid "Do not forget what you enter here."
-msgstr "請不要忘記您在此處輸入的密碼。"
-
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-msgid "&Password for root User"
-msgstr "Root 使用者的密碼(&P)"
-
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-msgid "Con&firm Password"
-msgstr "確認密碼(&F)"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-msgid "&Test Keyboard Layout"
-msgstr "測試鍵盤配置(&T)"
-
-#. push button
-#: src/clients/inst_root.rb:119
-msgid "E&xpert Options..."
-msgstr "專家選項(&X)..."
-
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"和系統一般使用者可寫入文字、建立\n"
-"圖形或瀏覽網際網路不同,所有系統都有\"root\" 使用者,\n"
-"在需要執行管理任務時,會呼叫操作。\n"
-" 需要成為\n"
-"系統管理員時,才登入為 Root。\n"
-"</p>\n"
-
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"由於根使用者的權限極大,因此\n"
-"設定根使用者的密碼時必須非常小心。建議使用\n"
-"字母與數字的組合。為確保輸入的密碼正確,\n"
-"請於第二個欄位中重複輸入一次。\n"
-"</p>\n"
-
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"所有與使用者密碼相關的規則皆適用於 \"root\" 密碼:\n"
-"請區分大小寫。密碼至少須有 5 個字元,\n"
-"且規定不可以含有重音字母或變音符號。\n"
-"</p>\n"
-
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"請勿忘記 \"root\" 密碼。\n"
-"</p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-"<p>如果您要用此密碼建立證書,\n"
-"則密碼長度至少要 %1 個字元。</p>"
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr "<p>請在 <b>測試鍵盤配置</b> 的區域輸入一些字,檢查您的目前鍵盤配置是否正確。</p>"
-
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. 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: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."
-msgstr ""
-"密碼不符合。\n"
-"請再試一次。"
-
-#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"沒有輸入密碼。\n"
-"請再試一次。"
-
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"如果您要建立證書,\n"
-"密碼至少要有 %1 個字元。"
-
-#. last part of message popup
-#. last part of message popup
-#. 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:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-msgid "Really use this password?"
-msgstr "真的要使用此密碼?"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-"無法設定 root 密碼。\n"
-"您可能無法登入。\n"
-"要重新設定嗎?\n"
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-msgid "Initialization of module for configuration of authentication..."
-msgstr "為了驗證組態而啟始化模組..."
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"尚未安裝套件 %1。\n"
-"要現在安裝嗎?\n"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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:93 src/clients/users_proposal.rb:57
-msgid "SHA-256"
-msgstr ""
-
-#. encryption type
-#. encryption type
-#: 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:143
-msgid "Password Encryption Type"
-msgstr "密碼加密類型"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: 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:151 src/include/users/widgets.rb:515
-msgid "&MD5"
-msgstr "MD5(&M)"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha256 crypt
-#: 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: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:162
-#, fuzzy
-msgid "<p><b>Authentication</b><br></p>"
-msgstr "<p><b>登入設定</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-#, fuzzy
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "密碼加密方法為 %1。"
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491
-#, fuzzy
-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 "<p><b>SHA-512</b> 是目前的標準 hash 方式,除非您為了相容的目的,否則 不建議使用其他演算法。</p>"
-
-#. text entry
-#. text entry
-#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403
-msgid "User's &Full Name"
-msgstr "使用者全名(&F)"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-msgid "&Username"
-msgstr "使用者名稱(&U)"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-msgid "U&se this password for system administrator"
-msgstr "系統管理員使用此密碼(&S)"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-msgid "Receive S&ystem Mail"
-msgstr "接收系統郵件(&Y)"
-
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-msgid "&Automatic Login"
-msgstr "自動登入(&A)"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-msgid "Create New User"
-msgstr "建立新使用者"
-
-#. yes-no popup headline
-#. 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:342 src/include/users/dialogs.rb:1112
-msgid "Empty User Login"
-msgstr "空的使用者登入"
-
-#. yes-no popup contents
-#. yes-no popup contents
-#: 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"
-"Leave it empty?"
-msgstr ""
-"只有網路環境有驗證伺服器時,\n"
-"才可將使用者名稱保留為空白。\n"
-"要保留為空白?"
-
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: 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"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"輸入<b>「使用者全名」</b>、<b>「使用者名稱」<b>和<b>「密碼」</b>,\n"
-"指定給該使用者帳戶。\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"輸入密碼時,\n"
-"大小寫是不同的。密碼不可以包含重音字元或變音符號。\n"
-"</p>\n"
-
-#. 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:457 src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"若要加密目前的密碼 (%1),密碼長度必須介於\n"
-"%2 及 %3 個字元之間。\n"
-"</p>"
-
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-#, fuzzy
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>如果您要用此密碼建立證書,\n"
-"則密碼長度至少要 %1 個字元。</p>"
-
-#. help text for main add user dialog
-#. help text 4/4
-#: 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"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"為確保輸入的密碼正確,\n"
-"請於第二個欄位中重複輸入一次。請勿忘記密碼。\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: 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"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"輸入<b>「使用者名稱」</b>時,只能使用\n"
-"字母 (非重音字元)、數字和<tt>._-</tt>。\n"
-"除非您知道自己在做什麼,請勿在這個項目中使用大寫字母。\n"
-"使用者名稱的限制比密碼嚴格。您可以在\n"
-"/etc/login.defs 檔案中重新定義限制。請閱讀它的說明頁面以獲得資訊。\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: 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>核取 <b>系統管理員使用此密碼</b> 如果 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: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"
-msgstr ""
-"<p>\n"
-"登入與使用 Linux 系統時,必須使用在此建立的使用者名稱和密碼。啟用<b>「自動登入」</b>時,會略過登入程序。此使用者會自動登入。</p>\n"
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: 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"
-msgstr ""
-"<p>\n"
-"核取<b>「接收系統郵件」</b>,轉寄 Root 使用者的郵件給此使用者。</p>\n"
-
-#. 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:573
-msgid "Expert Settings"
-msgstr "精靈設定"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-msgid "The authentication method is local /etc/passwd."
-msgstr "驗證方法為本機 /etc/passwd。"
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-#, fuzzy
-msgid "The password encryption method is %s."
-msgstr "密碼加密方法為 %1。"
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-#, fuzzy
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] "將匯入使用者 %1。"
-
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-msgid "&Change..."
-msgstr "變更(&C)..."
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-msgid "Summary"
-msgstr "摘要"
-
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-#, fuzzy
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"如果您要建立證書,\n"
-"密碼至少要有 %1 個字元。"
-
#. translators: command line help text for Users module
#: src/clients/users.rb:102
msgid "User configuration module"
@@ -873,11 +252,6 @@
msgid "New UID of the user"
msgstr "使用者的新 UID"
-#. progress step title
-#: src/clients/users_finish.rb:63
-msgid "Writing Users Configuration..."
-msgstr "正在寫入使用者組態..."
-
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -1137,93 +511,6 @@
msgid "Seconds"
msgstr "秒鐘"
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr "NIS"
-
-#. authentication type
-#: src/clients/users_proposal.rb:46
-msgid "Samba (Windows Domain)"
-msgstr "Samba (Windows 領域)"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-msgid "<%1>Root Password<%2> set"
-msgstr "<%1>Root 密碼<%2> 已設定"
-
-#: src/clients/users_proposal.rb:74
-msgid "<%1>Root Password<%2> not set"
-msgstr "<%1>Root 密碼<%2> 未設定"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-msgid "No <%1>user<%2> configured"
-msgstr "沒有已設定的 <%1>使用者<%2>"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "<%1>驗證方式<%2>: %3"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr "<%1>驗證方式<%2>: %3 和 Kerberos。"
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr "已選取 <%1>使用者<%2> %3 準備匯入"
-
-#. summary line, <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-msgid "<%1>User<%2> %3 will be imported."
-msgstr "<%1>使用者<%2> %3 將被匯入。"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-msgid "<%1>User<%2> %3 configured"
-msgstr "<%1>使用者<%2> %3 已組態"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "<%1>使用者<%2> %3 (%4) 已組態"
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-msgid "Password Encryption Method: %1"
-msgstr "密碼加密方法: %1"
-
-#. rich text label
-#: src/clients/users_proposal.rb:170
-msgid "User Settings"
-msgstr "使用者設定"
-
-#. menu button label
-#: src/clients/users_proposal.rb:173
-msgid "&User"
-msgstr "使用者(&U)"
-
-#. menu button label
-#: src/clients/users_proposal.rb:175
-msgid "&Root Password"
-msgstr "Root 密碼(&R)"
-
#. password entering label
#: src/include/users/cmdline.rb:55
msgid "LDAP Server Password:"
@@ -1386,6 +673,24 @@
"所需的資料,\n"
"請輸入使用者目前的密碼。"
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:471
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"密碼不符合。\n"
+"請再試一次。"
+
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -1411,6 +716,13 @@
msgstr "變更目錄擁有者(&C)"
#. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:583
+msgid "User's &Full Name"
+msgstr "使用者全名(&F)"
+
+#. text entry
#: src/include/users/dialogs.rb:411
msgid "&First Name"
msgstr "名字(&F)"
@@ -1425,11 +737,30 @@
msgid "For remote users, only additional group memberships can be changed."
msgstr "遠端的使用者只能變更附加群組成員。"
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:590
+msgid "&Username"
+msgstr "使用者名稱(&U)"
+
#. checkbox label
+#: src/include/users/dialogs.rb:446
+msgid "Receive S&ystem Mail"
+msgstr "接收系統郵件(&Y)"
+
+#. checkbox label
#: src/include/users/dialogs.rb:456
msgid "A&utomatic Login"
msgstr "自動登入(&U)"
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:614
+msgid "U&se this password for system administrator"
+msgstr "系統管理員使用此密碼(&S)"
+
#. check box label
#: src/include/users/dialogs.rb:480
msgid "D&isable User Login"
@@ -1599,6 +930,33 @@
msgid "Plu&g-Ins"
msgstr "插件(&G)"
+#. 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/include/users/dialogs.rb:1112
+msgid "Empty User Login"
+msgstr "空的使用者登入"
+
+#. yes-no popup contents
+#: 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"
+"Leave it empty?"
+msgstr ""
+"只有網路環境有驗證伺服器時,\n"
+"才可將使用者名稱保留為空白。\n"
+"要保留為空白?"
+
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:483
+msgid "Really use this password?"
+msgstr "真的要使用此密碼?"
+
#. popup question
#: src/include/users/dialogs.rb:1308
msgid "Change home directory to %1?"
@@ -1690,6 +1048,20 @@
msgid "Group &Data"
msgstr "群組資料(&D)"
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+msgid "DES"
+msgstr "DES"
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+msgid "MD5"
+msgstr "MD5"
+
#. help text 1/4
#: src/include/users/helps.rb:62
msgid ""
@@ -1703,6 +1075,32 @@
"密碼不可以包含任何重音字元或變音。\n"
"</p>\n"
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"若要加密目前的密碼 (%1),密碼長度必須介於\n"
+"%2 及 %3 個字元之間。\n"
+"</p>"
+
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"為確保輸入的密碼正確,\n"
+"請於第二個欄位中重複輸入一次。請勿忘記密碼。\n"
+"</p>\n"
+
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -1870,6 +1268,19 @@
"<b>「密碼」</b>,指定給該使用者。\n"
"</p>\n"
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"輸入<b>「使用者全名」</b>、<b>「使用者名稱」<b>和<b>「密碼」</b>,\n"
+"指定給該使用者帳戶。\n"
+"</p>\n"
+
#. help text 2/7
#: src/include/users/helps.rb:226
msgid ""
@@ -1909,6 +1320,25 @@
"/etc/login.defs 檔案中重新定義限制。請閱讀它的說明頁面以獲得資訊。\n"
"</p>\n"
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
+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"
+msgstr ""
+"<p>\n"
+"登入與使用 Linux 系統時,必須使用在此建立的使用者名稱和密碼。啟用<b>「自動登入」</b>時,會略過登入程序。此使用者會自動登入。</p>\n"
+
+#. help text 5/7 (only during installation)
+#: 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"
+msgstr ""
+"<p>\n"
+"核取<b>「接收系統郵件」</b>,轉寄 Root 使用者的郵件給此使用者。</p>\n"
+
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2666,7 +2096,8 @@
msgstr "系統使用者"
#. the type of user set
-#: src/include/users/widgets.rb:79
+#. New user is the default option
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
msgid "Local Users"
msgstr "本機使用者"
@@ -2742,6 +2173,11 @@
msgstr "Samba 群組"
#. richtext label
+#: src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr "NIS"
+
+#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr ""
@@ -2761,6 +2197,11 @@
msgid "&SSSD"
msgstr ""
+#. menubutton label
+#: src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "Samba(&S)"
+
#. tab header
#: src/include/users/widgets.rb:168
msgid "&Users"
@@ -2888,6 +2329,12 @@
"網路協定不支援這個功能,且使用 NIS 時可能會有問題。\n"
"</p>"
+#. Help text for password expert dialog 4/5
+#: src/include/users/widgets.rb:491
+#, fuzzy
+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 "<p><b>SHA-512</b> 是目前的標準 hash 方式,除非您為了相容的目的,否則 不建議使用其他演算法。</p>"
+
#. Label
#: src/include/users/widgets.rb:499
msgid "Password Encryption"
@@ -2898,6 +2345,26 @@
msgid "Encryption Type"
msgstr "加密類型"
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr ""
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr "MD5(&M)"
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr ""
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr ""
+
#. help text 1/3
#: src/include/users/widgets.rb:582
msgid ""
@@ -3192,6 +2659,12 @@
#. type of user/group
#. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
msgid "System"
msgstr "系統"
@@ -3528,6 +3001,15 @@
msgid "Package %1 is not available for installation."
msgstr "套件 %1 無法安裝。"
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"尚未安裝套件 %1。\n"
+"要現在安裝嗎?\n"
+
#. dialog caption
#: src/include/users/wizards.rb:102
msgid "User and Group Administration"
@@ -3545,6 +3027,421 @@
msgid "Initializing..."
msgstr "正在啟始化..."
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+#, fuzzy
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"如果您要建立證書,\n"
+"密碼至少要有 %1 個字元。"
+
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+#, fuzzy
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>如果您要用此密碼建立證書,\n"
+"則密碼長度至少要 %1 個字元。</p>"
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+msgid "Writing Users Configuration..."
+msgstr "正在寫入使用者組態..."
+
+#. Copyright (c) 2016 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+#, fuzzy
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "密碼加密方法為 %1。"
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+#, fuzzy
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> 是目前的標準 hash 方式,除非您為了相容的目的,否則 不建議使用其他演算法。</p>"
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+msgid "Password Encryption Type"
+msgstr "密碼加密類型"
+
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+msgid "Do not forget what you enter here."
+msgstr "請不要忘記您在此處輸入的密碼。"
+
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+msgid "&Password for root User"
+msgstr "Root 使用者的密碼(&P)"
+
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+msgid "Con&firm Password"
+msgstr "確認密碼(&F)"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+msgid "&Test Keyboard Layout"
+msgstr "測試鍵盤配置(&T)"
+
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"和系統一般使用者可寫入文字、建立\n"
+"圖形或瀏覽網際網路不同,所有系統都有\"root\" 使用者,\n"
+"在需要執行管理任務時,會呼叫操作。\n"
+" 需要成為\n"
+"系統管理員時,才登入為 Root。\n"
+"</p>\n"
+
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"由於根使用者的權限極大,因此\n"
+"設定根使用者的密碼時必須非常小心。建議使用\n"
+"字母與數字的組合。為確保輸入的密碼正確,\n"
+"請於第二個欄位中重複輸入一次。\n"
+"</p>\n"
+
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"所有與使用者密碼相關的規則皆適用於 \"root\" 密碼:\n"
+"請區分大小寫。密碼至少須有 5 個字元,\n"
+"且規定不可以含有重音字母或變音符號。\n"
+"</p>\n"
+
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"請勿忘記 \"root\" 密碼。\n"
+"</p>"
+
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+msgid "Password for the System Administrator \"root\""
+msgstr "系統管理員的密碼 \"root\""
+
+#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"沒有輸入密碼。\n"
+"請再試一次。"
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:134
+#, fuzzy
+#| 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>"
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr "<p>若只要使用本地檔案 <i>/etc/passwd</i> 及 <i>/etc/shadow</i> 來驗證使用者,請選取<b>「本地」</b>。</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+#| msgid "Create New User"
+msgid "Create new user"
+msgstr "建立新使用者"
+
+#: src/lib/users/dialogs/inst_user_first.rb:142
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"輸入密碼時,\n"
+"大小寫是不同的。密碼不可以包含重音字元或變音符號。\n"
+"</p>\n"
+
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:149
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "With the current password encryption (%1), the password length should be between\n"
+#| " %2 and %3 characters.\n"
+#| "</p>"
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"若要加密目前的密碼 (%1),密碼長度必須介於\n"
+"%2 及 %3 個字元之間。\n"
+"</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:165
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"輸入<b>「使用者名稱」</b>時,只能使用\n"
+"字母 (非重音字元)、數字和<tt>._-</tt>。\n"
+"除非您知道自己在做什麼,請勿在這個項目中使用大寫字母。\n"
+"使用者名稱的限制比密碼嚴格。您可以在\n"
+"/etc/login.defs 檔案中重新定義限制。請閱讀它的說明頁面以獲得資訊。\n"
+"</p>\n"
+
+#: src/lib/users/dialogs/inst_user_first.rb:172
+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>核取 <b>系統管理員使用此密碼</b> 如果 root 要使用和第一個使用者相同的密碼。</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "Import User Data from a Previous Installation"
+msgstr "自上一個安裝讀取使用者資料(&R)"
+
+#: src/lib/users/dialogs/inst_user_first.rb:184
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:193
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:275
+#, fuzzy
+#| msgid "Local Users"
+msgid "Local User"
+msgstr "本機使用者"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:330
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:387
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:514
+#, fuzzy
+#| msgid "Create New User"
+msgid "&Create New User"
+msgstr "建立新使用者"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:537
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "&Import User Data from a Previous Installation"
+msgstr "自上一個安裝讀取使用者資料(&R)"
+
+#: src/lib/users/dialogs/inst_user_first.rb:547
+#, fuzzy
+#| msgid "System Users"
+msgid "Choose Users"
+msgstr "系統使用者"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:563
+msgid "&Skip User Creation"
+msgstr ""
+
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:619
+msgid "&Automatic Login"
+msgstr "自動登入(&A)"
+
+#: src/lib/users/dialogs/inst_user_first.rb:626
+#, fuzzy
+#| msgid "No user was specified."
+msgid "No users selected"
+msgstr "未指定使用者。"
+
+#: src/lib/users/dialogs/inst_user_first.rb:628
+#, fuzzy
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] "將匯入使用者 %1。"
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+msgid "&Select Users to Read"
+msgstr "選取要讀取的使用者(&S)"
+
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+msgid "Select or Deselect &All"
+msgstr "全選或取消全選(&A)"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+msgid "SHA-256"
+msgstr ""
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+msgid "SHA-512"
+msgstr ""
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+#| msgid "Password Encryption Method: %1"
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "密碼加密方法: %1"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+#| msgid "Password Encryption Type"
+msgid "Password &Encryption Type"
+msgstr "密碼加密類型"
+
+#. rich text label
+#: src/lib/users/proposal.rb:75
+msgid "User Settings"
+msgstr "使用者設定"
+
+#. menu button label
+#: src/lib/users/proposal.rb:78
+msgid "&User"
+msgstr "使用者(&U)"
+
+#. menu button label
+#: src/lib/users/proposal.rb:80
+msgid "&Root Password"
+msgstr "Root 密碼(&R)"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+msgid "<%1>Root Password<%2> set"
+msgstr "<%1>Root 密碼<%2> 已設定"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+msgid "<%1>Root Password<%2> not set"
+msgstr "<%1>Root 密碼<%2> 未設定"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+msgid "No <%1>user<%2> configured"
+msgstr "沒有已設定的 <%1>使用者<%2>"
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+#, fuzzy
+#| msgid "<%1>User<%2> %3 will be imported."
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] "<%1>使用者<%2> %3 將被匯入。"
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+msgid "<%1>User<%2> %3 configured"
+msgstr "<%1>使用者<%2> %3 已組態"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "<%1>使用者<%2> %3 (%4) 已組態"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+#| msgid "Password Encryption Method: %1"
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "密碼加密方法: %1"
+
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
msgid "root"
@@ -4003,7 +3900,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:722
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -4022,202 +3919,202 @@
"。繼續進行使用者組態?"
#. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:970
msgid "Multiple users satisfy the input conditions."
msgstr "有多個使用者滿足輸入條件。"
#. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1548
msgid "Initializing User and Group Configuration"
msgstr "正在啟始化使用者和群組組態"
#. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1555
msgid "Read the default login settings"
msgstr "讀取預設登入設定"
#. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1557
msgid "Read the default system settings"
msgstr "讀取預設系統設定"
#. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1559
msgid "Read the configuration type"
msgstr "讀取組態類型"
#. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1561
msgid "Read the user custom settings"
msgstr "讀取使用者自訂設定"
#. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1563
msgid "Read users and groups"
msgstr "讀取使用者和群組"
#. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1565
msgid "Build the cache structures"
msgstr "建立快取結構"
#. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1569
msgid "Reading the default login settings..."
msgstr "正在讀取預設登入設定..."
#. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1571
msgid "Reading the default system settings..."
msgstr "正在讀取預設系統設定..."
#. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1573
msgid "Reading the configuration type..."
msgstr "正在讀取組態類型..."
#. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1575
msgid "Reading custom settings..."
msgstr "正在讀取自訂設定..."
#. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1577
msgid "Reading users and groups..."
msgstr "正在讀取使用者和群組..."
#. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1579
msgid "Building the cache structures..."
msgstr "正在建立快取結構..."
#. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
msgid "Finished"
msgstr "已完成"
#. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2137
msgid "User does not exist."
msgstr "使用者不存在。"
#. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2389
msgid "Group does not exist."
msgstr "群組不存在。"
#. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4258
msgid "Writing User and Group Configuration"
msgstr "正在寫入使用者和群組組態"
#. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4267
msgid "Write LDAP users and groups"
msgstr "寫入 LDAP 使用者和群組"
#. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4269
msgid "Write groups"
msgstr "寫入群組"
#. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4271
msgid "Check for deleted users"
msgstr "檢查刪除的使用者"
#. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4273
msgid "Write users"
msgstr "寫入使用者"
#. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4275
msgid "Write passwords"
msgstr "寫入密碼"
#. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4277
msgid "Write the custom settings"
msgstr "寫入自訂設定"
#. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4279
msgid "Write the default login settings"
msgstr "寫入預設登入設定"
#. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4282
msgid "Writing LDAP users and groups..."
msgstr "正在寫入 LDAP 使用者和群組..."
#. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4284
msgid "Writing groups..."
msgstr "正在寫入群組..."
#. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4286
msgid "Checking deleted users..."
msgstr "正在檢查刪除的使用者..."
#. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4288
msgid "Writing users..."
msgstr "正在寫入使用者..."
#. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4290
msgid "Writing passwords..."
msgstr "正在寫入密碼..."
#. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4292
msgid "Writing the custom settings..."
msgstr "正在寫入自訂設定..."
#. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4294
msgid "Writing the default login settings..."
msgstr "正在寫入預設登入設定..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4379
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr "未能正確讀取檔案 %s,所以將不會寫入該檔案。"
#. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
msgid "An error occurred while removing users."
msgstr "移除使用者時發生錯誤。"
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr "未能正確讀取檔案 %s,所以將不會寫入該檔案。"
#. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4565
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
msgid "An error occurred while setting forwarding for root's mail."
msgstr "設定轉寄 root 身份的郵件時發生錯誤。"
#. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4843
msgid "No UID is available for this type of user."
msgstr "沒有可用的 UID 供此類型的使用者使用。"
#. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4874
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4227,7 +4124,7 @@
"請選取 %i 及 %i 之間的有效整數。"
#. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4905
msgid ""
"The user ID entered is already in use.\n"
"Really use it?"
@@ -4236,7 +4133,7 @@
"確定要使用它?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4918
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4248,7 +4145,7 @@
"確定要使用此 ID 嗎?"
#. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4933
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4260,7 +4157,7 @@
"確定要變更使用者類型為「本機」?"
#. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4947
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4271,7 +4168,7 @@
"因為 ID 小於 %i。\n"
"確定要變更使用者類型為「系統」?"
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4981
#, fuzzy
msgid ""
"\n"
@@ -4281,7 +4178,7 @@
"此已存在的名稱可能屬於 NIS 或 LDAP 使用者。"
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4985
msgid ""
"There is a conflict between the entered\n"
"username and an existing username. %1\n"
@@ -4292,7 +4189,7 @@
"請換一個試試看。"
#. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5015
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
@@ -4301,7 +4198,7 @@
"含有冒號 (:)。請再試一次。"
#. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5022
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4312,7 +4209,7 @@
"請移除多餘的部份。"
#. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5085
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4323,7 +4220,7 @@
"請再試一次。"
#. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5108
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4333,7 +4230,7 @@
"選擇其他路徑作為主目錄。"
#. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5119
msgid ""
"The home directory is used by another user.\n"
"Try again."
@@ -4342,7 +4239,7 @@
"請再試一次。"
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5161
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4353,7 +4250,7 @@
"確定要使用此路徑?"
#. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5172
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4363,7 +4260,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5179
#, fuzzy, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4375,7 +4272,7 @@
"要使用這個目錄?"
#. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5188
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4389,7 +4286,7 @@
"要使用這個目錄?"
#. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5216
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
@@ -4398,12 +4295,12 @@
"使用此外圍程序?"
#. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5236
msgid "No GID is available for this type of group."
msgstr "沒有可用的 GID 供此類型的群組使用。"
#. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5269
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4413,7 +4310,7 @@
"請選取 %i 及 %i 之間的有效整數。"
#. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5299
msgid ""
"The group ID entered is already in use.\n"
"Really use it?"
@@ -4422,7 +4319,7 @@
"確定要使用它?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5311
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4434,7 +4331,7 @@
"確定要使用這個 ID 嗎?"
#. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5326
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4446,7 +4343,7 @@
"確定要變更群組類型為「本機」?"
#. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5340
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4458,7 +4355,7 @@
"確定要變更群組類型為「系統」?"
#. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5359
msgid ""
"No group name entered.\n"
"Try again."
@@ -4467,7 +4364,7 @@
"請再試一次。"
#. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5376
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4477,7 +4374,7 @@
"請再試一次。"
#. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5389
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4490,7 +4387,7 @@
"請再試一次。"
#. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5397
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
@@ -4500,13 +4397,13 @@
"的群組名稱發生衝突。\n"
"請改試其他名稱。"
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5513
#, perl-format
msgid "User %s does not exist."
msgstr "使用者 %s 不存在。"
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5567
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4517,7 +4414,7 @@
"為其預設群組。"
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5574
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4528,22 +4425,22 @@
"請先從群組中移除這些使用者。"
#. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6587
msgid "<h3>Users</h3>"
msgstr "<h3>使用者</h3>"
#. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6597
msgid "<h3>Groups</h3>"
msgstr "<h3>群組</h3>"
#. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6608
msgid "<h3>Login Settings</h3>"
msgstr "<h3>登入設定</h3>"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6610
msgid "User %1 configured for automatic login"
msgstr "使用者 %1 已設定為自動登入"
@@ -4563,22 +4460,22 @@
"具有 DN '%s' 的項目。要現在建立嗎?"
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
#, fuzzy
msgid "Kerberos Configuration"
msgstr "配額組態"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
msgid "No Kerberos Management for Groups"
msgstr ""
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
msgid "Manage Kerberos Principials"
msgstr ""
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
msgid "Cannot execute kadmin.local."
msgstr ""
@@ -4710,7 +4607,7 @@
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:505
+#: src/modules/UsersSimple.pm:379
msgid ""
"The password may only contain the following characters:\n"
"0-9, a-z, A-Z, and any of \"`~!@#$%^&* ,.;:._-+/|?='{[(<>)]}\\\".\n"
@@ -4721,7 +4618,7 @@
" 請再試一次。"
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4736,7 +4633,7 @@
"</p>"
#. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
msgid ""
"The user's full name cannot contain\n"
"\":\" or \",\" characters.\n"
@@ -4747,37 +4644,37 @@
"請再試一次。"
#. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
msgid "You have used the group name as a part of the password."
msgstr "您以群組名稱作為密碼的一部份。"
#. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
msgid "You have used the username as a part of the password."
msgstr "您以使用者名稱作為密碼的一部份。"
#. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
msgid "You have used only lowercase letters for the password."
msgstr "您的密碼全為小寫字母。"
#. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
msgid "You have used only uppercase letters for the password."
msgstr "您的密碼全為大寫字母。"
#. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
msgid "You have used a palindrome for the password."
msgstr "您使用了迴文作為密碼。"
#. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
msgid "You have used only digits for the password."
msgstr "您的密碼中全為數字。"
#. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
#, perl-format
msgid ""
"The password is too long for the current encryption method.\n"
@@ -4787,7 +4684,7 @@
"他將截斷為 %s 個字元。"
#. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
#, perl-format
msgid ""
"The password is too simple:\n"
@@ -4797,13 +4694,13 @@
"%s。"
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
#, perl-format
msgid "The password should have at least %i characters."
msgstr "密碼長度至少須有 %i 個字元。"
#. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
msgid ""
"No username entered.\n"
"Try again."
@@ -4812,7 +4709,7 @@
"請再試一次。"
#. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
#, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -4822,7 +4719,7 @@
"請再試一次。"
#. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
msgid ""
"The username may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4835,7 +4732,7 @@
"請再試一次。"
#. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
msgid ""
"There is a conflict between the entered\n"
"username and an existing username.\n"
@@ -4844,15 +4741,13 @@
"輸入的使用者名稱和現有的使用者名稱衝突。\n"
"請再試一次。"
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
msgid "Retrieving %1 extension..."
msgstr "正在取回 %1 擴充..."
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
msgid "Releasing %1 extension..."
msgstr "正在釋出 %1 擴充..."
@@ -4919,6 +4814,145 @@
msgid "There are multiple users satisfying the input conditions."
msgstr "有多位使用者符合輸入的條件。"
+#~ msgid "User Authentication Method"
+#~ msgstr "使用者驗證方式"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b>Authentication</b><br>\n"
+#~ "Select the authentication method to use for users on your system.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b>驗證</b><br>\n"
+#~ "選取使用者要在系統上使用的驗證方法。\n"
+#~ "</p>"
+
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "如果您有上一個安裝或替用系統,則可根據此來源建立使用者。若要如此做,請選取<b>「讀取上一個安裝的使用者資料」</b>。此選項會使用現有資料,或為在此安裝指定位置中的每個使用者建立一個新的主目錄。"
+
+#~ msgid "&LDAP"
+#~ msgstr "LDAP(&L)"
+
+#~ msgid "N&IS"
+#~ msgstr "NIS(&I)"
+
+#~ msgid "&Windows Domain"
+#~ msgstr "Windows 領域(&W)"
+
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "本地 (/etc/passwd)(&O)"
+
+#~ msgid "eDirectory LDAP"
+#~ msgstr "eDirectory LDAP"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>如果您使用 NIS 或 LDAP 伺服器來儲存使用者資料,\n"
+#~ "或者您想要驗證 NT 伺服器的使用者,請選擇適當的值。然後\n"
+#~ "按<b>「下一步」</b>繼續用戶端的設定。</p>"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>如果您使用 NIS 或 LDAP 伺服器來儲存使用者資料,\n"
+#~ "請選擇適當的值。然後按<b>「下一步」</b>繼續用戶端的設定。</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>如果您使用 LDAP 伺服器來儲存使用者資料,或者您想要驗證 NT 伺服器的使用者,請選擇適當的值。然後\n"
+#~ "按<b>「下一步」</b>繼續用戶端的設定。</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>如果您使用 LDAP 伺服器來儲存使用者資料,\n"
+#~ "請選擇適當的值。然後按<b>「下一步」</b>繼續用戶端的設定。</p>"
+
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>在設定使用者資料來源後,檢查<b>「設定 Kerberos 驗證」</b>以設定 Kerberos 。</p>"
+
+#~ msgid "&Choose"
+#~ msgstr "選擇(&C)"
+
+#~ msgid "Authentication Method"
+#~ msgstr "驗證方式"
+
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "設定 Kerberos 驗證(&K)"
+
+#~ msgid "E&xpert Options..."
+#~ msgstr "專家選項(&X)..."
+
+#~ msgid ""
+#~ "<p>If you intend to use this password for creating certificates,\n"
+#~ "it has to be at least %1 characters long.</p>"
+#~ msgstr ""
+#~ "<p>如果您要用此密碼建立證書,\n"
+#~ "則密碼長度至少要 %1 個字元。</p>"
+
+#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+#~ msgstr "<p>請在 <b>測試鍵盤配置</b> 的區域輸入一些字,檢查您的目前鍵盤配置是否正確。</p>"
+
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "如果您要建立證書,\n"
+#~ "密碼至少要有 %1 個字元。"
+
+#~ msgid ""
+#~ "The root password could not be set.\n"
+#~ "You might not be able to log in.\n"
+#~ "Try setting it again?\n"
+#~ msgstr ""
+#~ "無法設定 root 密碼。\n"
+#~ "您可能無法登入。\n"
+#~ "要重新設定嗎?\n"
+
+#~ msgid "Initialization of module for configuration of authentication..."
+#~ msgstr "為了驗證組態而啟始化模組..."
+
+#, fuzzy
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>登入設定</b></p>"
+
+#~ msgid "Expert Settings"
+#~ msgstr "精靈設定"
+
+#~ msgid "The authentication method is local /etc/passwd."
+#~ msgstr "驗證方法為本機 /etc/passwd。"
+
+#, fuzzy
+#~ msgid "The password encryption method is %s."
+#~ msgstr "密碼加密方法為 %1。"
+
+#~ msgid "&Change..."
+#~ msgstr "變更(&C)..."
+
+#~ msgid "Summary"
+#~ msgstr "摘要"
+
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "Samba (Windows 領域)"
+
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "<%1>驗證方式<%2>: %3"
+
+#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+#~ msgstr "<%1>驗證方式<%2>: %3 和 Kerberos。"
+
+#~ msgid "<%1>Users<%2> %3 selected for import"
+#~ msgstr "已選取 <%1>使用者<%2> %3 準備匯入"
+
#~ msgid "No Password Entered"
#~ msgstr "無密碼輸入"
Modified: trunk/yast/zh_TW/po/vm.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/vm.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/vm.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: vm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2011-10-06 21:32+0800\n"
"Last-Translator: \n"
"Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n"
@@ -33,12 +33,12 @@
msgstr "正在設定虛擬機器..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr ""
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -48,159 +48,159 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
msgid "Verify Installed Packages"
msgstr "驗證輸入的套件"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
msgid "Network Bridge Configuration"
msgstr "網路橋接組態"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
msgid "Configuring the VM Server (domain 0)"
msgstr "正在設定 VM 伺服器 (領域 0)"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr "<p><big><b>VM 伺服器組態</b></big></p><p>VM 伺服器的組態 (領域 0) 擁有兩個部分。</p>"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr "<p>先在系統中安裝需要的套件。 然後將開機載入器切換到 GRUB (如果尚未使用),並將 Xen 區段新增至開機載入器功能表 (如果已遺失)。</p>"
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
#, fuzzy
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr "<p>需要 GRUB,因為它支援啟動Xen 和 Linux 核心所需的多重開機標準。</p>"
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
#, fuzzy
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr "<p>當成功完成組態時,便可以選擇從開機載入器功能表來開機 VM 伺服器。</p>"
#. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
msgid "The installation will be aborted."
msgstr "安裝即將中止。"
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
#, fuzzy
msgid "Choose Hypervisor(s) to install"
msgstr "已安裝 Hypervisor 與工具。"
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
msgid "Server: Minimal system to get a running Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
#, fuzzy
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "正在設定虛擬機器..."
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
msgid "KVM Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
msgid "KVM server"
msgstr ""
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
msgid "KVM tools"
msgstr ""
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
msgid "libvirt LXC containers"
msgstr ""
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
msgid "libvirt LXC daemon"
msgstr ""
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
msgid "Software to connect to Virtualization server"
msgstr ""
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
#, fuzzy
msgid "Virtualization client tools"
msgstr "已安裝 Hypervisor 與工具。"
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
msgid "Xen Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
msgid "Xen server"
msgstr ""
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
msgid "Xen tools"
msgstr ""
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
#, fuzzy
msgid "Package installation failed\n"
msgstr "安裝即將中止。"
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
#, fuzzy
msgid "Package installation failed for lxc\n"
msgstr "安裝即將中止。"
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
msgid "Package installation failed for sled client pattern\n"
msgstr ""
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
msgid "Package installation failed for sles patterns\n"
msgstr ""
#. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
msgid "Running in text mode. Install graphical components anyway?"
msgstr "在文字模式執行中。無論如何安裝圖形部分嗎?"
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
msgid "Checking packages..."
msgstr "正在檢查套件..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
msgid "Installing packages..."
msgstr "正在安裝套件..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
msgid "Cannot install required packages."
msgstr "無法安裝所需要的套件。"
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
#, fuzzy
msgid "Updating grub2 configuration files..."
msgstr "正在更新組態檔..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
msgid "Configuring Default Network Bridge..."
msgstr "正在設定預設網路橋接..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
msgid "Network Bridge."
msgstr "網路橋接。"
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr "<p>對於管理虛擬機器一般網路設定,建議使用網路橋接。</p><p>要設定一個預設網路橋接嗎?</p>"
@@ -213,31 +213,31 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
#, fuzzy
msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
msgstr "要安裝 Xen 客戶,重新開機並在開機載入器選單選擇 Xen 區段。\n"
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
#, fuzzy
msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
msgstr "要安裝 Xen 客戶,重新開機並在開機載入器選單選擇 Xen 區段。\n"
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
#, fuzzy
msgid "Xen Hypervisor and tools are installed."
msgstr "已安裝 Hypervisor 與工具。"
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
#, fuzzy
msgid "Virtualization client tools are installed."
msgstr "已安裝 Hypervisor 與工具。"
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
#, fuzzy
msgid "Libvirt LXC components are installed."
msgstr "已安裝 Hypervisor 與工具。"
Modified: trunk/yast/zh_TW/po/vpn.zh_TW.po
===================================================================
--- trunk/yast/zh_TW/po/vpn.zh_TW.po 2016-09-05 15:46:22 UTC (rev 96733)
+++ trunk/yast/zh_TW/po/vpn.zh_TW.po 2016-09-05 15:49:06 UTC (rev 96734)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2001-06-05 18:04+02:00\n"
"Last-Translator: 裴寒牧 <phm(a)a2e.de>\n"
"Language-Team: 中華 <nls-zh(a)suse.de>\n"
@@ -238,14 +238,14 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
#, fuzzy
#| msgid "The server name is already in configured."
msgid "The user name is already used."
msgstr "伺服器名稱已經設定。"
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
msgid "Cannot find a matching client connection."
msgstr ""
@@ -346,122 +346,122 @@
msgstr "是否要更換 CD 並重試?"
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
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
+#: src/lib/vpn/main_dialog.rb:365
msgid "Name"
msgstr "名稱"
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
msgid "Description"
msgstr "描述"
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
#, fuzzy
#| msgid "All networks"
msgid "All IPv6 networks (::/0)"
msgstr "所有網路"
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
#, fuzzy
#| msgid "Connection Management"
msgid "Connection name: "
msgstr "連線管理"
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
msgid "Type"
msgstr "類型"
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
#, fuzzy
#| msgid "Master Server"
msgid "Gateway (Server)"
msgstr "主伺服器"
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
#, fuzzy
#| msgid "Clients"
msgid "Client"
msgstr "用戶端"
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
#, fuzzy
#| msgid "Choose Scenario"
msgid "The scenario is"
msgstr "選擇方案"
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
#, fuzzy
#| msgid "You must select a certificate."
msgid "Secure communication with a certificate"
msgstr "必須選取憑證。"
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
#, fuzzy
#| msgid "&Edit Crypt File"
msgid "Edit Credentials"
msgstr "編輯加密檔案(&E)"
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
#, fuzzy
#| msgid "Server Requires Authentication"
msgid "The gateway requires authentication"
msgstr "伺服器需要驗證"
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
#, fuzzy
#| msgid "Read certificates"
msgid "By a certificate"
msgstr "讀取憑證"
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
#, fuzzy
#| msgid "Default &Gateway IP"
msgid "VPN gateway IP"
msgstr "預設閘道 IP 位址(&G)"
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -578,40 +578,40 @@
msgstr "LDAP 目錄中無法使用 %s 。"
#. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Failed to install IPSec packages."
msgstr "安裝需要的套件失敗。"
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
#, fuzzy
#| msgid "Failed to start the CUPS daemon"
msgid "Failed to start IPSec daemon."
msgstr "無法重新啟動 CUPS 精靈"
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
#, fuzzy
#| msgid "Failed to apply the settings to the system."
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr "套用設定到系統失敗。"
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
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
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
#, fuzzy
#| msgid "Failed to create the new map."
msgid "Failed to restart SuSE firewall."
msgstr "無法建立新的映射。"
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
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"
@@ -619,35 +619,35 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
#, fuzzy
#| msgid "Global Settings"
msgid "VPN Global Settings"
msgstr "全域設定"
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
#, fuzzy
#| msgid "Enable VPN Services"
msgid "Enable VPN (IPSec) daemon: %s"
msgstr "啟用 VPN 服務"
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
#, fuzzy
#| msgid "Create Client Connection"
msgid "Gateway and Connections"
msgstr "建立用戶端連接"
#. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
#, fuzzy
#| msgid "Read current connection setup"
msgid "A client connecting to "
1
0
05 Sep '16
Author: minton
Date: 2016-09-05 17:46:22 +0200 (Mon, 05 Sep 2016)
New Revision: 96733
Added:
trunk/yast/sr@Latn/po/journalctl.sr@Latn.po
Log:
sr@Latn merged
Added: trunk/yast/sr@Latn/po/journalctl.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/journalctl.sr@Latn.po (rev 0)
+++ trunk/yast/sr@Latn/po/journalctl.sr@Latn.po 2016-09-05 15:46:22 UTC (rev 96733)
@@ -0,0 +1,126 @@
+# Serbian translations for opensuse-i package.
+# Copyright (C) 2016 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the opensuse-i package.
+# Automatically generated, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: opensuse-i 18n\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"PO-Revision-Date: 2016-08-04 14:55+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: sr@Latn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr ""
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr ""
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr ""
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr ""
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr ""
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr ""
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr ""
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr ""
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr ""
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:116
+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/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr ""
1
0
03 Sep '16
Author: minton
Date: 2016-09-03 14:13:51 +0200 (Sat, 03 Sep 2016)
New Revision: 96732
Modified:
trunk/yast/sr@Latn/po/add-on.sr@Latn.po
trunk/yast/sr@Latn/po/auth-client.sr@Latn.po
trunk/yast/sr@Latn/po/auth-server.sr@Latn.po
trunk/yast/sr@Latn/po/autoinst.sr@Latn.po
trunk/yast/sr@Latn/po/base.sr@Latn.po
trunk/yast/sr@Latn/po/bootloader.sr@Latn.po
trunk/yast/sr@Latn/po/ca-management.sr@Latn.po
trunk/yast/sr@Latn/po/cio.sr@Latn.po
trunk/yast/sr@Latn/po/cluster.sr@Latn.po
trunk/yast/sr@Latn/po/control.sr@Latn.po
trunk/yast/sr@Latn/po/country.sr@Latn.po
trunk/yast/sr@Latn/po/crowbar.sr@Latn.po
trunk/yast/sr@Latn/po/dhcp-server.sr@Latn.po
trunk/yast/sr@Latn/po/dns-server.sr@Latn.po
trunk/yast/sr@Latn/po/docker.sr@Latn.po
trunk/yast/sr@Latn/po/drbd.sr@Latn.po
trunk/yast/sr@Latn/po/fcoe-client.sr@Latn.po
trunk/yast/sr@Latn/po/firewall.sr@Latn.po
trunk/yast/sr@Latn/po/firstboot.sr@Latn.po
trunk/yast/sr@Latn/po/fonts.sr@Latn.po
trunk/yast/sr@Latn/po/geo-cluster.sr@Latn.po
trunk/yast/sr@Latn/po/installation.sr@Latn.po
trunk/yast/sr@Latn/po/iscsi-client.sr@Latn.po
trunk/yast/sr@Latn/po/iscsi-lio-server.sr@Latn.po
trunk/yast/sr@Latn/po/kdump.sr@Latn.po
trunk/yast/sr@Latn/po/live-installer.sr@Latn.po
trunk/yast/sr@Latn/po/mail.sr@Latn.po
trunk/yast/sr@Latn/po/network.sr@Latn.po
trunk/yast/sr@Latn/po/nfs.sr@Latn.po
trunk/yast/sr@Latn/po/nis.sr@Latn.po
trunk/yast/sr@Latn/po/ntp-client.sr@Latn.po
trunk/yast/sr@Latn/po/packager.sr@Latn.po
trunk/yast/sr@Latn/po/pkg-bindings.sr@Latn.po
trunk/yast/sr@Latn/po/printer.sr@Latn.po
trunk/yast/sr@Latn/po/rdp.sr@Latn.po
trunk/yast/sr@Latn/po/rear.sr@Latn.po
trunk/yast/sr@Latn/po/registration.sr@Latn.po
trunk/yast/sr@Latn/po/reipl.sr@Latn.po
trunk/yast/sr@Latn/po/samba-client.sr@Latn.po
trunk/yast/sr@Latn/po/samba-server.sr@Latn.po
trunk/yast/sr@Latn/po/security.sr@Latn.po
trunk/yast/sr@Latn/po/services-manager.sr@Latn.po
trunk/yast/sr@Latn/po/snapper.sr@Latn.po
trunk/yast/sr@Latn/po/storage.sr@Latn.po
trunk/yast/sr@Latn/po/update.sr@Latn.po
trunk/yast/sr@Latn/po/users.sr@Latn.po
trunk/yast/sr@Latn/po/vm.sr@Latn.po
trunk/yast/sr@Latn/po/vpn.sr@Latn.po
Log:
sr@Latn merged
Modified: trunk/yast/sr@Latn/po/add-on.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/add-on.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/add-on.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2013-01-30 16:25+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -70,13 +70,14 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr ""
-#. error report
-#: src/clients/add-on_auto.rb:185
-msgid "Failed to add add-on product."
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
msgstr ""
+#. just report error
#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
+msgid "Failed to add add-on product."
msgstr ""
#. placeholder for unknown path
Modified: trunk/yast/sr@Latn/po/auth-client.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/auth-client.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/auth-client.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,1110 +17,1666 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
msgstr ""
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "User Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr ""
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr ""
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr ""
+
+#. Add an auth_to_local_names
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
+msgstr ""
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+msgid "Please enter realm name."
+msgstr ""
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+msgid "Authentication via Kerberos"
+msgstr ""
+
+#. LDAP tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:76
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:84
+msgid ""
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:92
+msgid ""
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:100
+msgid ""
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:108
+msgid ""
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:163
+msgid ""
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:176
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+msgid "Are you sure to delete realm %s?"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+msgid "Automatically Create Home Directory"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+msgid "All Authentication Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Delete Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+msgid "Change Settings"
+msgstr ""
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+msgid "User Logon Configuration"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:68
+msgid "LDAP/Kerberos Configuration"
+msgstr ""
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+msgid "Network Domain"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+msgid "Identity Domains"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+msgid "Name filter:"
+msgstr ""
+
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
msgid "None."
msgstr ""
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
msgid "Mandatory Parameters"
msgstr ""
-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
msgid "Optional Parameters"
msgstr ""
#. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
msgid "Please complete all of the following mandatory parameters:\n"
msgstr ""
+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
+msgid "Global Options"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:40
+msgid "Name switch"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Authentication"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
-msgid "Authentication Client Configuration"
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
msgstr ""
-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:68
-msgid "Enable SSSD daemon"
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:73
-msgid "Sections"
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:76
-msgid "New Service/Domain"
+#: src/lib/authui/sssd/main_dialog.rb:77
+msgid "Create Home Directory"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:77
-msgid "Delete Service/Domain"
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
msgstr ""
+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
+msgid "Join Domain"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:92
+msgid "Leave Domain"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+msgid "Service Options"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
+msgid "Domain Options"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
+
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
#. TRANSLATORS: Label of the area used to customise parameters.
#. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
-msgid "Customisation - %s"
+#: src/lib/authui/sssd/main_dialog.rb:172
+msgid "Options - %s"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
+#: src/lib/authui/sssd/main_dialog.rb:220
+msgid "Do you really wish to erase configuration for domain %s?"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
+#. Enable/disable SSSD daemon
+#: src/lib/authui/sssd/main_dialog.rb:252
+msgid ""
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
msgstr ""
-#. For the currently selected config section, render list of additional parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-msgid "More Parameters"
+#. Enable/disable NSS password database
+#: src/lib/authui/sssd/main_dialog.rb:284
+msgid ""
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:140
-msgid "Name filter:"
+#. Enable/disable NSS group database
+#: src/lib/authui/sssd/main_dialog.rb:302
+msgid ""
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
msgstr ""
-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
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"
-"Do you want to continue?"
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"Sudo data source has been globally enabled.\n"
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
msgstr ""
-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-msgid "You may not delete section SSSD."
+#. Enable/disable NSS automount database
+#: src/lib/authui/sssd/main_dialog.rb:342
+msgid ""
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:225
-msgid "Do you really wish to delete section %s?"
+#: src/lib/authui/sssd/main_dialog.rb:350
+msgid ""
+"Automount data source has been globally enabled.\n"
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
msgstr ""
+#. Enable/disable PAC responder
+#: src/lib/authui/sssd/main_dialog.rb:374
+msgid ""
+"MS-PAC data source has been globally enabled.\n"
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
+msgstr ""
+
#. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
msgid "Confirm parameter removal: "
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to continue?"
+"Do you still wish to remove the parameter?"
msgstr ""
#. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
-msgid "No domain enabled"
+#: src/lib/authui/sssd/main_dialog.rb:434
+msgid "No domain"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
msgid ""
-"No domain has been enabled in [sssd] \"domains\" parameter.\n"
-"SSSD will not start, and only local authentication will be available.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
+"SSSD will fail to start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
msgstr ""
-#. Render input box and dropdowns for service/domain creation
-#: src/lib/yauthclient/new_section_dialog.rb:49
-msgid "Would you like to enable another service or join a domain?"
+#. The frame is shown only if AD server can be discovered or is explicitly specified
+#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
+#: src/lib/authui/sssd/manage_ad_dialog.rb:68
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
msgstr ""
-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
msgstr ""
-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com)"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:64
-msgid "Identification provider:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:69
-msgid "Authentication provider:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
msgstr ""
-#. Create new service
-#: src/lib/yauthclient/new_section_dialog.rb:105
-msgid "There are no more services to be enabled."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
msgstr ""
-#. Create new domain
-#: src/lib/yauthclient/new_section_dialog.rb:123
-msgid "Please enter a name for the new domain."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+msgid ""
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:126
-msgid "The domain name is already in-use."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
msgstr ""
-#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
msgstr ""
-#: src/lib/yauthclient/params.rb:114
-msgid "Comma separated list of services that are started when sssd itself starts."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
msgstr ""
-#: src/lib/yauthclient/params.rb:115
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
msgid ""
+"Enrollment has completed successfully!\n"
"\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+"Command output:\n"
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"
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+msgid ""
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
msgstr ""
-#: 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."
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
msgstr ""
-#: src/lib/yauthclient/params.rb:126
-msgid "This parameter contains the list of domains in the order these will be queried."
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
msgstr ""
-#: 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"
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
msgstr ""
-#: src/lib/yauthclient/params.rb:143
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
msgstr ""
-#: 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."
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com)"
msgstr ""
+#: src/lib/authui/sssd/new_section_dialog.rb:78
+msgid "Which service provides identity data, such as user names and group memberships?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
+msgid "Enable the domain"
+msgstr ""
+
+#. Create new domain
+#: src/lib/authui/sssd/new_section_dialog.rb:106
+msgid "Please enter the domain name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:109
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:112
+msgid "The domain name is already in-use."
+msgstr ""
+
+#. Define Global Parameters
+#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:119
+msgid "The regular expression parses user name and domain name into components"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:123
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:127
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:131
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:135
+msgid "A default domain name for all names without a domian name component"
+msgstr ""
+
#. Define Global Services Parameters
-#: 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."
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
+#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
+#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
msgstr ""
-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
msgid "Add a timestamp to the debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
msgid "Add microseconds to the timestamp in debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
+#: src/lib/authui/sssd/params.rb:161
+msgid "Timeout in seconds between heartbeats for this service"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:171
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:176
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:181
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
msgstr ""
-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/yauthclient/params.rb:202
+#: src/lib/authui/sssd/params.rb:198
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 ""
-#: src/lib/yauthclient/params.rb:207
+#: src/lib/authui/sssd/params.rb:203
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 ""
-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
msgid "Exclude certain users from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
msgid "If you want filtered user to still be group members set this option to false."
msgstr ""
-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr ""
-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr ""
-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
msgid "Override the login shell for all users."
msgstr ""
-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
msgid "Restrict user shell to one of the listed values."
msgstr ""
-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
msgid "Replace any instance of these shells with the shell_fallback"
msgstr ""
-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr ""
-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr ""
-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:291
+#: src/lib/authui/sssd/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 ""
#. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
msgid "Display a warning N days before the password expires."
msgstr ""
-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr ""
-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: src/lib/authui/sssd/params.rb:325
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr ""
-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr ""
-#: src/lib/yauthclient/params.rb:330
+#: src/lib/authui/sssd/params.rb:342
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr ""
-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr ""
-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/yauthclient/params.rb:355
+#: src/lib/authui/sssd/params.rb:371
msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
msgstr ""
-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/yauthclient/params.rb:401
+#: src/lib/authui/sssd/params.rb:417
msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
msgid "The identification provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:413
+#: src/lib/authui/sssd/params.rb:429
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 ""
-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
msgstr ""
-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
msgid "The access control provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
msgid "The provider which should handle change password operations for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
msgid "The SUDO provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
msgid "The provider which should handle loading of selinux settings."
msgstr ""
-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
msgid "The provider which should handle fetching of subdomains."
msgstr ""
-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
msgid "The autofs provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
msgid "The provider used for retrieving host identity information."
msgstr ""
-#: src/lib/yauthclient/params.rb:466
+#: src/lib/authui/sssd/params.rb:482
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr ""
-#: src/lib/yauthclient/params.rb:471
+#: src/lib/authui/sssd/params.rb:487
msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
msgstr ""
-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr ""
-#: src/lib/yauthclient/params.rb:482
+#: src/lib/authui/sssd/params.rb:498
msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr ""
-#: src/lib/yauthclient/params.rb:486
+#: src/lib/authui/sssd/params.rb:502
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr ""
-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr ""
-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:516
msgid "Treat user and group names as case sensitive."
msgstr ""
-#: src/lib/yauthclient/params.rb:500
+#: src/lib/authui/sssd/params.rb:521
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 ""
-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:526
msgid "Use this homedir as default value for all subdomains within this domain."
msgstr ""
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:532
msgid "Comma separated list of users who are allowed to log in."
msgstr ""
-#: src/lib/yauthclient/params.rb:516
+#: src/lib/authui/sssd/params.rb:537
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:521
+#: src/lib/authui/sssd/params.rb:542
msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr ""
#. 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/lib/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:551
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:556
msgid "Indicate if a home directory should be created by default for new users."
msgstr ""
-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:561
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr ""
-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:566
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:550
+#: src/lib/authui/sssd/params.rb:571
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 ""
-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:576
msgid "The mail spool directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:580
msgid "The command that is run after a user is removed."
msgstr ""
#. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:589
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:595
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:601
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr ""
-#: src/lib/yauthclient/params.rb:579
+#: src/lib/authui/sssd/params.rb:606
msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr ""
-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
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 ""
-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:624
msgid "Base DN for LDAP search"
msgstr ""
-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:631
msgid "LDAP schema type"
msgstr ""
-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:635
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:641
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:645
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:650
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:655
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:660
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:665
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:670
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:675
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:680
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:685
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:690
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:673
+#: src/lib/authui/sssd/params.rb:700
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 ""
-#: src/lib/yauthclient/params.rb:678
+#: src/lib/authui/sssd/params.rb:705
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 ""
-#: src/lib/yauthclient/params.rb:683
+#: src/lib/authui/sssd/params.rb:710
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 ""
-#: src/lib/yauthclient/params.rb:688
+#: src/lib/authui/sssd/params.rb:715
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 ""
-#: src/lib/yauthclient/params.rb:693
+#: src/lib/authui/sssd/params.rb:720
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 ""
-#: src/lib/yauthclient/params.rb:698
+#: src/lib/authui/sssd/params.rb:725
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 ""
-#: src/lib/yauthclient/params.rb:703
+#: src/lib/authui/sssd/params.rb:730
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 ""
-#: src/lib/yauthclient/params.rb:708
+#: src/lib/authui/sssd/params.rb:735
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 ""
-#: src/lib/yauthclient/params.rb:713
+#: src/lib/authui/sssd/params.rb:740
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 ""
-#: src/lib/yauthclient/params.rb:718
+#: src/lib/authui/sssd/params.rb:745
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 ""
-#: src/lib/yauthclient/params.rb:723
+#: src/lib/authui/sssd/params.rb:750
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:755
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:760
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:738
+#: src/lib/authui/sssd/params.rb:765
msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:770
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr ""
-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:774
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/yauthclient/params.rb:752
+#: src/lib/authui/sssd/params.rb:779
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 ""
-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:780
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:785
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr ""
-#: src/lib/yauthclient/params.rb:763
+#: src/lib/authui/sssd/params.rb:790
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 ""
-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:795
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:800
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/yauthclient/params.rb:778
+#: src/lib/authui/sssd/params.rb:805
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 ""
-#: src/lib/yauthclient/params.rb:783
+#: src/lib/authui/sssd/params.rb:810
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 ""
-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:820
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:825
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:830
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:835
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:840
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:845
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:850
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:829
+#: src/lib/authui/sssd/params.rb:856
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 ""
-#: src/lib/yauthclient/params.rb:835
+#: src/lib/authui/sssd/params.rb:862
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 ""
-#: src/lib/yauthclient/params.rb:841
+#: src/lib/authui/sssd/params.rb:868
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 ""
-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:874
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:880
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:885
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:890
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:895
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:905
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:910
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr ""
-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:915
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:920
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:899
+#: src/lib/authui/sssd/params.rb:926
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/yauthclient/params.rb:904
+#: src/lib/authui/sssd/params.rb:931
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 ""
-#: src/lib/yauthclient/params.rb:909
+#: src/lib/authui/sssd/params.rb:936
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 ""
-#: src/lib/yauthclient/params.rb:914
+#: src/lib/authui/sssd/params.rb:941
msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr ""
-#: src/lib/yauthclient/params.rb:919
+#: src/lib/authui/sssd/params.rb:946
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr ""
-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:951
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr ""
-#: src/lib/yauthclient/params.rb:929
+#: src/lib/authui/sssd/params.rb:956
msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr ""
-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:961
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/yauthclient/params.rb:938
+#: src/lib/authui/sssd/params.rb:965
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr ""
-#: src/lib/yauthclient/params.rb:943
+#: src/lib/authui/sssd/params.rb:970
msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:977
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:981
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr ""
-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:985
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr ""
-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:993
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:998
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:1003
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr ""
-#: src/lib/yauthclient/params.rb:981
+#: src/lib/authui/sssd/params.rb:1008
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 ""
-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1012
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1017
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1022
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:1000
+#: src/lib/authui/sssd/params.rb:1027
msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr ""
-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1032
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1037
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1042
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1047
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1052
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1057
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1034
+#: src/lib/authui/sssd/params.rb:1061
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1039
+#: src/lib/authui/sssd/params.rb:1066
msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
msgstr ""
-#: src/lib/yauthclient/params.rb:1044
+#: src/lib/authui/sssd/params.rb:1071
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 ""
-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1076
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1082
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1087
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/yauthclient/params.rb:1065
+#: src/lib/authui/sssd/params.rb:1092
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr ""
-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1105
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1109
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 ""
-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1114
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr ""
-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1128
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1133
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1138
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr ""
-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1143
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1148
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1126
+#: src/lib/authui/sssd/params.rb:1153
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 ""
-#: src/lib/yauthclient/params.rb:1130
+#: src/lib/authui/sssd/params.rb:1157
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1134
+#: src/lib/authui/sssd/params.rb:1161
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1165
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1170
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1174
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1179
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1191
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1196
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1173
+#: src/lib/authui/sssd/params.rb:1200
msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1209
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:1194
+#: src/lib/authui/sssd/params.rb:1222
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1199
+#: src/lib/authui/sssd/params.rb:1227
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1240
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1217
+#: src/lib/authui/sssd/params.rb:1245
msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1257
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1262
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1238
-msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1272
msgid "The automounter location this IPA client will be using."
msgstr ""
-#: src/lib/yauthclient/params.rb:1248
+#: src/lib/authui/sssd/params.rb:1277
msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
msgstr ""
-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1282
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1286
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
-
-#. 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:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr ""
-
-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr ""
-
-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr ""
-
-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr ""
Modified: trunk/yast/sr@Latn/po/auth-server.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/auth-server.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/auth-server.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -435,12 +435,12 @@
msgid "Configure Account for Replication"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
msgid "is not a valid LDAP DN"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
msgid "Password"
msgstr ""
@@ -466,8 +466,8 @@
msgid "Provider Details"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
msgid "Protocol"
msgstr ""
@@ -475,7 +475,7 @@
msgid "Provider Hostname"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
msgid "Use StartTLS"
msgstr ""
@@ -556,8 +556,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
msgid "The test returned the following error messages:"
msgstr ""
@@ -2190,7 +2190,7 @@
msgid "Index Cache (IDL cache)"
msgstr ""
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
msgid "Checkpoint Settings"
msgstr ""
@@ -2258,7 +2258,7 @@
msgstr ""
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
msgid "Password Policy Settings"
msgstr ""
@@ -2419,237 +2419,237 @@
msgstr ""
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
msgid "The error message was: '"
msgstr ""
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
msgid "Try again?"
msgstr ""
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
msgid "Available Attribute Types"
msgstr ""
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
msgid "Selected Attribute Types"
msgstr ""
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
msgid "Who should this rule apply to"
msgstr ""
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
msgid "Entry DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
msgid "Select"
msgstr ""
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
msgid "Define the Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
msgid "Stop access control evaluation here (default)"
msgstr ""
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
msgid "Continue with next access control rule (\"break\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
msgid "Continue evaluation of this rule (\"continue\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
msgid "Please enter a DN in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
msgid "Subtree DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
msgid "Group DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
msgid "Edit Access Control Rule"
msgstr ""
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
msgid "Target Objects"
msgstr ""
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
msgid "Matching the filter:"
msgstr ""
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
msgid "LDAP Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
msgid "Apply this rule only to the listed attribute"
msgstr ""
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
msgid "Attributes"
msgstr ""
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
msgid "Edit"
msgstr ""
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
msgid "Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
msgid "Who"
msgstr ""
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
msgid "DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
msgid "Flow Control"
msgstr ""
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
msgid "Up"
msgstr ""
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
msgid "Down"
msgstr ""
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
msgid "Enter valid a LDAP filter in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
msgid "You must add at least one item to the \"Access Level\" list."
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Target"
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
msgid "This database is a Replication Consumer."
msgstr ""
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
msgid "Provider Name"
msgstr ""
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
msgid "Port"
msgstr ""
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
msgid "Replication Type"
msgstr ""
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
msgid "Replication Interval"
msgstr ""
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
msgid "Days"
msgstr ""
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
msgid "Hours"
msgstr ""
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
msgid "Minutes"
msgstr ""
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
msgid "Seconds"
msgstr ""
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
msgid "Authentication DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
msgid "Custom update referral"
msgstr ""
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
msgid "Target Host"
msgstr ""
#. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
msgid "Invalid replication interval specified"
msgstr ""
#. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
msgid "Checking LDAP connectivity to the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
msgid "Do you still want to continue?"
msgstr ""
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr ""
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
msgid "Enable ldapsync provider for this database"
msgstr ""
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
msgid "Operations"
msgstr ""
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
msgid "Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
msgid "Enable Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
msgid "Replication Settings"
msgstr ""
Modified: trunk/yast/sr@Latn/po/autoinst.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/autoinst.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/autoinst.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: YaST2 (autoinst)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-04-18 14:14+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -28,7 +28,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
#, fuzzy
msgid "This may take a while"
msgstr "Ovo može potrajati..."
@@ -49,14 +49,13 @@
#. command line options
#. Init variables
-#. Import users configuration from the profile
-#.
+#. unique id
#. 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:410
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
@@ -268,7 +267,7 @@
# Help text for last dialog of base installation
#. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -280,74 +279,58 @@
# Progress bar that displays overall progress in this dialog
#. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
msgid "Progress"
msgstr "Napredak"
# Dialog title for SuSEconfig dialog
#. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
msgid "Configuring System according to auto-install settings"
msgstr "Konfiguracija sistema u skladu sa auto-install podešavanjima"
#. 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."
+#: src/clients/inst_autoconfigure.rb:94
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>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:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
msgid "Configuring %1"
msgstr "Konfigurisanje %1"
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
msgid "Not Configuring %1"
msgstr "Ne konfigurisati %1"
#. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
msgid "Executing Post-Scripts"
msgstr "Izvršavanje Post-skripti"
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
+#. Do not restart NetworkManager* services
+#. bnc#955260
#: src/clients/inst_autoconfigure.rb:304
msgid "Restarting all running services"
msgstr ""
-#: src/clients/inst_autoconfigure.rb:327
+#. Filtering out all services which must not to be restarted
+#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr ""
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
msgid "Finishing Configuration"
msgstr "Završavanje Konfiguracije"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:447
#, fuzzy
#| msgid "Processing Profiles and Rules"
msgid "Processing resource %1"
@@ -406,8 +389,15 @@
"%1"
msgstr ""
-#. import "Arch";
#. encoding: utf-8
+#. File: clients/inst_autoinit.ycp
+#. Package: Auto-installation
+#. Summary: Parses XML Profile for automatic installation
+#. Authors: Anas Nashif <nashif(a)suse.de>
+#.
+#. $Id$
+#.
+#. encoding: utf-8
#. File: clients/autoinst_post.ycp
#. Package: Auto-installation
#. Author: Anas Nashif <nashif(a)suse.de>
@@ -415,7 +405,7 @@
#. the system as described in the profile file.
#.
#. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
msgid ""
"<p>\n"
"Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -423,62 +413,48 @@
"<p>\n"
"Molimo pričekajte dok se vaš hard disk priprema za autoinstalaciju.</p>\n"
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
#, fuzzy
msgid "Probe hardware"
msgstr "Detekcija hardvera"
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
msgid "Retrieve & Read Control File"
msgstr "Vraćanje & čitanje kontrolnih datoteka"
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
msgid "Parse control file"
msgstr "Analiza kontrolne datoteke"
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
msgid "Initial Configuration"
msgstr "Prvobitno podešavanje"
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
msgid "Preparing System for Automatic Installation"
msgstr "Pripremanje sistema za automatsku instalaciju"
#. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
#, fuzzy
msgid "Preprobing stage"
msgstr "Štampaj probnu stranu"
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
#, fuzzy
msgid "Probing hardware..."
msgstr "Detekcija Hardvera"
+#. 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_autoinit.rb:128
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+
#. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
msgid "Parsing control file"
msgstr "Analiza kontrolne datoteke"
@@ -532,64 +508,74 @@
#. Uwe Gansert <ug(a)suse.de>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr ""
"<p>\n"
"Molimo pričekajte dok se vaš hard disk priprema za instalaciju.\n"
"<br></p>"
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
msgid "Execute pre-install user scripts"
msgstr "Izvršiti pre-install korisničkih skripti"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
msgid "Configure General Settings "
msgstr "Konfigurisanje Opštih setovanja"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
#, fuzzy
msgid "Set up language"
msgstr "Izaberite vaš jezik"
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:58
msgid "Create partition plans"
msgstr "Pravljenje planova particionisanja"
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
msgid "Configure Bootloader"
msgstr "Konfigurisanje BootLoder-a"
# push button label
# push button label
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
#, fuzzy
#| msgid "Reset Confi&guration"
msgid "Registration"
msgstr "Resetovanje podešavanja"
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure Software selections"
msgstr "Podešavanje izbora programa"
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:62
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:63
#, fuzzy
msgid "Configure users and groups"
msgstr "Grupa Volumena"
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "Podešavanje diskova"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
msgid "Executing pre-install user scripts..."
msgstr "Izvršavanje pre-install korisničkih skripti..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configuring general settings..."
msgstr "Konfigurisanje Opštih setovanja"
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
#, fuzzy
msgid "Setting up language..."
msgstr "Izaberite vaš jezik"
@@ -598,17 +584,17 @@
msgid "Creating partition plans..."
msgstr "Pravljenje planova particionisanja..."
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
msgid "Configuring Bootloader..."
msgstr "Konfigurisanje BootLoder-a"
# label
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
#, fuzzy
msgid "Registering the system..."
msgstr "Provera fajl sistema..."
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring Software selections..."
msgstr "Podešavanje selekcije programa..."
@@ -621,7 +607,17 @@
msgid "Importing users and groups configuration..."
msgstr ""
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+msgid "Importing SSH keys/settings..."
+msgstr "Unosim početnu datoteku"
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+msgid "Confirming License..."
+msgstr "Konfigurisanje Jezika"
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
msgid "Preparing System for Automated Installation"
msgstr "Pripremanje sistema za automatsku instalaciju"
@@ -630,20 +626,20 @@
#. while the general inst_finish process at the end of the
#. first stage. But for the installation workflow the linuxrc
#. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#: src/clients/inst_autosetup.rb:185
msgid "Handling Add-On Products..."
msgstr ""
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
#, fuzzy
msgid "Configuring language..."
msgstr "Konfigurisanje Jezika"
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:298
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -651,8 +647,9 @@
"Greška tokom konfiguracije particije.\n"
"Da pokušam još jednom.\n"
-#. Software
-#: src/clients/inst_autosetup.rb:344
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -732,11 +729,11 @@
#. Select packages
#. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
msgid "Software Selection"
msgstr "Izbor Software-a"
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
msgid ""
"<p>\n"
"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
@@ -751,19 +748,19 @@
#. AutoinstSoftware::pmInit();
#. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
#. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
msgstr ""
-#: src/clients/software_auto.rb:128
+#: src/clients/software_auto.rb:129
msgid "The inst-source of this system (you can't create images if you choose this)"
msgstr ""
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
msgid "using that installation source failed"
msgstr ""
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
msgid "Reading package database..."
msgstr "Čitam bazu paketa..."
@@ -1043,6 +1040,11 @@
msgid "Volgroup device name"
msgstr ""
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
#. Shows a dialog when 'control file' can't be found
#. @param [String] original Original value
#. @return [String] new value
@@ -1686,7 +1688,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
#, fuzzy
msgid "Checking XML with RNG validation..."
msgstr "Proveravanje XML sa DTD utvrđivanjem"
@@ -1697,7 +1699,7 @@
msgstr ""
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
#, fuzzy
msgid "Checking XML with RNC validation..."
msgstr "Proveravanje XML sa DTD utvrđivanjem"
@@ -2088,76 +2090,6 @@
"particije za početak.\n"
"</p>\n"
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr ""
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr ""
-
-# error report
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-#, fuzzy
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "Pravljenje sistema datoteka neuspešno."
-
-# error report
-#: src/include/autoinstall/io.rb:175
-#, fuzzy
-msgid "Reading file on %1 failed.\n"
-msgstr "Pravljenje sistema datoteka neuspešno."
-
-#. 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:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-#, fuzzy
-msgid "Mounting %1 failed."
-msgstr "Komanda %1 neuspesna"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr ""
-
-#. 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:316 src/include/autoinstall/io.rb:360
-#, fuzzy
-msgid "Remote file %1 cannot be retrieved"
-msgstr "Direktorijum %1 ne može biti kreiran.\n"
-
-#. this is workaround for bnc#849767
-#. 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:485
-msgid "%1 is not mounted and mount failed"
-msgstr ""
-
-# error popup - mount failed, %1 is device file name (e.g. /dev/fd0)
-#. autoyast tried to copy a file but that file can't be found
-#: src/include/autoinstall/io.rb:505
-#, fuzzy
-msgid "File %1 cannot be found"
-msgstr "Disketni uređaji se ne mogu montirati:<br>%1"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr ""
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-#, fuzzy
-msgid "Unknown protocol %1."
-msgstr "Nepoznat štampač %1"
-
#. Script Configuration
#. @return script configuration dialog
#: src/include/autoinstall/script_dialogs.rb:30
@@ -2410,12 +2342,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:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr ""
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
#, fuzzy
msgid ""
"\n"
@@ -2432,7 +2364,7 @@
#. The line above needs to be fixed when we have more attributes
#. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:278
+#: src/modules/AutoinstConfig.rb:279
#, fuzzy
#| msgid "Check Profile Validity"
msgid "Choose Profile"
@@ -2440,39 +2372,39 @@
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:335
msgid "Retrieving control file from floppy."
msgstr "Pronalaženje kontrolne datoteke na disketi."
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "Pronalaženje kontrolne datoteke (%1) na TFTP serveru: %2"
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "Pronalaženje kontrolne datoteke (%1) na NFS serveru: %2"
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "Pronalaženje kontrolne datoteke (%1) na HTTP serveru: %2"
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:356
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "Pronalaženje kontrolne datoteke (%1) na FTP serveru: %2"
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:362
msgid "Copying control file from file: %1."
msgstr "Kopiranje kontrolne datoteke iz datoteke: %1."
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:367
msgid "Copying control file from device: /dev/%1."
msgstr "Kopiranje kontrolne datoteke sa uređaja: /dev/%1."
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:371
msgid "Copying control file from default location."
msgstr "Kopiranje kontrolne datoteke iz podrazumevane lokacije."
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:373
msgid "Source unknown."
msgstr "Nepoznata izvorna lokacija."
@@ -2482,14 +2414,14 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:453
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
"configured using the configuration management system.</p>\n"
msgstr ""
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:458
msgid ""
"<p>Most of the modules used to create the configuration are identical to those available\n"
"through the YaST Control Center. Instead of configuring this system, the data\n"
@@ -2498,7 +2430,7 @@
"</p>\n"
msgstr ""
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:465
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2608,21 +2540,21 @@
msgstr ""
#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
+#: src/modules/AutoinstGeneral.rb:419
msgid "Syncing time..."
msgstr ""
#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
+#: src/modules/AutoinstGeneral.rb:421
msgid "Syncing time with %s."
msgstr ""
-#: src/modules/AutoinstGeneral.rb:420
+#: src/modules/AutoinstGeneral.rb:425
#, fuzzy
msgid "Time syncing failed."
msgstr "Komanda %1 neuspesna"
-#: src/modules/AutoinstGeneral.rb:424
+#: src/modules/AutoinstGeneral.rb:429
msgid "Cannot update system time."
msgstr ""
@@ -2643,45 +2575,45 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
msgid "Drives"
msgstr "Diskovi"
#. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
msgid "%s drive in total"
msgid_plural "%s drives in total"
msgstr[0] ""
msgstr[1] ""
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
msgid "Not yet cloned."
msgstr ""
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
#, fuzzy
msgid "Preinstallation Scripts"
msgstr "Podešavanja Instalacije"
# text entry
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
#, fuzzy
msgid "Postinstallation Scripts"
msgstr "Postavi Start skriptu"
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
msgid "Chroot Scripts"
msgstr "Chroot skripte"
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
#, fuzzy
msgid "Init Scripts"
msgstr "Post skripte"
# text entry
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
#, fuzzy
msgid "Postpartitioning Scripts"
msgstr "Postavi Start skriptu"
@@ -2689,38 +2621,38 @@
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
msgid "Pre"
msgstr "Pre"
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
msgid "Post"
msgstr "Posle"
# Text entry label
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
#, fuzzy
msgid "Init"
msgstr "Init &1"
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
msgid "Chroot"
msgstr "Chroot"
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
#, fuzzy
#| msgid "Partitioning"
msgid "Postpartitioning"
msgstr "Particionisanje"
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
msgid "Unknown"
msgstr "Nepoznato"
# label text
# label text
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:174
#, fuzzy
msgid ""
"These packages could not be found in the software repositories:\n"
@@ -2730,26 +2662,26 @@
# error report
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
#, fuzzy
msgid "Adding repo %1 failed"
msgstr "Pravljenje sistema datoteka neuspešno."
#. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:377
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:385
msgid "Creating Image - installing packages"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:395
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:404
+#: src/modules/AutoinstSoftware.rb:406
#, fuzzy
#| msgid "Retrieving image file..."
msgid "Store image to ..."
@@ -2757,54 +2689,54 @@
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:435
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:447
+#: src/modules/AutoinstSoftware.rb:449
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:456
#, fuzzy
#| msgid "File %1 was saved successfully."
msgid "Image created successfully"
msgstr "Datoteka %1 je uspešno snimljena."
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:492
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:524
+#: src/modules/AutoinstSoftware.rb:526
msgid "can not read '%1'. Try again?"
msgstr ""
#. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:544
msgid "can not read '%1'. ISO creation failed"
msgstr ""
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:574
msgid "Preparing ISO Filestructure ..."
msgstr ""
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:623
msgid "boot config for the DVD"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:627
msgid "Ok"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:630
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."
@@ -2812,48 +2744,48 @@
#. 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:647
+#: src/modules/AutoinstSoftware.rb:649
msgid "Store ISO image to ..."
msgstr ""
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:650
msgid "Creating ISO File ..."
msgstr ""
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:671
msgid "ISO successfully created at %1"
msgstr ""
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:753
#, fuzzy
msgid "Selected Patterns"
msgstr "Pronađeni štampači:"
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:763
msgid "Individually Selected Packages"
msgstr "Individualno selektovani paketi"
# summary text heading
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:769
#, fuzzy
msgid "Packages to Remove"
msgstr "Paketi za obnavljanje"
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:776
#, fuzzy
msgid "Force Kernel Package"
msgstr "Trenutni Paket"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:871
#, fuzzy
msgid "Could not set patterns: %1."
msgstr "Ne mogu postaviti osnovnu selekciju: %1"
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:932
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr ""
@@ -2901,7 +2833,7 @@
# Routing dialog caption
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:363
#, fuzzy
msgid "Collecting configuration data..."
msgstr "Podešavanje rutiranja"
@@ -2909,7 +2841,7 @@
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:466
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr ""
@@ -2917,7 +2849,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:540
#, fuzzy
#| msgid "Could not set base selection: %1"
msgid "Could not write section %1 to file %2."
@@ -2926,7 +2858,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
@@ -2947,6 +2879,33 @@
msgid "&OK"
msgstr "U redu"
+# error report
+#, fuzzy
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "Pravljenje sistema datoteka neuspešno."
+
+# error report
+#, fuzzy
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "Pravljenje sistema datoteka neuspešno."
+
+#, fuzzy
+#~ msgid "Mounting %1 failed."
+#~ msgstr "Komanda %1 neuspesna"
+
+#, fuzzy
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "Direktorijum %1 ne može biti kreiran.\n"
+
+# error popup - mount failed, %1 is device file name (e.g. /dev/fd0)
+#, fuzzy
+#~ msgid "File %1 cannot be found"
+#~ msgstr "Disketni uređaji se ne mogu montirati:<br>%1"
+
+#, fuzzy
+#~ msgid "Unknown protocol %1."
+#~ msgstr "Nepoznat štampač %1"
+
#~ msgid "Processing Profiles and Rules"
#~ msgstr "Obrada profila i pravila"
@@ -3058,9 +3017,6 @@
#~ "Za više informacije pročitajte dokumentaciju.\n"
#~ "</P>\n"
-#~ msgid "Configure Drives"
-#~ msgstr "Podešavanje diskova"
-
#~ msgid "&Drive"
#~ msgstr "&Disk"
Modified: trunk/yast/sr@Latn/po/base.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/base.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/base.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-25 20:17+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -79,28 +79,28 @@
msgstr ""
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
msgid "Use 'help' for a complete list of available commands."
msgstr "Koristi 'pomoć' za kompletnu listu raspoloživih komandi."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
msgid "Use 'yast2 %1 help' for a complete list of available commands."
msgstr "Koristi 'yast2 %1 pomoć' za kompletnu listu raspoloživih komandi."
#. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
msgid "Unknown Command: %1"
msgstr "Nepoznata komanda: %1"
#. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
msgid "Option '%1' is missing value."
msgstr "Opcija '%1' je nedostajuća vrednost."
# translators: error message, %1 is a command, %2 is the wrong option given by the user
#. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
msgid "Unknown option for command '%1': %2"
msgstr "Nepoznata opcija za komandu '%1': %2"
@@ -108,21 +108,21 @@
#. 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:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
msgid "Invalid value for option '%1': %2"
msgstr "Nepravilna vrednost opcije '%1': %2"
# translators: error message, %2 is expected type, %3 is the value given
#. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
msgid "Invalid value for option '%1' -- expected '%2', received %3"
msgstr "Nepravilna vrednost za opciju '%1' -- očekivana '%2', primljena %3"
# translators: error message if option has a value, but cannot have one
#. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
msgid "Option '%1' cannot have a value. Given value: %2"
msgstr "Opcija '%1' ne može da ima vrednost. Data vrednost: %2"
@@ -130,7 +130,7 @@
# %1 is the module name, %2 is the action name
#. 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:541
+#: library/commandline/src/modules/CommandLine.rb:533
msgid "Use '%1 %2 help' for a complete list of available options."
msgstr "Koristiti '%1 %2 pomoć' za kompletnu listu raspoloživih opcija."
@@ -138,18 +138,18 @@
# %1 is the module name, %2 is the action name
#. 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:551
+#: library/commandline/src/modules/CommandLine.rb:543
msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
msgstr "Koristiti 'yast2 %1 %2 pomoć' za kompletnu listu raspoloživih opcija."
# translators: command line interface header, %1 is identification of the module
#. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
msgid "YaST Configuration Module %1\n"
msgstr "YaST Konfiguracioni Modul %1\n"
#. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
msgid "No help available"
msgstr "Nema raspoložive pomoći"
@@ -157,13 +157,13 @@
# translators: %1 is the command name
#. Process <command> "help"
#. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
msgid "Command '%1'"
msgstr "Komanda '%1'"
# translators: command line options
#. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
msgid ""
"\n"
" Options:"
@@ -172,14 +172,14 @@
" Opcije:"
#. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
msgid ""
"\n"
" Options of the [string] type must be written in the form 'option=value'."
msgstr ""
#. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
msgid ""
"\n"
" Example:"
@@ -189,14 +189,14 @@
# translators: default module description if none is provided by the module itself
#. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
#, fuzzy
#| msgid "This is a YaST2 module."
msgid "This is a YaST module."
msgstr "Ovo je YaST2 modul."
#. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
msgid "Basic Syntax:"
msgstr "Osnovna sintaksa:"
@@ -204,7 +204,7 @@
# translate <command> and [options] only!
#. translators: module command line help, %1 is the module name
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
msgid " yast2 %1 <command> [verbose] [options]"
msgstr " yast2 %1 <komanda> [verbose] [opcija]"
@@ -212,7 +212,7 @@
# translate <command> only!
#. translators: module command line help, %1 is the module name
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
msgid " yast2 %1 <command> help"
msgstr " yast2 %1 <komanda> help"
@@ -220,7 +220,7 @@
# translate <command> and [options] only!
#. translators: module command line help
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
msgid " <command> [options]"
msgstr " <komanda> [opcija]"
@@ -228,103 +228,103 @@
# translate <command> only!
#. translators: module command line help
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
msgid " <command> help"
msgstr " <komanda> help"
#. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
msgid "Commands:"
msgstr "Komande:"
#. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
msgid "No help available."
msgstr "Nema raspoložive pomoći."
#. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
msgid "<Error: invalid help>"
msgstr ""
#. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
msgid "Run 'yast2 %1 <command> help' for a list of available options."
msgstr "Pokreni 'yast2 %1 <komanda> help' za listu raspoloživih opcija."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
+#: library/commandline/src/modules/CommandLine.rb:930
msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option."
msgstr ""
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
+#: library/commandline/src/modules/CommandLine.rb:942
msgid "Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> command line option."
msgstr ""
# translators: fallback name for a module at command line
#. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
msgid "unknown"
msgstr "nepoznato"
#. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
msgid "or '%1'"
msgstr "ili '%1'"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
msgid "Specify the command '%1'."
msgstr "Definišite komandu '%1'."
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
msgid "Specify one of the commands: %1."
msgstr "Definišite jednu od komandi: %1."
# size( unique_options ) == 1 here does not make sense
#. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
msgid "Specify only one of the commands: %1."
msgstr "Definišite samo jednu od komandi: %1."
#. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
msgid "There is no user interface available for this module."
msgstr "Ne postoji raspoloživi korisnički interfejs za ovaj modul."
#. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
msgid "Ready"
msgstr "Spreman"
#. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
msgid "Initializing"
msgstr ""
"YaST2\n"
"Inicijalizujem ..."
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
msgid "Finishing"
msgstr "&Završavam"
#. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
msgid "Done"
msgstr "Urađen"
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
msgid "Quitting (without changes)"
msgstr "Napuštanje (bez promena)"
# label text
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
#, fuzzy
msgid "yes or no?"
msgstr "bajtova po &inode"
@@ -332,12 +332,12 @@
# table entry (value in the column "Configuration file")
# translate it either as True/False or Yes/No
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
msgid "yes"
msgstr "da"
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
msgid "no"
msgstr "ne"
@@ -427,7 +427,7 @@
#. 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:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1435
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr ""
@@ -445,7 +445,7 @@
#. from YaST logs.
#.
#. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
#, fuzzy
#| msgid "Abo&rt Installation"
msgid "Installation Error"
@@ -470,7 +470,7 @@
msgstr ""
#. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1244
msgid "No workflow defined for this installation mode."
msgstr ""
@@ -486,7 +486,7 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
msgid "&Continue Installation"
msgstr "&Nastavak Instalacije"
@@ -494,7 +494,7 @@
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
msgid "&Abort Installation"
msgstr "&Prekid Instalacije"
@@ -527,13 +527,13 @@
#. make sure that every workflow is merged only once
#. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
msgid "An internal error occurred when integrating additional workflow."
msgstr ""
# message popup, %1 is a label of some widget
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
msgid "The value of %1 is invalid."
msgstr "Vrednost %1 je nepravilna."
@@ -586,7 +586,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:255
#: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
#, fuzzy
msgid "During Boot"
msgstr "Prilikom pokretanja sistema"
@@ -598,7 +598,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:257
#: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
msgid "Manually"
msgstr "Ručno"
@@ -608,26 +608,26 @@
msgstr ""
#. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
msgid "Via &xinetd"
msgstr ""
#. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
#, fuzzy
msgid "Service Start"
msgstr "Servis"
# service status (running or stopped)
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
#, fuzzy
msgid "Service is running"
msgstr "Servis je ak&tivan."
# service status (running or stopped)
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
#, fuzzy
msgid "Service is not running"
msgstr "Servis je ak&tivan."
@@ -637,7 +637,7 @@
#. %1 is eg. "Start the Service Now"
#. %2 is eg. "Stop the Service Now"
#. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
#, fuzzy
msgid ""
"<p><b><big>Switch On or Off</big></b><br>\n"
@@ -651,7 +651,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:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
msgid ""
"<p>To save all changes and restart the\n"
"service immediately, use <b>%3</b>.</p>\n"
@@ -659,60 +659,60 @@
# progress stage label
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
#, fuzzy
msgid "Start the Service Now"
msgstr "Pokreni servise"
# progress stage label
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
#, fuzzy
msgid "Stop the Service Now"
msgstr "Zaustavi servise"
# menubutton entry, try to keep short
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
#, fuzzy
msgid "Save Changes and Restart Service Now"
msgstr "Snimi podešavanja i restartovanje DNS Servera"
# progress stage label
#. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
#, fuzzy
msgid "&Start the Service Now"
msgstr "Pokreni servise"
# progress stage label
#. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
#, fuzzy
msgid "S&top the Service Now"
msgstr "Zaustavi servise"
# menubutton entry, try to keep short
#. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
#, fuzzy
msgid "S&ave Changes and Restart Service Now"
msgstr "Snimi podešavanja i restartovanje DNS Servera"
#. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
msgid "Switch On and Off"
msgstr ""
#. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
#, fuzzy
msgid "Current Status: "
msgstr "Status:"
#. help text for LDAP enablement widget
#. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
msgid ""
"<p><b><big>LDAP Support</big></b><br>\n"
"To store the settings in LDAP instead of native configuration files,\n"
@@ -720,14 +720,14 @@
msgstr ""
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
#, fuzzy
msgid "LDAP Support Active"
msgstr "LDAP Server"
# text entry
#. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
#, fuzzy
msgid "&LDAP Support Active"
msgstr "&Ključ za podršku:"
@@ -742,7 +742,7 @@
#. push button
#. push button
#. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
#: library/cwm/src/modules/TablePopup.rb:940
#: library/general/src/modules/Label.rb:166
msgid "&Up"
@@ -752,7 +752,7 @@
# push button
#. push button
#. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
#: library/cwm/src/modules/TablePopup.rb:942
msgid "&Down"
msgstr "&Dole"
@@ -802,20 +802,20 @@
# command line error report
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
#, fuzzy
msgid "The TSIG key ID was not specified."
msgstr "Vrednost nije definisana."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
msgid ""
"The key with the specified ID exists and is used.\n"
"Remove it?"
msgstr ""
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
msgid ""
"A key with the specified ID was found\n"
"on your disk. Remove it?"
@@ -823,33 +823,33 @@
# yes-no popup
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
msgid "The key will be created now. Continue?"
msgstr "Ključ će sada biti kreiran. Nastaviti?"
# error report
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
#, fuzzy
msgid "Creating the TSIG key failed."
msgstr "Pravljenje sistema datoteka neuspešno."
# error report
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
#, fuzzy
msgid "The specified file does not exist."
msgstr "Navedena datoteka ne postoji ili je prazna."
# message popup
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
msgid "The specified file does not contain any TSIG key."
msgstr "Navedena datoteka ne sadrži nikakav TSIG ključ."
# yes-no popup
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
msgid ""
"The specified file contains a TSIG key with the same\n"
"identifier as some of already present keys.\n"
@@ -860,14 +860,14 @@
"Stari ključevi će biti obrisani. Nastaviti?"
#. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
msgid ""
"<p><big><b>TSIG Key Management</b></big><br>\n"
"Use this dialog to manage the TSIG keys.</p>\n"
msgstr ""
#. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
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"
@@ -875,7 +875,7 @@
msgstr ""
#. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
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"
@@ -884,7 +884,7 @@
msgstr ""
#. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
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"
@@ -897,33 +897,33 @@
# dialog caption:
# dialog caption:
#. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
#, fuzzy
msgid "Add an Existing TSIG Key"
msgstr "Promena Postojećeg NIS korisnika"
# push button
#. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
#, fuzzy
msgid "Create a New TSIG Key"
msgstr "Napravi &novi ključ"
#. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
#, fuzzy
msgid "&Key ID"
msgstr "&Tasteri"
#. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
#, fuzzy
msgid "&Generate"
msgstr "&Opšta Pomoć"
# menubutton item
#. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
#, fuzzy
msgid "Current TSIG Keys"
msgstr "Upravljanje &TSIG ključevima"
@@ -933,7 +933,7 @@
#. table header - GPG key ID
#. table header - GPG key ID
#. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
#: library/gpg/src/modules/GPGWidgets.rb:192
#: library/gpg/src/modules/GPGWidgets.rb:224
#: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -944,26 +944,26 @@
# table header
# table header
#. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
#, fuzzy
msgid "Filename"
msgstr "&Ime datoteke:"
# combobox header
#. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
msgid "&Selected Option"
msgstr "Izabrana Opcija"
# heading / label
#. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
msgid "Current Option: "
msgstr "Trenutna opcija:"
# error report
#. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
#, fuzzy
msgid "The selected option is already present."
msgstr "Selektovana opcija je već prisutna"
@@ -1037,21 +1037,21 @@
"po listi.</p>"
#. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
#, fuzzy
msgid "&Other"
msgstr "ostali"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
#, fuzzy
msgid "The device is not configured"
msgstr "SUSE firewall nije konfigurisan"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
#, fuzzy
msgid "Press <B>Edit</B> to configure"
msgstr "Štampači za konfigurisanje"
@@ -1217,9 +1217,85 @@
"<p>U nekim okruženjima, svim ili nekim\n"
"F tasteri nisu dostupni.</p>"
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+msgid "Restart After Saving Settings"
+msgstr ""
+
+#: library/general/src/lib/ui/service_status.rb:61
+msgid "Reload After Saving Settings"
+msgstr ""
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+#, fuzzy
+msgid "Service Status"
+msgstr "Servis"
+
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:129
+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_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</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
+#: library/general/src/lib/ui/service_status.rb:155
+#, fuzzy
+msgid "Current status:"
+msgstr "Status:"
+
+# ComboBox item
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:168
+#, fuzzy
+msgid "Start During System Boot"
+msgstr "Prilikom pokretanja sistema"
+
+# this string is usually used as headline of a popup
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:192
+#, fuzzy
+#| msgid "Warning"
+msgid "running"
+msgstr "Upozorenje"
+
+# Button label
+#: library/general/src/lib/ui/service_status.rb:194
+#, fuzzy
+#| msgid "&Stop"
+msgid "Stop now"
+msgstr "&Zaustavi"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:199
+msgid "stopped"
+msgstr ""
+
+#: library/general/src/lib/ui/service_status.rb:201
+msgid "Start now"
+msgstr ""
+
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
msgid ""
"Although the path %1 exists, it is not a directory.\n"
"Continue or cancel the operation?\n"
@@ -1227,7 +1303,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:306
+#: library/general/src/modules/FileUtils.rb:300
#, fuzzy
msgid ""
"The path %1 does not exist.\n"
@@ -1238,7 +1314,7 @@
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
msgid ""
"Failed to create the directory %1.\n"
"Continue or cancel the current operation?\n"
@@ -1442,7 +1518,7 @@
#. 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:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "Pre&skoči"
@@ -1470,7 +1546,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2221
msgid "&Password"
msgstr "&Lozinka:"
@@ -1718,32 +1794,32 @@
# Confirm user request to abort installation
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
msgid "Really abort the installation?"
msgstr "Zaista prekinuti instalaciju?"
# Confirm user request to abort System Repair
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
msgid "Really abort YaST System Repair?"
msgstr "Zaista prekinuti YaST popravku sistema?"
# Button that will really abort the repair
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
msgid "Abort System Repair"
msgstr "Prekinite popravku sistema"
# Button that will continue with the repair
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
msgid "&Continue System Repair"
msgstr "&Nastavak popravke sistema"
# Warning text for aborting an installation before anything is installed
# Warning text for aborting an installation before anything is installed
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1759,7 +1835,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:766
+#: library/general/src/modules/Popup.rb:759
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1775,7 +1851,7 @@
# right in the middle of some critical process (e.g. formatting)
#. 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:775
+#: library/general/src/modules/Popup.rb:768
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1788,19 +1864,19 @@
# Confirm aborting the program
# Confirm aborting the program
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
msgid "Really abort?"
msgstr "Zaista prekinuti instalaciju?"
# Additional hint when trying to abort program in spite of changes
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
msgid "All changes will be lost!"
msgstr "Sve promene će biti izgubljene!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
msgid "&Details..."
msgstr ""
@@ -1830,7 +1906,7 @@
#: 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/network/src/modules/NetworkPopup.rb:90
#: library/types/src/modules/String.rb:101
msgid "Yes"
msgstr "&Da"
@@ -1841,7 +1917,7 @@
#: 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/network/src/modules/NetworkPopup.rb:89
#: library/types/src/modules/String.rb:101
msgid "No"
msgstr "&Ne"
@@ -1922,21 +1998,21 @@
# this string is usually used as headline of a popup
#. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
#, fuzzy
msgid "Warning:"
msgstr "Upozorenje"
#. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
#, fuzzy
msgid "Error:"
msgstr "Greška"
#. translators: message summary header
#. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
#, fuzzy
msgid "Message:"
msgstr "Poruke"
@@ -1993,7 +2069,7 @@
# text entry label
#. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
#, fuzzy
msgid "&Variable"
msgstr "Ime &varijable"
@@ -2086,7 +2162,7 @@
msgstr "&Unesite lozinku:"
#. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
msgid "Enter Passphrase to Unlock GPG Key %1: "
msgstr ""
@@ -2192,6 +2268,253 @@
msgid "Error occurred while reading the log."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
+# summary text - unknown DMA mode is selected
+# summary text - unknown DMA mode is selected
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+#, fuzzy
+msgid "Unknown Zone"
+msgstr "Nepoznat Mod"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+#, fuzzy
+msgid "External Zone"
+msgstr "Eksterni uređaj"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+#, fuzzy
+msgid "Internal Zone"
+msgstr "Interni uređaj"
+
+# check box
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+#, fuzzy
+msgid "Demilitarized Zone"
+msgstr "Dozvoliti &demilitarizovanu zonu"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+msgid "TCP"
+msgstr ""
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+msgid "UDP"
+msgstr ""
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+msgid "RPC"
+msgstr ""
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+msgid "IP"
+msgstr ""
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+
+# Inetd read dialog caption
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+#, fuzzy
+msgid "Initializing Firewall Configuration"
+msgstr "Inicijalizovanje inetd podešavanja"
+
+# Progress stage 1/9
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+#, fuzzy
+msgid "Check for network devices"
+msgstr "Pronalaženje mrežnih uređaja"
+
+# Progress stage 2/5
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "Čitanje trenutnog podešavanja"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr ""
+
+# Progress step 1/9
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+#, fuzzy
+msgid "Checking for network devices..."
+msgstr "Pronalaženje mrežnih uređaja..."
+
+# Progress step 2/5
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "Čitanje trenutnog podešavanja..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr ""
+
+# menubutton item
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+#, fuzzy
+msgid "Writing Firewall Configuration"
+msgstr "&Podešavanje zaštitnog zida"
+
+# Progress stage 3/7
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "Snimanje podešavanja zaštitnog zida"
+
+# progress stage
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+#, fuzzy
+msgid "Adjust firewall service"
+msgstr "Podešavanje DNS servisa"
+
+# Progress step 3/7
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "Snimanje podešavanja zaštitnog zida..."
+
+# progress step
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+#, fuzzy
+msgid "Adjusting firewall service..."
+msgstr "Prilagođavanje DNS servisa..."
+
+# Popup text
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "Snimanje podešavanja neuspešno"
+
+# Label text (Network device: unknown device)
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+#, fuzzy
+msgid "Unknown protocol (%1)"
+msgstr "Nepoznati uređaj"
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" => [ ],
+#. "rpc_ports" => [ "portmap", "ypbind" ],
+#. "ip_protocols" => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr ""
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+#, fuzzy
+msgid "Service: %{filename}"
+msgstr "Servis"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+msgid "Public Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+# Label text (Network device: unknown device)
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+#, fuzzy
+msgid "Unknown service '%1'"
+msgstr "Nepoznati uređaj"
+
#. label
#: library/network/src/modules/CWMFirewallInterfaces.rb:109
msgid "Firewall cannot be adjusted during first stage installation."
@@ -2241,20 +2564,20 @@
msgstr ""
#. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
msgid "&Network Interfaces with Open Port in Firewall"
msgstr ""
#. Check the INT zone, it's not protected by default
#. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
msgid ""
"These network interfaces assigned to internal network cannot be deselected:\n"
"%1\n"
msgstr ""
#. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -2263,7 +2586,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces will additionally be open:\n"
@@ -2274,8 +2597,8 @@
#. yes-no popup
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces cannot be opened:\n"
@@ -2285,31 +2608,31 @@
msgstr ""
#. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
msgid "Network &Interfaces with Open Port in Firewall"
msgstr ""
#. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
msgid "Select &All"
msgstr "Selektuj &sve"
# pushbutton label
# Deselect all items (in this case NIS servers) of a list
#. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
msgid "Select &None"
msgstr "Deselektuj &sve:"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
msgid ""
"Error checking service status:\n"
"%{details}"
msgstr ""
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
msgid ""
"Error setting service status:\n"
"%{details}"
@@ -2317,7 +2640,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:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
#, fuzzy
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
@@ -2330,53 +2653,53 @@
#. 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:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
msgid ""
"To select interfaces on which to open the port,\n"
"click <b>%2</b>.<br>"
msgstr ""
#. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
msgstr ""
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
#, fuzzy
msgid "Open Port in Firewall"
msgstr "Podesi &Firewall"
# Frame label
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
#, fuzzy
msgid "Firewall Details"
msgstr "Karakteristike zaštitnog zida:"
#. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
#, fuzzy
msgid "Open Port in &Firewall"
msgstr "Podesi &Firewall"
# Frame label
#. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
#, fuzzy
msgid "Firewall &Details..."
msgstr "Karakteristike zaštitnog zida:"
# Frame label
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
#, fuzzy
-msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
msgstr "Karakteristike zaštitnog zida:"
#. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
#, fuzzy
msgid "Firewall is open"
msgstr "Brzi tip zaštitnog zi&da"
@@ -2384,15 +2707,15 @@
#. pppN must be tried before pN, modem before netcard
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
#: library/system/src/include/hwinfo/classnames.rb:108
#: library/system/src/include/hwinfo/classnames.rb:198
msgid "Modem"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
msgid "Network Card"
msgstr ""
@@ -2400,28 +2723,28 @@
#. Device type label
#. Device type label
#. Device type label
-#: 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:425
#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL"
msgstr ""
# translators: fallback name for a module at command line
-#: 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
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
#, fuzzy
#| msgid "unknown"
msgid "Unknown"
@@ -2433,402 +2756,402 @@
#. are represented as its sub-interfaces.
#. And also we frequently confuse "device" and "interface"
#. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
msgid "Additional Address"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
msgid "ATM"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
msgid "Asynchronous Transfer Mode (ATM)"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
msgid "Bluetooth"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
msgid "Bluetooth Connection"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond Network"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
msgid "CLAW"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
msgid "Common Link Access for Workstation (CLAW)"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
msgid "ISDN Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
#: library/system/src/include/hwinfo/classnames.rb:223
msgid "CTC"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
msgid "Channel to Channel Interface (CTC)"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL Connection"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy Network Device"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
#: library/system/src/include/hwinfo/classnames.rb:227
msgid "ESCON"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
msgid "Enterprise System Connector (ESCON)"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
#: library/system/src/include/hwinfo/classnames.rb:220
msgid "Ethernet"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
msgid "Ethernet Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
#: library/system/src/include/hwinfo/classnames.rb:222
msgid "FDDI"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
msgid "FDDI Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
msgid "FICON"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
msgid "Fiberchannel System Connector (FICON)"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
msgid "HIPPI"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
msgid "HIgh Performance Parallel Interface (HIPPI)"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
msgid "Hipersockets"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
msgid "Hipersockets Interface (HSI)"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN Connection"
msgstr ""
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "IrDA"
msgstr ""
# Progress stage 1/9
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
#, fuzzy
msgid "Infrared Network Device"
msgstr "Pronalaženje mrežnih uređaja"
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "Infrared Device"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
#: library/system/src/include/hwinfo/classnames.rb:224
msgid "IUCV"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
msgid "Inter User Communication Vehicle (IUCV)"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
#: library/system/src/include/hwinfo/classnames.rb:219
msgid "Loopback"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
msgid "Loopback Device"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
#: library/system/src/include/hwinfo/classnames.rb:228
msgid "Myrinet"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
msgid "Myrinet Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
msgid "Parallel Line"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
msgid "Parallel Line Connection"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
#: library/system/src/include/hwinfo/classnames.rb:226
msgid "QETH"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
msgid "OSA-Express or QDIO Device (QETH)"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
msgid "IPv6-in-IPv4"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
msgid "IPv6-in-IPv4 Encapsulation Device"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
msgid "Serial Line"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
msgid "Serial Line Connection"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
msgid "Token Ring"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
msgid "Token Ring Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB"
msgstr ""
# Progress stage 1/9
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
#, fuzzy
msgid "USB Network Device"
msgstr "Pronalaženje mrežnih uređaja"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare"
msgstr ""
# Progress stage 1/9
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
#, fuzzy
msgid "VMWare Network Device"
msgstr "Pronalaženje mrežnih uređaja"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
msgid "Wireless"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
msgid "Wireless Network Card"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XPNET"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XP Network"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "VLAN"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "Virtual LAN"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#: library/system/src/include/hwinfo/classnames.rb:89
#: library/system/src/include/hwinfo/classnames.rb:101
msgid "Bridge"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
msgid "Network Bridge"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "TUN"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "Network TUNnel"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "TAP"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "Network TAP"
msgstr ""
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#: library/system/src/include/hwinfo/classnames.rb:152
msgid "InfiniBand"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
msgid "InfiniBand Device"
msgstr ""
# Label text (Network device: unknown device)
#. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
#, fuzzy
msgid "Unknown device"
msgstr "Nepoznati uređaj"
#. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
#, fuzzy
msgid "DHCP address"
msgstr "LDAP Server"
#. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
msgid "No IP address assigned"
msgstr ""
#. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
msgid "Device Type"
msgstr ""
# text entry label
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
#, fuzzy
msgid "Device Name"
msgstr "&Ime fajla:"
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
msgid "IP Address"
msgstr ""
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
msgid "Device ID"
msgstr ""
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
msgid "Connected"
msgstr ""
#. label message
#. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
msgid "Scanning for hosts on this LAN..."
msgstr "Skeniram LAN u potrazi za serverima..."
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
msgid "&NFS Servers"
msgstr "&NFS serveri"
# selection box label
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
msgid "Re&mote Hosts"
msgstr "Udaljeni računari-host"
# selection box label
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
msgid "&Exported Directories"
msgstr "Direktorijumi"
#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
msgid ""
"Your network interfaces are currently controlled by NetworkManager\n"
"but the service to configure might not work well with it.\n"
@@ -2839,14 +3162,14 @@
#. 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:348
+#: library/network/src/modules/NetworkService.rb:346
msgid ""
"No running network detected.\n"
"Restart installation and configure network in Linuxrc\n"
"or continue without network."
msgstr ""
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
msgid ""
"No running network detected.\n"
"Configure network with YaST or Network Manager plug-in\n"
@@ -2862,161 +3185,6 @@
"No spaces are allowed.\n"
msgstr ""
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
-#, fuzzy
-msgid "External Zone"
-msgstr "Eksterni uređaj"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
-#, fuzzy
-msgid "Internal Zone"
-msgstr "Interni uređaj"
-
-# check box
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
-#, fuzzy
-msgid "Demilitarized Zone"
-msgstr "Dozvoliti &demilitarizovanu zonu"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
-msgid "TCP"
-msgstr ""
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
-msgid "UDP"
-msgstr ""
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
-msgid "RPC"
-msgstr ""
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:252
-msgid "IP"
-msgstr ""
-
-# summary text - unknown DMA mode is selected
-# summary text - unknown DMA mode is selected
-#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1158
-#, fuzzy
-msgid "Unknown Zone"
-msgstr "Nepoznat Mod"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: 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"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-
-# Inetd read dialog caption
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
-#, fuzzy
-msgid "Initializing Firewall Configuration"
-msgstr "Inicijalizovanje inetd podešavanja"
-
-# Progress stage 1/9
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
-#, fuzzy
-msgid "Check for network devices"
-msgstr "Pronalaženje mrežnih uređaja"
-
-# Progress stage 2/5
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Read current configuration"
-msgstr "Čitanje trenutnog podešavanja"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Check possibly conflicting services"
-msgstr ""
-
-# Progress step 1/9
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
-#, fuzzy
-msgid "Checking for network devices..."
-msgstr "Pronalaženje mrežnih uređaja..."
-
-# Progress step 2/5
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Reading current configuration..."
-msgstr "Čitanje trenutnog podešavanja..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Checking possibly conflicting services..."
-msgstr ""
-
-# menubutton item
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
-#, fuzzy
-msgid "Writing Firewall Configuration"
-msgstr "&Podešavanje zaštitnog zida"
-
-# Progress stage 3/7
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
-msgid "Write firewall settings"
-msgstr "Snimanje podešavanja zaštitnog zida"
-
-# progress stage
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
-#, fuzzy
-msgid "Adjust firewall service"
-msgstr "Podešavanje DNS servisa"
-
-# Progress step 3/7
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
-msgid "Writing firewall settings..."
-msgstr "Snimanje podešavanja zaštitnog zida..."
-
-# progress step
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
-#, fuzzy
-msgid "Adjusting firewall service..."
-msgstr "Prilagođavanje DNS servisa..."
-
-# Popup text
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
-msgid "Writing settings failed"
-msgstr "Snimanje podešavanja neuspešno"
-
-# Label text (Network device: unknown device)
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
-#, fuzzy
-msgid "Unknown protocol (%1)"
-msgstr "Nepoznati uređaj"
-
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
#: library/network/src/modules/SuSEFirewallProposal.rb:167
msgid "New network device '%1' found; added as an internal firewall interface"
@@ -3117,66 +3285,16 @@
msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
msgstr ""
-#. Returns service definition.
-#. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
-#.
-#. @param [String] service name
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param map <string, list <string> > of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. $[
-#. "tcp_ports" : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports" : [ ],
-#. "rpc_ports" : [ "portmap", "ypbind" ],
-#. "ip_protocols" : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: 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:430
-#, fuzzy
-msgid "Service: %{filename}"
-msgstr "Servis"
-
-# Label text (Network device: unknown device)
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
-#, fuzzy
-msgid "Unknown service '%1'"
-msgstr "Nepoznati uređaj"
-
# Popup Text
#. 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:106
#: library/packages/src/include/packages/common.rb:135
msgid "These packages need to be installed:"
msgstr "Ovi paketi se moraju instalirati:"
# Popup Text
+#. the message is followed by list of required packages
#. Popup Text
#: library/packages/src/include/packages/common.rb:109
#: library/packages/src/include/packages/common.rb:137
@@ -3193,36 +3311,78 @@
msgid "&Uninstall"
msgstr "&Instaliraj"
+# Progress step 1/9
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
+#, fuzzy
+msgid "Checking file conflicts..."
+msgstr "Pronalaženje mrežnih uređaja..."
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
msgid "Downloading package %1 (%2)..."
msgstr ""
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
msgid "Downloading Package"
msgstr ""
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
msgid "Package %1 is broken, integrity check has failed."
msgstr ""
#. 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:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
msgid "Retry installation of the package?"
msgstr ""
# Confirm user request to abort installation
#. 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:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
#, fuzzy
#| msgid "Really abort the installation?"
msgid "Abort the installation?"
@@ -3235,9 +3395,9 @@
#. 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:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2136
#, fuzzy
#| msgid "Log Errors: %1"
msgid "Error: %1:"
@@ -3245,43 +3405,43 @@
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
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:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
msgid "Uninstalling package %1 (%2)..."
msgstr ""
# error popup
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
#, fuzzy
#| msgid "Installing required packages failed."
msgid "Installing package %1 (%2)..."
msgstr "Instaliranje zahtevanih paketa neuspešno."
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Uninstalling Package"
msgstr ""
# error popup
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
#, fuzzy
#| msgid "Installing required packages failed."
msgid "Installing Package"
msgstr "Instaliranje zahtevanih paketa neuspešno."
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
msgid "Removal of package %1 failed."
msgstr ""
# error popup
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
#, fuzzy
#| msgid "Installing required packages failed."
msgid "Installation of package %1 failed."
@@ -3289,14 +3449,14 @@
#. 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:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
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:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
"If the URL is correct, this indicates that the repository content has changed. To \n"
@@ -3307,34 +3467,34 @@
#. 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:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
msgid "Side A"
msgstr ""
#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
msgid "Side B"
msgstr ""
#. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
msgid "%1 (Disc %2)"
msgstr ""
#. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
msgid "%1 (Medium %2)"
msgstr ""
#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
msgid ""
"Insert\n"
"'%1'"
msgstr ""
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
msgid ""
"Cannot access installation media\n"
"%1\n"
@@ -3343,7 +3503,7 @@
msgstr ""
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
msgid ""
"Cannot access installation media \n"
"%1\n"
@@ -3353,56 +3513,56 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1835
msgid "Skip Autorefresh"
msgstr ""
#. 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:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
msgid "&Eject"
msgstr ""
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
msgid "A&utomatically Eject CD or DVD Medium"
msgstr ""
# Confirm user request to abort installation
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
#, fuzzy
#| msgid "Really abort the installation?"
msgid "Retry the installation?"
msgstr "Zaista prekinuti instalaciju?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
msgid "Skip the medium?"
msgstr ""
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
msgid "Ignoring the bad medium..."
msgstr ""
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
msgid "&URL"
msgstr ""
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
msgid "Creating Repository %1"
msgstr ""
# message popup
# message popup
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
#, fuzzy
#| msgid "Error occurred while reading the log."
msgid "An error occurred while creating the repository."
@@ -3411,9 +3571,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:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
msgid "Unable to retrieve the remote repository description."
msgstr ""
@@ -3422,9 +3582,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:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
#, fuzzy
#| msgid "Error occurred while reading the log."
msgid "An error occurred while retrieving the new metadata."
@@ -3434,9 +3594,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:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid "The repository is not valid."
@@ -3444,7 +3604,7 @@
# message popup, %1 is a label of some widget
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid "The repository metadata is invalid."
@@ -3455,105 +3615,105 @@
#. 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:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2090
#, fuzzy
#| msgid "&Retry"
msgid "Retry?"
msgstr "&Ponovno pokušati"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
msgid "Probing Repository %1"
msgstr ""
# message popup
# message popup
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
#, fuzzy
#| msgid "Error occurred while reading the log."
msgid "Error occurred while probing the repository."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
msgid "Repository probing details."
msgstr ""
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
msgid "Repository metadata is invalid."
msgstr ""
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
msgid "Repository %1"
msgstr ""
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
msgid "Downloading delta RPM package %1 (%2)..."
msgstr ""
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
msgid "Downloading Delta RPM package"
msgstr ""
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
msgid "Applying delta RPM package %1..."
msgstr ""
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
msgid "Applying delta RPM package"
msgstr ""
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3070
msgid "Package: "
msgstr ""
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
msgid "Starting script %1 (patch %2)..."
msgstr ""
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
msgid "Running Script"
msgstr ""
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
msgid "Patch: "
msgstr ""
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
msgid "Script: "
msgstr ""
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
msgid "Output of the Script"
msgstr ""
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
msgid ""
"Patch: %1\n"
"\n"
msgstr ""
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3564,7 +3724,7 @@
# Button label
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
#, fuzzy
#| msgid "&Refresh"
msgid "&Skip Refresh"
@@ -3572,7 +3732,7 @@
# Button label
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
#, fuzzy
#| msgid "&Download"
msgid "Downloading"
@@ -3581,8 +3741,8 @@
# Button label
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1770
#, fuzzy
#| msgid "&Download"
msgid "Downloading: %1"
@@ -3590,46 +3750,46 @@
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
msgid "Checking Package Database"
msgstr ""
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1875
msgid "Rebuilding package database. This process can take some time."
msgstr ""
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1908
msgid ""
"Rebuilding of package database failed:\n"
"%1"
msgstr ""
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Converting package database. This process can take some time."
msgstr ""
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1954
msgid "Status"
msgstr ""
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1978
msgid ""
"Conversion of package database failed:\n"
"%1"
msgstr ""
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2014
msgid "Reading RPM database..."
msgstr ""
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2023
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Reading Installed Packages"
@@ -3642,27 +3802,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
msgid "Scanning RPM database..."
msgstr ""
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2079
msgid "Initialization of the target failed."
msgstr ""
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2171
msgid "RPM database read"
msgstr ""
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2203
msgid "User Authentication"
msgstr ""
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2209
msgid ""
"URL: %1\n"
"\n"
@@ -3671,7 +3831,7 @@
# TextEntry label
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2218
#, fuzzy
#| msgid "&User name:"
msgid "&User Name"
@@ -3679,16 +3839,16 @@
# Frame label
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3005
#, fuzzy
msgid "Show &details"
msgstr "Karakteristike zaštitnog zida:"
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3071
msgid "Size: "
msgstr ""
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3094
msgid "Remaining time to automatic retry: %1"
msgstr ""
@@ -3753,12 +3913,12 @@
# error popup
#. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:418
msgid "Installing required packages failed."
msgstr "Instaliranje zahtevanih paketa neuspešno."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:422
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3767,7 +3927,7 @@
# translators: error popup before aborting the module
#. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
#, fuzzy
msgid "Cannot continue without installing required packages."
msgstr ""
@@ -3776,7 +3936,7 @@
# translators: error popup before aborting the module
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
#, fuzzy
msgid ""
"If you continue without installing required \n"
@@ -3786,22 +3946,22 @@
"bez instalacije potrebnih paketa."
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
msgid "Confirm Package License: %1"
msgstr ""
#. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
msgid "I &Agree"
msgstr ""
#. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
msgid "I &Disagree"
msgstr ""
#. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
"The package in the headline of the dialog requires an explicit confirmation\n"
@@ -3813,7 +3973,7 @@
msgstr ""
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3822,7 +3982,7 @@
"\t\t </p>"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3831,7 +3991,7 @@
"\t\t </p>"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3839,7 +3999,7 @@
"\t\t </p>"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
msgid ""
"<p>\n"
"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3852,149 +4012,149 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
msgid "Software Selection and System Tasks"
msgstr ""
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
msgid "(more)"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
msgid "Installation Successfully Finished"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
msgid "Package Installation Failed"
msgstr ""
# Report configuration - will be normal messages logged to file?
# '%1' will be replaced by translated string "Yes" or "No"
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
#, fuzzy
#| msgid "Log Messages: %1"
msgid "Error Message: %1"
msgstr "Poruke izveštaja: %1"
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
msgid "Failed Packages: %1"
msgstr ""
# error popup
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
#, fuzzy
#| msgid "Installing required packages failed."
msgid "Installed Packages: %1"
msgstr "Instaliranje zahtevanih paketa neuspešno."
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
msgid "Updated Packages: %1"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
msgid "Removed Packages: %1"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
msgid "Not Installed Packages: %1"
msgstr ""
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
msgid "Packages"
msgstr ""
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
msgid "Elapsed Time: %1"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
msgid "Total Installed Size: %1"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
msgid "Total Downloaded Size: %1"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
msgid "Statistics"
msgstr ""
# Button label
# Button label
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:713
#, fuzzy
#| msgid "Abo&rt Installation"
msgid "Installation log"
msgstr "&Prekid Instalacije"
# Frame label
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
#, fuzzy
msgid "Details"
msgstr "Karakteristike zaštitnog zida:"
# error popup
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
#, fuzzy
#| msgid "Installing required packages failed."
msgid "After Installing Packages"
msgstr "Instaliranje zahtevanih paketa neuspešno."
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Show This Report"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:682
#, fuzzy
#| msgid "&Finish"
msgid "Finish"
msgstr "&Završi"
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:683
msgid "Continue in the Software Manager"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:688
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr ""
# Button label
# Button label
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:696
#, fuzzy
#| msgid "Abo&rt Installation"
msgid "Installation Report"
msgstr "&Prekid Instalacije"
# error popup
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:718
#, fuzzy
#| msgid "Installing required packages failed."
msgid "Installed Packages"
msgstr "Instaliranje zahtevanih paketa neuspešno."
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:723
msgid "Updated Packages"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:728
msgid "Removed Packages"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:733
msgid "Remaining Packages"
msgstr ""
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:754
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -4006,7 +4166,7 @@
#. popup question, %1 stands for the package name
#. %2 is a repository name
#. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
msgid ""
"The package %1 from repository %2\n"
"%3\n"
@@ -4020,7 +4180,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:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
msgid ""
"The file %1 from repository %2\n"
"%3\n"
@@ -4032,16 +4192,16 @@
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
msgid "Unsigned Package"
msgstr ""
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
msgid "Unsigned File"
msgstr ""
#. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
msgid ""
"No checksum for package %1 was found in the repository.\n"
"While the package is part of the signed repository, it is not contained \n"
@@ -4052,7 +4212,7 @@
msgstr ""
#. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
msgid ""
"No checksum for file %1 was found in the repository.\n"
"This means that the file is part of the signed repository,\n"
@@ -4063,70 +4223,70 @@
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
msgid "No Checksum Found"
msgstr ""
#. 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:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
msgid "ID: %1"
msgstr ""
#. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
-#: library/packages/src/modules/SignatureCheckDialogs.rb:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
msgid "Fingerprint: %1"
msgstr ""
#. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
msgid "Name: %1"
msgstr ""
# Button label
# Button label
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
#, fuzzy
#| msgid "Crea&te"
msgid "Created: %1"
msgstr "&Napravi"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
msgid "Expires: %1"
msgstr ""
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
msgid "ID: "
msgstr ""
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
msgid "Name: "
msgstr ""
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
msgid "Fingerprint: "
msgstr ""
# Button label
# Button label
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
#, fuzzy
#| msgid "Crea&te"
msgid "Created: "
msgstr "&Napravi"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
msgid "Expires: "
msgstr ""
#. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
msgid ""
"Package %1 from repository %2\n"
"%3\n"
@@ -4140,7 +4300,7 @@
msgstr ""
#. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
msgid ""
"File %1 from repository %2\n"
"%3\n"
@@ -4154,12 +4314,12 @@
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
msgid "Validation Check Failed"
msgstr ""
#. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
msgid ""
"The package %1 is digitally signed\n"
"with the following unknown GnuPG key: %2.\n"
@@ -4172,7 +4332,7 @@
msgstr ""
#. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
msgid ""
"The file %1\n"
"is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -4187,13 +4347,13 @@
# summary text - unknown DMA mode is selected
# summary text - unknown DMA mode is selected
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
#, fuzzy
msgid "Unknown GnuPG Key"
msgstr "Nepoznat Mod"
#. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
msgid ""
"The package %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4207,7 +4367,7 @@
msgstr ""
#. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
msgid ""
"The file %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4221,17 +4381,17 @@
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
msgid "Signed with Untrusted Public Key"
msgstr ""
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
msgid "&Trust and Import the Key"
msgstr ""
#. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
msgid ""
"<p>The owner of the key may distribute updates,\n"
"packages, and package repositories that your system will trust and offer\n"
@@ -4241,7 +4401,7 @@
msgstr ""
#. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
msgid ""
"<p>A warning dialog opens for every package that\n"
"is not signed by a trusted (imported) key. If you do not trust the key,\n"
@@ -4249,7 +4409,7 @@
msgstr ""
#. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
msgid ""
"The following GnuPG key has been found in repository\n"
"%1\n"
@@ -4257,7 +4417,7 @@
msgstr ""
#. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
msgid ""
"You can choose to import it into your keyring of trusted\n"
"public keys, meaning that you trust the owner of the key.\n"
@@ -4266,23 +4426,23 @@
msgstr ""
#. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
msgid "WARNING: The key has expired!"
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
msgid "Import Untrusted GnuPG Key"
msgstr ""
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
msgid "&Trust"
msgstr ""
#. 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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
msgid ""
"The expected checksum of file %1\n"
"is %2,\n"
@@ -4296,12 +4456,12 @@
msgstr ""
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
msgid "Wrong Digest"
msgstr ""
#. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
msgid ""
"The checksum of file %1\n"
"is %2,\n"
@@ -4316,7 +4476,7 @@
# summary text - unknown DMA mode is selected
# summary text - unknown DMA mode is selected
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
#, fuzzy
msgid "Unknown Digest"
msgstr "Nepoznat Mod"
@@ -4327,82 +4487,82 @@
#. Return the description for the current stage.
#. @return [String] localized string description
#. 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:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
#, fuzzy
#| msgid "&Install"
msgid "Installing..."
msgstr "&Instaliraj"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
msgid "Media"
msgstr ""
# this string is usually used as headline of a popup
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
#, fuzzy
#| msgid "Warning"
msgid "Remaining"
msgstr "Upozorenje"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
msgid "Time"
msgstr ""
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
msgid "Actions performed:"
msgstr ""
# Popup Text
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
#, fuzzy
#| msgid "These packages need to be installed:"
msgid "<p>Packages are being installed.</p>"
msgstr "Ovi paketi se moraju instalirati:"
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
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 ""
# pushbutton label
# Deselect all items (in this case NIS servers) of a list
#. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:652
+#: library/packages/src/modules/SlideShow.rb:653
#, fuzzy
#| msgid "Select &None"
msgid "%s Release Notes"
msgstr "Deselektuj &sve:"
-#. tab
-#: library/packages/src/modules/SlideShow.rb:664
-msgid "Slide Sho&w"
-msgstr ""
-
# Frame label
#. tab
-#: library/packages/src/modules/SlideShow.rb:666
+#: library/packages/src/modules/SlideShow.rb:665
#, fuzzy
msgid "&Details"
msgstr "Karakteristike zaštitnog zida:"
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
+msgid "Slide Sho&w"
+msgstr ""
+
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:708
msgid "Performing Upgrade"
msgstr ""
# Button label
# Button label
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:711
#, fuzzy
#| msgid "Abo&rt Installation"
msgid "Performing Installation"
@@ -4410,7 +4570,7 @@
# Button that will continue with the installation
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:746
#, fuzzy
#| msgid "&Continue Installation"
msgid "Package Installation"
@@ -4418,7 +4578,7 @@
# Confirm user request to abort installation
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:818
#, fuzzy
#| msgid "Really abort the installation?"
msgid ""
@@ -4427,7 +4587,7 @@
msgstr "Zaista prekinuti instalaciju?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:830
msgid "Aborted"
msgstr ""
@@ -5033,38 +5193,46 @@
msgid "Bluetooth device"
msgstr ""
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
msgstr ""
#. Continue/Cancel question, %1 is a coma separated list of file names
-#: library/system/src/modules/FileChanges.rb:180
+#: library/system/src/modules/FileChanges.rb:178
msgid ""
"Files %1 have been changed manually.\n"
"YaST might lose some of the changes"
msgstr ""
-#: library/system/src/modules/FileChanges.rb:193
+#. Continue/Cancel question, %1 is a file name
+#: library/system/src/modules/FileChanges.rb:180
+msgid ""
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
+msgstr ""
+
+#: library/system/src/modules/FileChanges.rb:192
#, fuzzy
msgid "Do not show this message anymore"
msgstr "Ne prikazuj ovu poruku ponovo."
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
msgid ""
"File %s has been created manually.\n"
"YaST might lose this file."
-msgstr ""
-
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-msgid ""
+msgid_plural ""
"Files %s have been created manually.\n"
"YaST might lose these files."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
# error report
# error report
@@ -5074,7 +5242,7 @@
msgstr "Greška se dogodila prilikom pravljenja initrd podešavanja!"
#. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
msgid ""
"Reboot your system\n"
"to activate the new kernel.\n"
@@ -5124,7 +5292,7 @@
# Translators: dot: ".", hyphen: "-"
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -5135,7 +5303,7 @@
"na početku i na kraju komponente i poslednja komponenta ne sme početi cifrom."
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -5228,13 +5396,13 @@
#. 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:738
+#: library/types/src/modules/String.rb:730
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
+#: library/types/src/modules/String.rb:846
msgid "%1/s"
msgstr ""
@@ -5348,8 +5516,8 @@
#. fallback name for the dialog title
#. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
msgid "Module"
msgstr ""
@@ -6115,65 +6283,7 @@
"Hostname %2 cannot be added."
msgstr ""
-#: src/lib/ui/srv_status_component.rb:60
#, fuzzy
-msgid "Service Status"
-msgstr "Servis"
-
-#. 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
-#, fuzzy
-msgid "Current status:"
-msgstr "Status:"
-
-# ComboBox item
-#. Widget to configure the status on boot
-#: src/lib/ui/srv_status_component.rb:194
-#, fuzzy
-msgid "Start During System Boot"
-msgstr "Prilikom pokretanja sistema"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-msgid "Reload After Saving Settings"
-msgstr ""
-
-# this string is usually used as headline of a popup
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-#, fuzzy
-#| msgid "Warning"
-msgid "running"
-msgstr "Upozorenje"
-
-# Button label
-#: src/lib/ui/srv_status_component.rb:220
-#, fuzzy
-#| msgid "&Stop"
-msgid "Stop now"
-msgstr "&Zaustavi"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:225
-msgid "stopped"
-msgstr ""
-
-#: src/lib/ui/srv_status_component.rb:227
-msgid "Start now"
-msgstr ""
-
-#, fuzzy
#~| msgid "Not detected."
#~ msgid "No running network detected."
#~ msgstr "Nije pronađen."
Modified: trunk/yast/sr@Latn/po/bootloader.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/bootloader.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/bootloader.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: YaST2 (bootloader)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-04-18 19:31+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -14,773 +14,434 @@
# command line help text for Bootloader module
#. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
msgid "Boot loader configuration module"
msgstr "&Boot loader konfiguracioni modul"
-# command line help text for summary action
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "Izveštaj podešavanja za boot loader"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr ""
-# command line help text for delete action
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
+# Boot dialog caption
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
#, fuzzy
-#| msgid "Delete a global option or option of a section"
-msgid "Delete a global option"
-msgstr "Obrišite globalnu opciju ili opciju sekcije"
+msgid "Boot Loader Settings"
+msgstr "Boot setovanja"
-# table cell / label
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
-#, fuzzy
-msgid "Set a global option"
-msgstr "&Lokacija Boot Loader-a"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
+msgid "Device map must contain at least one device"
+msgstr ""
-# command line help text for print action
-#. command line help text for print action
-#: src/clients/bootloader.rb:75
-msgid "Print value of specified option"
-msgstr "Odštampajte vrednost definisane opcije"
-
-# command line help text for an option
-#. command line help text for an option
-#: src/clients/bootloader.rb:83
-msgid "The key of the option"
-msgstr "Ključ opcije"
-
-# command line help text for an option
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The value of the option"
-msgstr "Vrednost opcije"
-
-# command line error report
-#. command line error report
-#: src/clients/bootloader.rb:152
-msgid "Value was not specified."
-msgstr "Vrednost nije definisana."
-
-# command line error report
-#. command line error report
-#: src/clients/bootloader.rb:174
-msgid "Option was not specified."
-msgstr "Opcija nije definisana."
-
-# command line, %1 is the value of bootloader option
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
+# Boot dialog caption
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
#, fuzzy
-#| msgid "Value: %1"
-msgid "Value: %s"
-msgstr "Vrednost: %1"
+msgid "Disk order settings"
+msgstr "Boot setovanja"
-# command line error report
-#. command line error report
-#: src/clients/bootloader.rb:183
-msgid "Specified option does not exist."
-msgstr "Definisana opcija ne postoji."
+# selectionn box label
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "Iskorišćenost Diska"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-#, fuzzy
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><b><big>Utvrđivanje profila</big></b><br>"
+# textentry header
+# textentry header
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "Uređaj"
-#: src/include/bootloader/grub/helps.rb:24
-msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active even\n"
-"if the boot loader is installed in the MBR.</p>"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+msgid "Selected bootloader partition %s is not available any more."
msgstr ""
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
-msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
-msgstr ""
-
-# help 3/4
-#: src/include/bootloader/grub/helps.rb:33
+# progress line
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
#, fuzzy
-msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
-msgstr ""
-"<P> Pritiskom na <b>Podesi kao podrazumevani</b>, označava se selektovana \n"
-"sekcija za podrazumevanu. Kada se sistem pokreće boot loader će obezbediti \n"
-"boot meni i čekati na korisnika da selektuje kernel ili drugi \n"
-"operativni sistem. Ako se ne pritisne nijedan tastet pre isteka vremena, podrazumevani \n"
-"kernel ili OS biće pokrenut. Redosled sekcija u boot loader\n"
-"meniju se može promeniti korišženjem <B>Gore</B> i <B>Dole</B> Dugmića.</P>\n"
+msgid "Saving bootloader configuration..."
+msgstr "Snimanje konfiguracije boot loader-a"
-#: src/include/bootloader/grub/helps.rb:41
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:102
msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
-"<b>Boot from Root Partition</b>.</p>"
+#. 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:115
+msgid "The system will reboot now..."
msgstr ""
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
-"installed on your computer</p>"
-msgstr ""
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+#, fuzzy
+msgid "&Boot Loader"
+msgstr "Konfigurisanje monitora"
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
-"to start this section.</p>"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:56
-msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
-"logical partition and the /boot partition is missing</p>"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:62
-msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
-msgstr ""
+# section name "suffix" for default section
+#: src/lib/bootloader/generic_widgets.rb:43
+#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr " (podrazumevano)"
-#: src/include/bootloader/grub/helps.rb:65
+# popup - Continue/Cancel
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
+#, fuzzy
msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
msgstr ""
+"Upozorenje!\n"
+"\n"
+"Ako ne instalirate bilo kakav boot loader, sistem\n"
+"neće moći da se pokrene.\n"
+"\n"
+"Nastaviti?\n"
-#: src/include/bootloader/grub/helps.rb:68
+#: src/lib/bootloader/generic_widgets.rb:75
+#, fuzzy
msgid ""
-"<p><b>Terminal Definition</b></p><br>\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>"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
msgstr ""
+"<p><b><big>Adresa</big></b><br>\n"
+"Da bi ste podesili adresu host-a sa kojim želite međusobno da se sinhronizujete,\n"
+"koristite <b>Adresa</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:75
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
-msgstr ""
+# summary text, %1 is bootloader name (eg. LILO)
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+#, fuzzy
+msgid "Boot Loader Type: %1"
+msgstr "Boot loader tipa: %1"
-#: src/include/bootloader/grub/helps.rb:78
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:81
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"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 ""
-
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
-msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"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.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
-msgstr ""
-
-# table cell / label
-#: src/include/bootloader/grub/helps.rb:101
+# table column headings
+#: src/lib/bootloader/grub2.rb:109
#, fuzzy
-#| msgid "Boot Loader Location"
-msgid "Boot Loader Locations"
-msgstr "&Lokacija Boot Loader-a"
+msgid "Enable Trusted Boot: %1"
+msgstr "Uređaj"
-#: src/include/bootloader/grub/helps.rb:102
-msgid "Set &active Flag in Partition Table for Boot Partition"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
-msgid "&Timeout in Seconds"
-msgstr ""
-
-# table item / label
-#: src/include/bootloader/grub/helps.rb:106
+# summary item: an option is turned on
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
#, fuzzy
-msgid "&Default Boot Section"
-msgstr "Podrazumevana sekcija"
+#| msgid "Yes"
+msgid "yes"
+msgstr "&Da"
-#: src/include/bootloader/grub/helps.rb:107
-msgid "Write &generic Boot Code to MBR"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
msgstr ""
-# label / table entry
-# label / table entry
-#: src/include/bootloader/grub/helps.rb:108
+# summary text, location is location description (eg. /dev/hda)
+#: src/lib/bootloader/grub2.rb:116
#, fuzzy
-msgid "Custom Boot Partition"
-msgstr "Izaberite vašu root-particiju:"
+#| msgid "Location: %1"
+msgid "Status Location: %1"
+msgstr "Lokacija: %1"
-# radio button
-#: src/include/bootloader/grub/helps.rb:109
+# label text
+# label text
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
#, fuzzy
-#| msgid "&Master Boot Record"
-msgid "Boot from Master Boot Record"
-msgstr "&Glavni zapis pokretanja sistema"
+msgid "Order of Hard Disks: %1"
+msgstr "Hard disk:"
-# radiobutton, %1 is device (eg. /dev/hda1)
-#: src/include/bootloader/grub/helps.rb:110
-#, fuzzy
-#| msgid "Boot Sector of Roo&t Partition %1"
-msgid "Boot from Root Partition"
-msgstr "Boot Sektor Roo&t Particije %1"
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
+msgstr ""
-# radiobutton, %1 is device (eg. /dev/hda1)
-#: src/include/bootloader/grub/helps.rb:111
-#, fuzzy
-#| msgid "Boot &Sector of Boot Partition %1"
-msgid "Boot from Boot Partition"
-msgstr "Boot &Sektor Boot Particije %1"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
+msgstr ""
-# table item
-#: src/include/bootloader/grub/helps.rb:112
-#, fuzzy
-msgid "Boot from Extended Partition"
-msgstr "Aktiviraj Boot Loader particiju:"
+#: src/lib/bootloader/grub2.rb:216
+msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
+msgstr ""
-# Provider dialog caption
-#: src/include/bootloader/grub/helps.rb:113
-#, fuzzy
-msgid "Serial Connection &Parameters"
-msgstr "Parametri provajdera"
+#: src/lib/bootloader/grub2.rb:220
+msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:114
-msgid "Fallback Sections if Default fails"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:115
-msgid "&Hide Menu on Boot"
+#: src/lib/bootloader/grub2.rb:235
+msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:116
-msgid "Pa&ssword for the Menu Interface"
+#: src/lib/bootloader/grub2.rb:241
+msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:117
-msgid "Debugg&ing Flag"
+#: src/lib/bootloader/grub2.rb:246
+msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
msgstr ""
-# Heading text
-# Heading text
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
-#, fuzzy
-msgid "Prot&ect Boot Loader with Password"
-msgstr "&Unesite lozinku:"
-
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
-msgid "P&rotect Entry Modification Only"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
msgstr ""
-# text entry label
-# text entry label
-#. text entry
-#: src/include/bootloader/grub/options.rb:85
-msgid "&Password"
-msgstr "&Lozinka:"
-
-# password textentry
-#. text entry
-#: src/include/bootloader/grub/options.rb:88
-msgid "Re&type Password"
-msgstr "Ponovo &unesite lozinku:"
-
-# radiobutton, %1 is device (eg. /dev/hda1)
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
+# summary text, location is location description (eg. /dev/hda)
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
#, fuzzy
-#| msgid "Boot Sector of Roo&t Partition %1"
-msgid "Boot from &Root Partition"
-msgstr "Boot Sektor Roo&t Particije %1"
+#| msgid "Location: %1"
+msgid "Change Location: %s"
+msgstr "Lokacija: %1"
-# radiobutton, %1 is device (eg. /dev/hda1)
-#: src/include/bootloader/grub/options.rb:224
-#, fuzzy
-#| msgid "Boot &Sector of Boot Partition %1"
-msgid "Boo&t from Boot Partition"
-msgstr "Boot &Sektor Boot Particije %1"
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
+msgid "&Timeout in Seconds"
+msgstr ""
-# label / table entry
-# label / table entry
-#: src/include/bootloader/grub/options.rb:235
-#, fuzzy
-msgid "C&ustom Boot Partition"
-msgstr "Izaberite vašu root-particiju:"
+#: src/lib/bootloader/grub2_widgets.rb:57
+msgid ""
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
+msgstr ""
-# table cell / label
-#: 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 "&Lokacija Boot Loader-a"
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
+msgid "Set &active Flag in Partition Table for Boot Partition"
+msgstr ""
-# radio button
-#: src/include/bootloader/grub/options.rb:256
-#: src/include/bootloader/grub/options.rb:286
-#: src/include/bootloader/grub/options.rb:307
-#, fuzzy
-#| msgid "&Master Boot Record"
-msgid "Boot from &Master Boot Record"
-msgstr "&Glavni zapis pokretanja sistema"
+#: src/lib/bootloader/grub2_widgets.rb:93
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
+msgstr ""
-# table item
-#: src/include/bootloader/grub/options.rb:263
-#, fuzzy
-msgid "Boot from &Extended Partition"
-msgstr "Aktiviraj Boot Loader particiju:"
-
-#: src/include/bootloader/grub/options.rb:312
-msgid "Enable Red&undancy for MD Array"
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
+msgid "Write &generic Boot Code to MBR"
msgstr ""
-# table cell / label
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
-#, fuzzy
-msgid "Boot Code Options"
-msgstr "&Lokacija Boot Loader-a"
-
-# Provider dialog caption
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
-#, fuzzy
-msgid "Kernel Parameters"
-msgstr "Parametri provajdera"
-
-# table cell / label
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
-#, fuzzy
-msgid "Bootloader Options"
-msgstr "&Lokacija Boot Loader-a"
-
-# table cell / label
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-#, fuzzy
-msgid "Boot Loader Options"
-msgstr "&Lokacija Boot Loader-a"
-
-# table column headings
-#: src/include/bootloader/grub2/dialogs.rb:190
-#, fuzzy
-msgid "Secure Boot"
-msgstr "Uređaj"
-
-#: src/include/bootloader/grub2/dialogs.rb:196
-msgid "Enable &Secure Boot Support"
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
msgstr ""
-# table cell / label
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
-#, fuzzy
-#| msgid "Boot Loader Location"
-msgid "Boot &Loader Location"
-msgstr "&Lokacija Boot Loader-a"
-
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
-msgid "Choose partition where is boot sequence installed."
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
+msgid "&Hide Menu on Boot"
msgstr ""
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:26
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+msgid "Pro&be Foreign OS"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:29
+#: src/lib/bootloader/grub2_widgets.rb:176
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: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 ""
-
# Provider dialog caption
-#: src/include/bootloader/grub2/helps.rb:38
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
#, fuzzy
msgid "O&ptional Kernel Command Line Parameter"
msgstr "Parametri provajdera"
-#: src/include/bootloader/grub2/helps.rb:39
-#, fuzzy
-msgid "&Vga Mode"
-msgstr "&DMA Mod:"
-
-#: src/include/bootloader/grub2/helps.rb:40
-msgid "Probe Foreign OS"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:41
-msgid "Protective MBR flag"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+msgid "&Protective MBR flag"
msgstr ""
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-msgid "%1x%2, %3 bits (mode %4)"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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/options.rb:68
-msgid "Standard 8-pixel font mode."
-msgstr ""
-
-# command description
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-#, fuzzy
-msgid "Text Mode"
-msgstr "Setuj DMA mod:"
-
-#: src/include/bootloader/grub2/options.rb:72
-msgid "Unspecified"
-msgstr ""
-
# menu button
# menu button
#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
+#: src/lib/bootloader/grub2_widgets.rb:246
#, fuzzy
#| msgid "Res&et"
msgid "set"
msgstr "Res&etuj"
#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
+#: src/lib/bootloader/grub2_widgets.rb:248
msgid "remove"
msgstr ""
#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
msgid "do not change"
msgstr ""
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
-msgid "Autodetect by grub2"
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
+msgid "Enable &Secure Boot Support"
msgstr ""
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
-msgid "Choose new graphical theme file"
-msgstr ""
+# table column headings
+#: src/lib/bootloader/grub2_widgets.rb:272
+#, fuzzy
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "Uređaj"
-#: src/include/bootloader/grub2/options.rb:258
-msgid "Use &graphical console"
-msgstr ""
+# table column headings
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
+#, fuzzy
+msgid "Enable &Trusted Boot Support"
+msgstr "Uređaj"
-#: src/include/bootloader/grub2/options.rb:265
-msgid "&Console resolution"
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
msgstr ""
-#: src/include/bootloader/grub2/options.rb:273
-msgid "&Console theme"
-msgstr ""
+# Heading text
+# Heading text
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
+#, fuzzy
+msgid "Prot&ect Boot Loader with Password"
+msgstr "&Unesite lozinku:"
-#: src/include/bootloader/grub2/options.rb:292
-msgid "Use &serial console"
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
+msgid "P&rotect Entry Modification Only"
msgstr ""
-#: src/include/bootloader/grub2/options.rb:299
-msgid "&Console arguments"
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
msgstr ""
-#. 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 ""
+# password textentry
+#. text entry
+#: src/lib/bootloader/grub2_widgets.rb:339
+msgid "Re&type Password"
+msgstr "Ponovo &unesite lozinku:"
-# popup header
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
-#, fuzzy
-#| msgid "Select Floppy Image"
-msgid "Select File"
-msgstr "Izaberite sliku diskete"
+# error popup
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "Lozinka ne sme da bude prazna."
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+# error popup
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
msgstr ""
+"'Lozinka' i 'Ponovo ukucaj lozinku'\n"
+"se ne poklapaju. Ponovo ukucajte lozinku."
-# Boot dialog caption
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
-#, fuzzy
-msgid "Boot Loader Settings"
-msgstr "Boot setovanja"
-
-# message popup
-#. message
-#: src/include/bootloader/routines/dialogs.rb:142
-#, fuzzy
-msgid "There are no options to set for the current boot loader."
-msgstr ""
-"Žao mi je, ovde trenutno\n"
-"nema opcija za podešavanje."
-
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
-#, fuzzy
-msgid "&Boot Loader"
-msgstr "Konfigurisanje monitora"
-
-# popup - Continue/Cancel
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
-#, fuzzy
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"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>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
msgstr ""
-"Upozorenje!\n"
-"\n"
-"Ako ne instalirate bilo kakav boot loader, sistem\n"
-"neće moći da se pokrene.\n"
-"\n"
-"Nastaviti?\n"
-# pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "Promeni Konfiguracione Fajlove"
-
-# radiobutton
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
-msgid "&Propose New Configuration"
-msgstr "&Predloži Novu Konfiguraciju"
-
-# menubutton item, keep as short as possible
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
-msgid "&Start from Scratch"
-msgstr "Po&kreni od početka"
-
-# menubutton item, keep as short as possible
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
-msgid "&Reread Configuration from Disk"
-msgstr "Ponovo pročitaj podešavanja sa diska"
-
-# menubutton item, keep as short as possible
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
-msgid "Restore MBR of Hard Disk"
-msgstr "Povrati MBR hard diska"
-
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
-msgid "Write bootloader boot code to disk"
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
+msgid "Choose new graphical theme file"
msgstr ""
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "ostali"
-
-# message popup
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
-#, fuzzy
-msgid "MBR restored successfully."
-msgstr "MBR obnovljen uspešno"
-
-# message popup
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
-#, fuzzy
-msgid "Failed to restore MBR."
-msgstr "MBR nije uspešno obnovljen"
-
-# progress stage, text in dialog (short)
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
-#, fuzzy
-#| msgid "Loading boot loader settings..."
-msgid "Writing bootloader settings failed."
-msgstr "Učitanje podešavanja boot loader-a..."
-
-# table cell / label
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
-#, fuzzy
-msgid "Boot &Loader Options"
-msgstr "&Lokacija Boot Loader-a"
-
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-#, fuzzy
-msgid "Boot Loader Installation &Details"
-msgstr "&Instalacija"
-
-# help text 1/1 (shown during settings reading progress)
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
-#, fuzzy
-msgid ""
-"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
+#: src/lib/bootloader/grub2_widgets.rb:498
+msgid "Use &graphical console"
msgstr ""
-"<P><BIG><B>Alat za konfigurisanje Boot Loader-a </B></BIG><BR>\n"
-"Promenite podešavanja za boot loader. </P>\n"
-# help text
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
-#, fuzzy
-msgid ""
-"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
-"Please wait...<br></p>"
+#: src/lib/bootloader/grub2_widgets.rb:503
+msgid "&Console resolution"
msgstr ""
-"<P><B><BIG>Snimanje podešavanja za Boot Loader </BIG></B><BR>\n"
-"Molim sačekajte...<br></p>\n"
-# help text 1/2 (%1 may be following sentence, optionally empty)
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:52
-#, fuzzy
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the current \n"
-"configuration and propose a new configuration, start from scratch, or reread\n"
-"the configuration saved on your disk. %1</P>"
+#: src/lib/bootloader/grub2_widgets.rb:508
+msgid "&Console theme"
msgstr ""
-"<P>Preko <B>Reset</B> dugmeta,\n"
-"možete da očistite trenutna podešavanja\n"
-"i da predložite nova podešavanja, krenete od početka ili ponovo učitate\n"
-"konfiguraciju snimljenu na vašem disku. %1</P>\n"
-# help text 1/1
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
+#: src/lib/bootloader/grub2_widgets.rb:539
+msgid "Autodetect by grub2"
msgstr ""
-"<P>Za uređivanje datoteka podešavanja boot loader-a\n"
-"ručno, kliknite na <B>Uredi datoteke podešavanja</B>.</P>"
-# help 1/4
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
+#: src/lib/bootloader/grub2_widgets.rb:547
+msgid "Use &serial console"
msgstr ""
-"<P> U tabeli, svaka sekcija predstavlja jedan objekat\n"
-"u boot meniju.</P>"
-# help 2/4
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
+#: src/lib/bootloader/grub2_widgets.rb:554
+msgid "&Console arguments"
msgstr ""
-"<P> Pritiskom na <B>Uredi</B> se dobija prikaz osobina\n"
-"selektovane sekcije.</P>"
+# table item / label
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+#, fuzzy
+msgid "&Default Boot Section"
+msgstr "Podrazumevana sekcija"
+
# help 3/4
-#. help 3/4
-#: src/include/bootloader/routines/helps.rb:84
+#: src/lib/bootloader/grub2_widgets.rb:575
#, fuzzy
msgid ""
-"<P> By pressing <b>Set as Default</b>, mark the selected \n"
-"section as default. When booting, the boot loader will provide \n"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
msgstr ""
"<P> Pritiskom na <b>Podesi kao podrazumevani</b>, označava se selektovana \n"
"sekcija za podrazumevanu. Kada se sistem pokreće boot loader će obezbediti \n"
@@ -789,384 +450,107 @@
"kernel ili OS biće pokrenut. Redosled sekcija u boot loader\n"
"meniju se može promeniti korišženjem <B>Gore</B> i <B>Dole</B> Dugmića.</P>\n"
-# help 4/4
-#. help 4/4
-#: src/include/bootloader/routines/helps.rb:93
-#, fuzzy
-msgid ""
-"<P>Press <B>Add</B> to create a new boot loader section\n"
-"or <B>Delete</B> to delete the selected section.</P>"
-msgstr ""
-"<P>Pritisnite <B>Dodaj</B> da biste kreirali novu boot loader sekciju\n"
-"ili <B>Obriši</B> da biste obrisali selektovanu sekciju.</P>\n"
+# table cell / label
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "&Lokacija Boot Loader-a"
-#. 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:107
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
msgstr ""
-#. custom bootloader help text, 2 of 7
-#: 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"
-"on the computer.</p>"
-msgstr ""
+# radiobutton, %1 is device (eg. /dev/hda1)
+#: src/lib/bootloader/grub2_widgets.rb:692
+#, fuzzy
+#| msgid "Boot &Sector of Boot Partition %1"
+msgid "Boo&t from Boot Partition"
+msgstr "Boot &Sektor Boot Particije %1"
-#. custom bootloader help text, 3 of 7
-#: 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"
-"partition. This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-
-#. custom bootloader help text, 7 of 7
-#: 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"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
+# radiobutton, %1 is device (eg. /dev/hda1)
+#: src/lib/bootloader/grub2_widgets.rb:693
#, fuzzy
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><b><big>Adresa</big></b><br>\n"
-"Da bi ste podesili adresu host-a sa kojim želite međusobno da se sinhronizujete,\n"
-"koristite <b>Adresa</b>.</p>"
+#| msgid "Boot Sector of Roo&t Partition %1"
+msgid "Boo&t from Root Partition"
+msgstr "Boot Sektor Roo&t Particije %1"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
+# radio button
+#: src/lib/bootloader/grub2_widgets.rb:694
#, fuzzy
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><b><big>Adresa</big></b><br>\n"
-"Da bi ste podesili adresu host-a sa kojim želite međusobno da se sinhronizujete,\n"
-"koristite <b>Adresa</b>.</p>"
+#| msgid "&Master Boot Record"
+msgid "Boot from &Master Boot Record"
+msgstr "&Glavni zapis pokretanja sistema"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
+# table item
+#: src/lib/bootloader/grub2_widgets.rb:695
#, fuzzy
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><b><big>Adresa</big></b><br>\n"
-"Da bi ste podesili adresu host-a sa kojim želite međusobno da se sinhronizujete,\n"
-"koristite <b>Adresa</b>.</p>"
+msgid "Boot from &Extended Partition"
+msgstr "Aktiviraj Boot Loader particiju:"
-# help text 1/1
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:209
+# label / table entry
+# label / table entry
+#: src/lib/bootloader/grub2_widgets.rb:706
#, fuzzy
-msgid ""
-"<P><B>Expert Manual Configuration</B><BR>\n"
-"Here, manually edit the boot loader configuration.</P>\n"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>Napredna ručna podešavanja</B><BR>\n"
-"Ovde ručno uredite boot loader podešavanja.</P>\n"
-"<P>Napomena: Krajnja datoteka podešavanja može imati različit naziv.</P>\n"
+msgid "C&ustom Boot Partition"
+msgstr "Izaberite vašu root-particiju:"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
-"name must be unique.</p>"
-msgstr ""
-
-#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:231
+# label / table cell
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
#, fuzzy
-msgid ""
-"<p><big><b>Type of the New Section</b></big><br>\n"
-"Select the type of the new section to create.</p>"
-msgstr ""
-"<p><b><big>Tip Clock-a</big></b><br>\n"
-"Izaberite drajver za clock koji želite da konfigurišete.<p>"
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "Redosled diskova"
-#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:235
+#: src/lib/bootloader/grub2_widgets.rb:725
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"
-"selected section.</p>"
+"<p><big><b>Disks Order</b></big><br>\n"
+"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.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
msgstr ""
-#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:241
-msgid ""
-"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
-"to load and start.</p>"
-msgstr ""
-
-#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:245
-msgid ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-
-#. help text 5/5
-#: 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"
-"booting other operating systems.</p>"
-msgstr ""
-
-#: src/include/bootloader/routines/helps.rb:254
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-
-# label text
-# label text
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
+# Provider dialog caption
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
#, fuzzy
-msgid "Order of Hard Disks: %1"
-msgstr "Hard disk:"
+msgid "&Kernel Parameters"
+msgstr "Parametri provajdera"
-# combo box item, summary string, table item
-#. summary string
-#: src/include/bootloader/routines/misc.rb:51
+# table cell / label
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
#, fuzzy
-msgid "Do not install any boot loader"
-msgstr "Ne Instaliraj Nijedan Boot Loader"
+msgid "Boot Co&de Options"
+msgstr "&Lokacija Boot Loader-a"
-# combo box item, summary string, table item
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
-msgid "Do Not Install Any Boot Loader"
-msgstr "Ne Instaliraj Nijedan Boot Loader"
-
-# module method action label
-#. summary string
-#: src/include/bootloader/routines/misc.rb:60
+# table cell / label
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
#, fuzzy
-msgid "Install the default boot loader"
-msgstr "Instaliram novi Boot Loader"
+msgid "Boot&loader Options"
+msgstr "&Lokacija Boot Loader-a"
-# module method action label
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+# table column headings
+#: src/lib/bootloader/grub2efi.rb:81
#, fuzzy
-msgid "Install Default Boot Loader"
-msgstr "Instaliram novi Boot Loader"
+msgid "Enable Secure Boot: %1"
+msgstr "Uređaj"
-# fallback bootloader name, keep short
-#. summary string
-#: src/include/bootloader/routines/misc.rb:68
-#, fuzzy
-msgid "Boot loader"
-msgstr "boot loader"
-
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
-msgid "Boot Loader"
-msgstr "Konfigurisanje monitora"
-
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-#, fuzzy
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr ""
-"Ova funkcija nije dostupna dok traje\n"
-"priprema za autoinstalaciju.\n"
-
-# yes-no popup question
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"Zaista napustiti podešavanje boot loader-a bez snimanja?\n"
-"Sva podešavanja će biti izgubljena.\n"
-
-# error popup
-#. error popup
-#: src/include/bootloader/routines/popups.rb:57
-msgid "The password must not be empty."
-msgstr "Lozinka ne sme da bude prazna."
-
-# error popup
-#. error popup
-#: src/include/bootloader/routines/popups.rb:66
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr ""
-"'Lozinka' i 'Ponovo ukucaj lozinku'\n"
-"se ne poklapaju. Ponovo ukucajte lozinku."
-
-# error popup
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:82
-#, fuzzy
-#| msgid "Set the boot loader location."
-msgid "%1Set default boot loader location?\n"
-msgstr "Podesi lokaciju boot loadera"
-
-# error popup
-#. error popup
-#: src/include/bootloader/routines/popups.rb:90
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"Izabrano ime je već korišćeno.\n"
-"Koristite neko drugo.\n"
-
-# yes-no popup
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr "Greška se dogodila prilikom pravljenja boot loader-a!\n"
-
-# warning popup. %1 is device name, %2 is date/time in form of
-# 'date' command output
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"Upozorenje!\n"
-"\n"
-"Trenutni MBR na %1 će biti prepisan sa MBR\n"
-"snimljenim na %2.\n"
-"\n"
-"Samo kod za pokretanje sistema u MBR će biti prepisan.\n"
-"Tabela particija će ostati nepromenjena .\n"
-"\n"
-"Nastaviti?\n"
-
-# PushButton
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
-msgid "&Yes, Rewrite"
-msgstr "&Da, prepiši"
-
+#. TODO: not much helpful for customers
#. error report
-#: src/include/bootloader/routines/wizards.rb:36
+#: src/lib/bootloader/main_dialog.rb:84
msgid "Because of the partitioning, the boot loader cannot be installed properly."
msgstr ""
-#. Represents dialog for modification of device map
-#: src/lib/bootloader/device_map_dialog.rb:53
-msgid "Device map must contain at least one device"
-msgstr ""
-
-# Boot dialog caption
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
+# combo box item, summary string, table item
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
#, fuzzy
-msgid "Disk order settings"
-msgstr "Boot setovanja"
+msgid "Do not install any boot loader"
+msgstr "Ne Instaliraj Nijedan Boot Loader"
-# selectionn box label
-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "Iskorišćenost Diska"
-
-# textentry header
-# textentry header
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "Uređaj"
-
-#. 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 ""
-
-# progress line
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-#, fuzzy
-msgid "Saving bootloader configuration..."
-msgstr "Snimanje konfiguracije boot loader-a"
-
-#. 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 ""
-
# proposal part - bootloader label
#. proposal part - bootloader label
#: src/lib/bootloader/proposal_client.rb:94
@@ -1181,220 +565,535 @@
# warning text in the summary rixhtext
#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
+#: src/lib/bootloader/proposal_client.rb:179
msgid "No boot loader is selected for installation. Your system might not be bootable."
msgstr "Nije izabran boot loader za instalaciju. Vaš sistem možda neće moći da se pokrene."
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
+#: src/lib/bootloader/proposal_client.rb:186
msgid "Because of the partitioning, the bootloader cannot be installed properly"
msgstr ""
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
-msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
+# help text 1/1 (shown during settings reading progress)
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+msgid ""
+"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+"Reading current configuration...</P>"
msgstr ""
+"<P><BIG><B>Alat za konfigurisanje Boot Loader-a </B></BIG><BR>\n"
+"Promenite podešavanja za boot loader. </P>\n"
-#: src/modules/BootGRUB2.rb:172
-msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
-msgstr ""
-
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
-msgstr ""
-
-#: src/modules/BootGRUB2.rb:189
-msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
-msgstr ""
-
-#: src/modules/BootGRUB2.rb:195
-msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
-msgstr ""
-
-#: src/modules/BootGRUB2.rb:199
-msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
-msgstr ""
-
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
-
-# summary text, location is location description (eg. /dev/hda)
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
+# help text
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
#, fuzzy
-#| msgid "Location: %1"
-msgid "Change Location: %s"
-msgstr "Lokacija: %1"
-
-# summary text, %1 is bootloader name (eg. LILO)
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
-#, fuzzy
-msgid "Boot Loader Type: %1"
-msgstr "Boot loader tipa: %1"
-
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
-msgid " (extended)"
+msgid ""
+"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
+"Please wait...<br></p>"
msgstr ""
+"<P><B><BIG>Snimanje podešavanja za Boot Loader </BIG></B><BR>\n"
+"Molim sačekajte...<br></p>\n"
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:245
-msgid " (MBR)"
-msgstr ""
-
-# summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB2.rb:252
-#, fuzzy
-#| msgid "Location: %1"
-msgid "Status Location: %1"
-msgstr "Lokacija: %1"
-
-# table column headings
-#: src/modules/BootGRUB2EFI.rb:108
-#, fuzzy
-msgid "Enable Secure Boot: %1"
-msgstr "Uređaj"
-
-# summary text, %1 is bootloader name (eg. LILO)
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
-#, fuzzy
-#| msgid "Boot loader type: %1"
-msgid "Unknown bootloader: %1"
-msgstr "Boot loader tipa: %1"
-
#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
+#: src/modules/BootSupportCheck.rb:94
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:139
+#: src/modules/BootSupportCheck.rb:117
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 ""
+#. FIXME: big part of this method should be in BootStorage
#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:167
+#: src/modules/BootSupportCheck.rb:144
msgid "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
+#: src/modules/BootSupportCheck.rb:156
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:239
+#: src/modules/BootSupportCheck.rb:189
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
+#: src/modules/BootSupportCheck.rb:200
msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
msgstr ""
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
+#: src/modules/BootSupportCheck.rb:207
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
msgstr ""
# progress stage, text in dialog (short, infinitiv)
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
+#: src/modules/Bootloader.rb:118
msgid "Check boot loader"
msgstr "Proveri boot loader"
# progress stage, text in dialog (short, infinitiv)
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
+#: src/modules/Bootloader.rb:120
msgid "Read partitioning"
msgstr "Čitanje Particija"
# progress stage, text in dialog (short, infinitiv)
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
+#: src/modules/Bootloader.rb:122
msgid "Load boot loader settings"
msgstr "Učitaj podešavanja boot loader-a"
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
+#: src/modules/Bootloader.rb:126
msgid "Checking boot loader..."
msgstr "Proveravam boot loader..."
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
+#: src/modules/Bootloader.rb:128
msgid "Reading partitioning..."
msgstr "Proveravam particiju..."
# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
+#: src/modules/Bootloader.rb:130
msgid "Loading boot loader settings..."
msgstr "Učitanje podešavanja boot loader-a..."
# progress bar caption
#. dialog header
-#: src/modules/Bootloader.rb:162
+#: src/modules/Bootloader.rb:134
#, fuzzy
msgid "Initializing Boot Loader Configuration"
msgstr "Inicijalizacija konfiguracije boot loader-a"
# progress stage, text in dialog (short)
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
+#: src/modules/Bootloader.rb:219
#, fuzzy
msgid "Create initrd"
msgstr "Kreiranje initrd..."
# progress stage, text in dialog (short)
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
+#: src/modules/Bootloader.rb:221
#, fuzzy
-msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
msgstr "Snimanje boot loader konfiguracionih fajlova..."
# progress stage, text in dialog (short)
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
-#, fuzzy
-msgid "Install boot loader"
-msgstr "Instaliranje boot loader-a..."
-
-# progress stage, text in dialog (short)
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
+#: src/modules/Bootloader.rb:225
msgid "Creating initrd..."
msgstr "Kreiranje initrd..."
-# progress stage, text in dialog (short)
+# progress line
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
-msgid "Saving boot loader configuration files..."
-msgstr "Snimanje boot loader konfiguracionih fajlova..."
+#: src/modules/Bootloader.rb:227
+#, fuzzy
+msgid "Saving boot loader configuration..."
+msgstr "Snimanje konfiguracije boot loader-a"
-# progress stage, text in dialog (short)
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
-msgid "Installing boot loader..."
-msgstr "Instaliranje boot loader-a..."
-
# progress line
#. progress line
-#: src/modules/Bootloader.rb:299
+#: src/modules/Bootloader.rb:233
#, fuzzy
msgid "Saving Boot Loader Configuration"
msgstr "Snimanje konfiguracije boot loader-a"
+# command line help text for summary action
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "Izveštaj podešavanja za boot loader"
+
+# command line help text for delete action
+#, fuzzy
+#~| msgid "Delete a global option or option of a section"
+#~ msgid "Delete a global option"
+#~ msgstr "Obrišite globalnu opciju ili opciju sekcije"
+
+# table cell / label
+#, fuzzy
+#~ msgid "Set a global option"
+#~ msgstr "&Lokacija Boot Loader-a"
+
+# command line help text for print action
+#~ msgid "Print value of specified option"
+#~ msgstr "Odštampajte vrednost definisane opcije"
+
+# command line help text for an option
+#~ msgid "The key of the option"
+#~ msgstr "Ključ opcije"
+
+# command line help text for an option
+#~ msgid "The value of the option"
+#~ msgstr "Vrednost opcije"
+
+# command line error report
+#~ msgid "Value was not specified."
+#~ msgstr "Vrednost nije definisana."
+
+# command line error report
+#~ msgid "Option was not specified."
+#~ msgstr "Opcija nije definisana."
+
+# command line, %1 is the value of bootloader option
+#, fuzzy
+#~| msgid "Value: %1"
+#~ msgid "Value: %s"
+#~ msgstr "Vrednost: %1"
+
+# command line error report
+#~ msgid "Specified option does not exist."
+#~ msgstr "Definisana opcija ne postoji."
+
+#, fuzzy
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><b><big>Utvrđivanje profila</big></b><br>"
+
+# table cell / label
+#, fuzzy
+#~| msgid "Boot Loader Location"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "&Lokacija Boot Loader-a"
+
+# label / table entry
+# label / table entry
+#, fuzzy
+#~ msgid "Custom Boot Partition"
+#~ msgstr "Izaberite vašu root-particiju:"
+
+# radio button
+#, fuzzy
+#~| msgid "&Master Boot Record"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "&Glavni zapis pokretanja sistema"
+
+# radiobutton, %1 is device (eg. /dev/hda1)
+#, fuzzy
+#~| msgid "Boot &Sector of Boot Partition %1"
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "Boot &Sektor Boot Particije %1"
+
+# table item
+#, fuzzy
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "Aktiviraj Boot Loader particiju:"
+
+# Provider dialog caption
+#, fuzzy
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "Parametri provajdera"
+
+# text entry label
+# text entry label
+#~ msgid "&Password"
+#~ msgstr "&Lozinka:"
+
+# radiobutton, %1 is device (eg. /dev/hda1)
+#, fuzzy
+#~| msgid "Boot Sector of Roo&t Partition %1"
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "Boot Sektor Roo&t Particije %1"
+
+# table cell / label
+#, fuzzy
+#~ msgid "Boot Loader Options"
+#~ msgstr "&Lokacija Boot Loader-a"
+
+# table column headings
+#, fuzzy
+#~ msgid "Secure Boot"
+#~ msgstr "Uređaj"
+
+# table cell / label
+#, fuzzy
+#~| msgid "Boot Loader Location"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "&Lokacija Boot Loader-a"
+
+#, fuzzy
+#~ msgid "&Vga Mode"
+#~ msgstr "&DMA Mod:"
+
+# command description
+#, fuzzy
+#~ msgid "Text Mode"
+#~ msgstr "Setuj DMA mod:"
+
+# popup header
+#, fuzzy
+#~| msgid "Select Floppy Image"
+#~ msgid "Select File"
+#~ msgstr "Izaberite sliku diskete"
+
+# message popup
+#, fuzzy
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr ""
+#~ "Žao mi je, ovde trenutno\n"
+#~ "nema opcija za podešavanje."
+
+# pushbutton
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "Promeni Konfiguracione Fajlove"
+
+# radiobutton
+#~ msgid "&Propose New Configuration"
+#~ msgstr "&Predloži Novu Konfiguraciju"
+
+# menubutton item, keep as short as possible
+#~ msgid "&Start from Scratch"
+#~ msgstr "Po&kreni od početka"
+
+# menubutton item, keep as short as possible
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "Ponovo pročitaj podešavanja sa diska"
+
+# menubutton item, keep as short as possible
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "Povrati MBR hard diska"
+
+#~ msgid "Other"
+#~ msgstr "ostali"
+
+# message popup
+#, fuzzy
+#~ msgid "MBR restored successfully."
+#~ msgstr "MBR obnovljen uspešno"
+
+# message popup
+#, fuzzy
+#~ msgid "Failed to restore MBR."
+#~ msgstr "MBR nije uspešno obnovljen"
+
+# progress stage, text in dialog (short)
+#, fuzzy
+#~| msgid "Loading boot loader settings..."
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "Učitanje podešavanja boot loader-a..."
+
+# table cell / label
+#, fuzzy
+#~ msgid "Boot &Loader Options"
+#~ msgstr "&Lokacija Boot Loader-a"
+
+#, fuzzy
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "&Instalacija"
+
+# help text 1/2 (%1 may be following sentence, optionally empty)
+#, fuzzy
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr ""
+#~ "<P>Preko <B>Reset</B> dugmeta,\n"
+#~ "možete da očistite trenutna podešavanja\n"
+#~ "i da predložite nova podešavanja, krenete od početka ili ponovo učitate\n"
+#~ "konfiguraciju snimljenu na vašem disku. %1</P>\n"
+
+# help text 1/1
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr ""
+#~ "<P>Za uređivanje datoteka podešavanja boot loader-a\n"
+#~ "ručno, kliknite na <B>Uredi datoteke podešavanja</B>.</P>"
+
+# help 1/4
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr ""
+#~ "<P> U tabeli, svaka sekcija predstavlja jedan objekat\n"
+#~ "u boot meniju.</P>"
+
+# help 2/4
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr ""
+#~ "<P> Pritiskom na <B>Uredi</B> se dobija prikaz osobina\n"
+#~ "selektovane sekcije.</P>"
+
+# help 3/4
+#, fuzzy
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P> Pritiskom na <b>Podesi kao podrazumevani</b>, označava se selektovana \n"
+#~ "sekcija za podrazumevanu. Kada se sistem pokreće boot loader će obezbediti \n"
+#~ "boot meni i čekati na korisnika da selektuje kernel ili drugi \n"
+#~ "operativni sistem. Ako se ne pritisne nijedan tastet pre isteka vremena, podrazumevani \n"
+#~ "kernel ili OS biće pokrenut. Redosled sekcija u boot loader\n"
+#~ "meniju se može promeniti korišženjem <B>Gore</B> i <B>Dole</B> Dugmića.</P>\n"
+
+# help 4/4
+#, fuzzy
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>Pritisnite <B>Dodaj</B> da biste kreirali novu boot loader sekciju\n"
+#~ "ili <B>Obriši</B> da biste obrisali selektovanu sekciju.</P>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Adresa</big></b><br>\n"
+#~ "Da bi ste podesili adresu host-a sa kojim želite međusobno da se sinhronizujete,\n"
+#~ "koristite <b>Adresa</b>.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Adresa</big></b><br>\n"
+#~ "Da bi ste podesili adresu host-a sa kojim želite međusobno da se sinhronizujete,\n"
+#~ "koristite <b>Adresa</b>.</p>"
+
+# help text 1/1
+#, fuzzy
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>Napredna ručna podešavanja</B><BR>\n"
+#~ "Ovde ručno uredite boot loader podešavanja.</P>\n"
+#~ "<P>Napomena: Krajnja datoteka podešavanja može imati različit naziv.</P>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Tip Clock-a</big></b><br>\n"
+#~ "Izaberite drajver za clock koji želite da konfigurišete.<p>"
+
+# combo box item, summary string, table item
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "Ne Instaliraj Nijedan Boot Loader"
+
+# module method action label
+#, fuzzy
+#~ msgid "Install the default boot loader"
+#~ msgstr "Instaliram novi Boot Loader"
+
+# module method action label
+#, fuzzy
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "Instaliram novi Boot Loader"
+
+# fallback bootloader name, keep short
+#, fuzzy
+#~ msgid "Boot loader"
+#~ msgstr "boot loader"
+
+#~ msgid "Boot Loader"
+#~ msgstr "Konfigurisanje monitora"
+
+#, fuzzy
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr ""
+#~ "Ova funkcija nije dostupna dok traje\n"
+#~ "priprema za autoinstalaciju.\n"
+
+# yes-no popup question
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "Zaista napustiti podešavanje boot loader-a bez snimanja?\n"
+#~ "Sva podešavanja će biti izgubljena.\n"
+
+# error popup
+#, fuzzy
+#~| msgid "Set the boot loader location."
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "Podesi lokaciju boot loadera"
+
+# error popup
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "Izabrano ime je već korišćeno.\n"
+#~ "Koristite neko drugo.\n"
+
+# yes-no popup
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr "Greška se dogodila prilikom pravljenja boot loader-a!\n"
+
+# warning popup. %1 is device name, %2 is date/time in form of
+# 'date' command output
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "Upozorenje!\n"
+#~ "\n"
+#~ "Trenutni MBR na %1 će biti prepisan sa MBR\n"
+#~ "snimljenim na %2.\n"
+#~ "\n"
+#~ "Samo kod za pokretanje sistema u MBR će biti prepisan.\n"
+#~ "Tabela particija će ostati nepromenjena .\n"
+#~ "\n"
+#~ "Nastaviti?\n"
+
+# PushButton
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "&Da, prepiši"
+
+# summary text, %1 is bootloader name (eg. LILO)
+#, fuzzy
+#~| msgid "Boot loader type: %1"
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "Boot loader tipa: %1"
+
+# progress stage, text in dialog (short)
+#, fuzzy
+#~ msgid "Install boot loader"
+#~ msgstr "Instaliranje boot loader-a..."
+
+# progress stage, text in dialog (short)
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "Snimanje boot loader konfiguracionih fajlova..."
+
+# progress stage, text in dialog (short)
+#~ msgid "Installing boot loader..."
+#~ msgstr "Instaliranje boot loader-a..."
+
# command line help text for set action
#~ msgid "Set a global option or option of a section"
#~ msgstr "Definišite globalnu opciju ili opciju sekcije"
@@ -1479,10 +1178,6 @@
#~ msgid "&EFI Entry Name"
#~ msgstr "&Ime EFI unosa"
-# label / table cell
-#~ msgid "Disk Order"
-#~ msgstr "Redosled diskova"
-
# frame label
#, fuzzy
#~ msgid "Boot Menu"
@@ -2008,10 +1703,6 @@
#~ msgid "Location: %1"
#~ msgstr "Lokacija: %1"
-# section name "suffix" for default section
-#~ msgid " (default)"
-#~ msgstr " (podrazumevano)"
-
# summary text. %1 is list of bootloader sections
# summary text. %1 is list of bootloader sections
#, fuzzy
@@ -2687,10 +2378,6 @@
#~ msgid "Stream File for *STMF Booting"
#~ msgstr "Stream datoteka za *STMF pokretanje sistema"
-# summary item: an option is turned on
-#~ msgid "Yes"
-#~ msgstr "&Da"
-
#~ msgid "No"
#~ msgstr "&Ne"
Modified: trunk/yast/sr@Latn/po/ca-management.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/ca-management.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/ca-management.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -2122,15 +2122,15 @@
# progress stage, text in dialog (short)
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
#, fuzzy
msgid "Creating certificate..."
msgstr "Kreiranje initrd..."
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
@@ -2138,32 +2138,31 @@
# To translators: ContinueCancel Popup headline
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
msgid "Finish"
msgstr "Završi"
# To translators: ContinueCancel Popup
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
msgid "Really save configuration ?"
msgstr "Snimiti konfiguraciju?"
# To translators: YesNo Popup headline
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
msgid "Exit"
msgstr "Izlaz"
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
msgid "Really exit configuration without saving ?"
msgstr "Izađi iz konfiguracije bez snimanja ?"
# header in email body
# header in email body
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
#, fuzzy
msgid "Details"
msgstr "Detalji:"
Modified: trunk/yast/sr@Latn/po/cio.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/cio.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/cio.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-08-25 18:36+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -43,11 +43,11 @@
msgstr ""
#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
+msgid "no"
msgstr ""
#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
+msgid "yes"
msgstr ""
#. filter can be empty if dialog is not yet created
Modified: trunk/yast/sr@Latn/po/cluster.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/cluster.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/cluster.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2013-01-30 16:27+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -128,7 +128,7 @@
msgstr ""
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
msgid "The Multicast Address has to be fulfilled"
msgstr ""
@@ -154,7 +154,7 @@
msgstr ""
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
msgid "Multicast Address:"
msgstr ""
@@ -202,169 +202,169 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
msgid "Enable Security Auth"
msgstr ""
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr ""
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr ""
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
msgid "Running"
msgstr ""
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
msgid "Not running"
msgstr ""
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
msgid "Booting"
msgstr ""
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
msgid "On -- Start pacemaker during boot"
msgstr ""
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
msgid "Off -- Start pacemaker manually"
msgstr ""
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
msgid "Switch On and Off"
msgstr ""
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
msgid "Current Status: "
msgstr ""
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
msgid "Start pacemaker Now"
msgstr ""
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
msgid "Stop pacemaker Now"
msgstr ""
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
msgid "Sync Host"
msgstr ""
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Add"
msgstr ""
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
msgid "Del"
msgstr ""
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Edit"
msgstr ""
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
msgid "Sync File"
msgstr ""
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
msgid "Add Suggested Files"
msgstr ""
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
msgid "Generate Pre-Shared-Keys"
msgstr ""
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
msgid "Csync2 Status Unknown"
msgstr ""
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
msgid "Turn csync2 ON"
msgstr ""
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 OFF"
msgstr ""
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
msgid "Enter a hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
msgid "Edit the hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
msgid "Enter a filename to synchronize"
msgstr ""
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
msgid "Edit the filename"
msgstr ""
#. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
msgstr ""
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
msgid "Delete key file %1 failed."
msgstr ""
#. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
msgstr ""
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
msgid "Key generation failed."
msgstr ""
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
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:1358
+#: src/include/cluster/dialogs.rb:1360
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
msgid "The Group Number must be a positive integer"
msgstr ""
@@ -455,96 +455,96 @@
msgstr ""
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
msgid "Initializing cluster Configuration"
msgstr ""
#. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
msgid "Read the database"
msgstr ""
#. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
msgid "Read the previous settings"
msgstr ""
#. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
msgid "Read SuSEFirewall Settings"
msgstr ""
#. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
msgid "Reading the database..."
msgstr ""
#. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
msgid "Reading the previous settings..."
msgstr ""
#. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
msgid "Reading SuSEFirewall settings..."
msgstr ""
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
msgid "Finished"
msgstr ""
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
msgid "Cannot install required package"
msgstr ""
#. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
msgid "Cannot load existing configuration"
msgstr ""
#. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
msgid "Cannot read database1."
msgstr ""
#. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
msgid "Cannot read database2."
msgstr ""
#. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
msgid "Cannot detect devices."
msgstr ""
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
msgid "Saving cluster Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
msgid "Write the settings"
msgstr ""
#. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
msgid "Save changes to SuSEFirewall"
msgstr ""
#. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
msgid "Saving changes to SuSEFirewall..."
msgstr ""
#. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr ""
Modified: trunk/yast/sr@Latn/po/control.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/control.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/control.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-04-18 17:42+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -16,186 +16,233 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-# congratulation text 2/4
-#: control/control.openSUSE.glade.translations.glade:3
-#, fuzzy
+#: control/control.SLED.glade.translations.glade:3
msgid ""
"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-" "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
msgstr ""
-"<p>Instalacija &proizvoda; na vašoj mašini je završena.\n"
-"Posle klika na <b>Završi</b> možete da se ulogujete na sistem.</p>\n"
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments. The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
+#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
+msgid "CIM Server"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:23
-msgid "XFCE Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "LXDE Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:26
-msgid "Enlightenment Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
msgid "Installation Settings"
msgstr "Podešavanja Instalacije"
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
#, fuzzy
+msgid "Overview"
+msgstr "&Pregled"
+
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+#, fuzzy
+msgid "Expert"
+msgstr "&Napredno"
+
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
+#, fuzzy
msgid "Live Installation Settings"
msgstr "Podešavanja Instalacije"
# screen title for update options
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
#, fuzzy
msgid "Update Settings"
msgstr "Opcije dogradnje"
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Network Configuration"
msgstr "Mrežna podešavanja"
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
msgid "Hardware Configuration"
msgstr "Hardware-ska podešavanja"
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
msgid "Preparation"
msgstr "Priprema"
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
#, fuzzy
#| msgid "Network Configuration"
msgid "Load linuxrc Network Configuration"
msgstr "Mrežna podešavanja"
# ComboBox label
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
#, fuzzy
msgid "Network Autosetup"
msgstr "&Aktiviranje uređaja"
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
msgid "Welcome"
msgstr ""
# ComboBox label
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
#, fuzzy
msgid "Network Activation"
msgstr "&Aktiviranje uređaja"
# ComboBox label
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
#, fuzzy
msgid "Disk Activation"
msgstr "&Aktiviranje uređaja"
-#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
#, fuzzy
msgid "System Analysis"
msgstr "Informacije o sistemu"
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
-msgid "Disk"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
-msgid "Time Zone"
-msgstr "Vremenska zona"
-
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
#, fuzzy
#| msgid "Online Update"
-msgid "Online Repositories"
+msgid "Installer Update"
msgstr "&Dogradnja preko interneta"
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
#, fuzzy
msgid "Add-On Products"
msgstr "Proizvod "
-# Headline for X11 configuration screen:
-# The user selects screen resolution and color depth.
-#: control/control.openSUSE.glade.translations.glade:47
-#, fuzzy
-msgid "Desktop Selection"
-msgstr "Setovanja Desktop-a"
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
+msgid "Disk"
+msgstr ""
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:69
+msgid "Time Zone"
+msgstr "Vremenska zona"
+
# screen title for update options
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
-#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
#, fuzzy
msgid "User Settings"
msgstr "Opcije dogradnje"
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
#, fuzzy
-msgid "Installation"
-msgstr "&Instalacija"
-
-#: control/control.openSUSE.glade.translations.glade:51
-#, fuzzy
msgid "Installation Overview"
msgstr "&Instalacija"
@@ -203,94 +250,396 @@
# collapsed to one single user-visible step.
# The step is considered finished when the last module
# with the same 'label' is finished.
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
#: control/control.openSUSE.glade.translations.glade:54
#: control/control.openSUSE.glade.translations.glade:55
#: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
#: control/control.openSUSE.glade.translations.glade:58
#: control/control.openSUSE.glade.translations.glade:59
#: control/control.openSUSE.glade.translations.glade:60
#: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
#: control/control.openSUSE.glade.translations.glade:75
#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
msgid "Perform Installation"
msgstr "&Počni Instalaciju"
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+msgid "Installer Cleanup"
+msgstr "&Instalacija"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
+#, fuzzy
+msgid "Installation"
+msgstr "&Instalacija"
+
# this is a heading
# this is a heading
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
#, fuzzy
msgid "System for Update"
msgstr "Izabrano za ažuriranje"
# Proposal for installation mode
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
msgid "Update"
msgstr "&Dogradnja"
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
+#, fuzzy
+msgid "Update Summary"
+msgstr "Pregled Instalacije"
+
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:122
#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
#, fuzzy
msgid "Perform Update"
msgstr "Performanse"
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "Konfigurisanje"
-
# 'label' is what the user will see
# 'label' is what the user will see
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
msgid "Base Installation"
msgstr "Osnovna &Instalacija"
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
#, fuzzy
msgid "AutoYaST Settings"
msgstr "Podešavanja Auto-instalacije"
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
+msgid "Configuration"
+msgstr "Konfigurisanje"
+
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
msgid "System Configuration"
msgstr "Konfiguracija Sistema"
+#: control/control.SLES.glade.translations.glade:3
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
+msgstr ""
+
+# this is a heading
+# this is a heading
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
#, fuzzy
+msgid "System Role"
+msgstr "Izabrano za ažuriranje"
+
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
+
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
+msgid "KVM Virtualization Host"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+msgid "Xen Virtualization Host"
+msgstr "&Instalacija"
+
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:48
+#, fuzzy
+#| msgid "Network Configuration"
+msgid "Network Services Configuration"
+msgstr "Mrežna podešavanja"
+
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "Mrežna podešavanja"
+
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "Pregled Instalacije"
+
+# congratulation text 2/4
+#: control/control.openSUSE.glade.translations.glade:3
+#, fuzzy
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+"<p>Instalacija &proizvoda; na vašoj mašini je završena.\n"
+"Posle klika na <b>Završi</b> možete da se ulogujete na sistem.</p>\n"
+
+#: control/control.openSUSE.glade.translations.glade:10
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:22
+msgid "KDE Plasma Desktop"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:23
+msgid "Server (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:24
+msgid "Xfce Desktop"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "LXDE Desktop"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Enlightenment Desktop"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+#, fuzzy
+#| msgid "Online Update"
+msgid "Online Repositories"
+msgstr "&Dogradnja preko interneta"
+
+# Headline for X11 configuration screen:
+# The user selects screen resolution and color depth.
+#: control/control.openSUSE.glade.translations.glade:49
+#, fuzzy
+msgid "Desktop Selection"
+msgstr "Setovanja Desktop-a"
+
+#, fuzzy
#~ msgid "Add-On Product Installation"
#~ msgstr "Proizvod "
@@ -302,31 +651,15 @@
#~ msgstr "Osnovna &Instalacija"
#, fuzzy
-#~ msgid "Initialization..."
-#~ msgstr "&Instalacija"
-
-#, fuzzy
#~| msgid "Configuration"
#~ msgid "Finishing configuration..."
#~ msgstr "Konfigurisanje"
#, fuzzy
-#~ msgid "Overview"
-#~ msgstr "&Pregled"
-
-#, fuzzy
-#~ msgid "Expert"
-#~ msgstr "&Napredno"
-
-#, fuzzy
#~| msgid "Perform Repair"
#~ msgid "Repair"
#~ msgstr "Izvrši popravku"
-#, fuzzy
-#~ msgid "Update Summary"
-#~ msgstr "Pregled Instalacije"
-
#~ msgid "System Information"
#~ msgstr "Informacije o sistemu"
@@ -348,9 +681,6 @@
#~ msgid "Customer Center"
#~ msgstr "%Prilagodi popravku"
-#~ msgid "Online Update"
-#~ msgstr "&Dogradnja preko interneta"
-
#~ msgid "Release Notes"
#~ msgstr "Poruke"
@@ -382,14 +712,6 @@
#~ msgid "Clean Up"
#~ msgstr "Očisti"
-#, fuzzy
-#~| msgid "Network Configuration"
-#~ msgid "Network Services Configuration"
-#~ msgstr "Mrežna podešavanja"
-
-#~ msgid "Installation Summary"
-#~ msgstr "Pregled Instalacije"
-
#~ msgid "Service"
#~ msgstr "Servis"
Modified: trunk/yast/sr@Latn/po/country.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/country.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/country.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST2 (keyboard)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-04-18 19:57+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -758,7 +758,7 @@
#. command line help text for 'set hwclock' option
#: timezone/src/clients/timezone.rb:94
#, fuzzy
-msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
msgstr "Kompjuterski sat"
# heading / label
@@ -947,25 +947,25 @@
"Unesite tačan datum.\n"
# push button
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
#, fuzzy
msgid "Other &Settings..."
msgstr "&Napredna podešavanja"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
msgid "Date and Time (NTP is configured)"
msgstr ""
# heading text
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
#, fuzzy
#| msgid "Change System Date and Time"
msgid "Date and Time"
@@ -974,34 +974,34 @@
# Ask for UTC vs. Localtime
# label text
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
#, fuzzy
msgid "&Hardware Clock Set to UTC"
msgstr "&Sistemski sat podešen na"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
msgid "&Region"
msgstr "&Region"
# title for selection box 'timezone'
# title for selection box 'timezone'
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
msgid "Time &Zone"
msgstr "&Vremenska zona"
# heading text
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
#, fuzzy
#| msgid "Change System Date and Time"
msgid "Date and Time:"
msgstr "Promenite sistemski datum i vreme"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
#, fuzzy
msgid ""
"\n"
@@ -1009,7 +1009,7 @@
msgstr "<p><b><big>Utvrđivanje profila</big></b><br>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -1019,7 +1019,7 @@
msgstr ""
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -1028,13 +1028,13 @@
# Screen title for timezone screen
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
#, fuzzy
msgid "Clock and Time Zone"
msgstr "Podešavanje vremena i vremenske zone"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
#, fuzzy
msgid "Select a valid time zone."
msgstr "Izberite model štampača."
@@ -1131,189 +1131,196 @@
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "Španija (Južna Amerika)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Italian"
msgstr "Italija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese"
msgstr "Portugalija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil)"
msgstr "Portugalija (Brazil)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Portuguese (Brazil -- US accents)"
msgstr "Portugalija (Brazil -- SAD akcenat)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Greek"
msgstr "Grčka"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Dutch"
msgstr "Holandija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Danish"
msgstr "Danska"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Norwegian"
msgstr "Norveška"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Swedish"
msgstr "Švedska"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Finnish"
msgstr "Finska"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
msgid "Czech"
msgstr "Češka"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
msgid "Czech (qwerty)"
msgstr "Češka (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
msgid "Slovak"
msgstr "Slovačka"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
msgid "Slovak (qwerty)"
msgstr "Slovačka (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
msgid "Slovene"
msgstr "Sloveni"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "Mađarska"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "Poljska"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "Rusija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "српски"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "Estonski"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
#, fuzzy
msgid "Lithuanian"
msgstr "Litvanija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "Turska"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "Hrvatski"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "Japan"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "Belgija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "Dvorak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
#, fuzzy
msgid "Icelandic"
msgstr "Island"
# "TW" : _("Taiwan R.O.C."),
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
#, fuzzy
msgid "Ukrainian"
msgstr "Ukrajina"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "кмерски"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr ""
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr ""
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
#, fuzzy
#| msgid "Tajikistan"
msgid "Tajik"
msgstr "Tadžikistan"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr ""
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr ""
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
#, fuzzy
#| msgid "Romania"
msgid "Romanian"
msgstr "Rumunija"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr ""
Modified: trunk/yast/sr@Latn/po/crowbar.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/crowbar.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/crowbar.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2013-01-30 16:28+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -23,19 +23,9 @@
msgid "Configuration of crowbar"
msgstr ""
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr ""
-
#. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr ""
-
-#. target platform name
#: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
+msgid "SLES 12 SP1"
msgstr ""
#. combobox label
@@ -47,11 +37,11 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough 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"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-…</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
@@ -170,124 +160,132 @@
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
msgid "Name"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
msgid "URL"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
msgid "Ask On Error"
msgstr ""
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
msgid "Target Platform"
msgstr ""
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
#. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
msgid ""
"Repository '%1' already exists.\n"
"Choose a different name."
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
msgid "Server &URL"
msgstr ""
#. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
msgid "Repository Name"
msgstr ""
#. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
msgid "&Ask On Error"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
msgid "Repository &URL"
msgstr ""
#. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
msgid "A&dd Repository"
msgstr ""
#. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
+msgid "Local SMT Server"
+msgstr ""
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
msgid "Remote SMT Server"
msgstr ""
#. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
msgid "SUSE Manager Server"
msgstr ""
#. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
msgid "Custom"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
msgid "User Name"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
msgid "Password"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
msgid "Repeat the Password"
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
msgid "User name cannot be empty."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
msgid ""
"The passwords do not match.\n"
"Try again."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
msgid ""
"User '%1' already exists.\n"
"Choose a different name."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
msgid "The interface format '%1' is not valid"
msgstr ""
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
msgid "disabled"
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
msgid ""
"The netmask '%1' is invalid.\n"
"%2"
@@ -295,91 +293,91 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
msgid ""
"The IP address '%1' is invalid.\n"
"%2"
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
msgid ""
"The router address '%1' is invalid.\n"
"%2"
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
msgid "The router address '%1' is not part of network '%2'."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
msgid "The IP address '%1' is not part of network '%2'."
msgstr ""
#. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
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:1335
+#: src/include/crowbar/complex.rb:1326
msgid "Min IP Address"
msgstr ""
#. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
msgid "Max IP Address"
msgstr ""
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
msgid "The address '%1' is not part of network '%2'."
msgstr ""
#. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
msgid "The lowest address must be lower than the highest one."
msgstr ""
#. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
msgid "Ranges '%1' and '%2' are overlapping."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
msgid "&User Settings"
msgstr ""
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
msgid "N&etwork Mode"
msgstr ""
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
msgid "Bastion Network"
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
msgid "Net&works"
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
msgid "Re&positories"
msgstr ""
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
msgid ""
"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
@@ -388,7 +386,7 @@
msgstr ""
#. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
msgid "Crowbar Configuration Overview"
msgstr ""
@@ -433,37 +431,37 @@
msgstr ""
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
msgid "Initializing crowbar Configuration"
msgstr ""
#. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
msgid "Read the configuraton"
msgstr ""
#. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
msgid "Reading the configuration..."
msgstr ""
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
msgid "Finished"
msgstr ""
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
msgid "Saving crowbar Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
msgid "Write the settings"
msgstr ""
#. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
msgid "Writing the settings..."
msgstr ""
Modified: trunk/yast/sr@Latn/po/dhcp-server.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/dhcp-server.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/dhcp-server.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-04-19 11:27+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -76,9 +76,7 @@
# dialog caption
#. command line help text for an option
-#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
#, fuzzy
msgid "List all defined hosts with a fixed address"
msgstr "Podešavanje računara sa fiksnom adresom"
@@ -132,82 +130,82 @@
# ComboBox label
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
#, fuzzy
msgid "Select the network interface to use"
msgstr "Izaberite serijski i&nterfejs za korišćenje:"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
msgid "Print the currently used interface and list other available interfaces"
msgstr ""
# heading / label
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
#, fuzzy
msgid "Print current options"
msgstr "Trenutna opcija:"
# menubutton item
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
#, fuzzy
msgid "Set a global option"
msgstr "Promeni globalne opcije"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
msgid "Option key (for example, ntp-servers)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
#, fuzzy
msgid "Option value (for example, IP address)"
msgstr "&Nepravilna IP adresa."
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
msgid "Lowest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
msgid "Highest IP address of the dynamic address assigning range"
msgstr ""
# translators: command line help text for the domain option
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
#, fuzzy
msgid "Default lease time in seconds"
msgstr "Podrazumevano okruženje"
# Popup text
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
#, fuzzy
msgid "Maximum lease time in seconds"
msgstr "Morate odrediti prekid veze usled neaktivnosti u sekundama."
# State label text
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
#, fuzzy
msgid "DHCP server is enabled"
msgstr "SCPM je uključen."
# Alternative state label text:
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
#, fuzzy
msgid "DHCP server is disabled"
msgstr "SCPM je isključen."
# table entry, %1 is IP address
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
#, fuzzy
msgid "Host: %1"
msgstr "Host računar %1"
@@ -215,74 +213,74 @@
# Table header 4/4
#. command-line text output, %1 is hardwarre address
#. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
#, fuzzy
msgid "Hardware: %1"
msgstr "Hardver"
# translators: IP address for the new host
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
#, fuzzy
msgid "IP Address: %1"
msgstr "&IP adresa"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
#, fuzzy
msgid "Hostname not specified."
msgstr "Naziv posla nije naveden."
# command line error report
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
#, fuzzy
msgid "Specified host does not exist."
msgstr "Definisana opcija ne postoji."
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
msgid "None"
msgstr "Nema"
# popup title to select a interface for an edit/delete operation
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
#, fuzzy
msgid "Selected Interfaces: %1"
msgstr "&Izaberite interfejs"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
#, fuzzy
msgid "Other Interfaces: %1"
msgstr "&Interni interfejs:"
# command line error report
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
#, fuzzy
msgid "Specified interface does not exist."
msgstr "Definisana opcija ne postoji."
# command line error report
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
#, fuzzy
msgid "Operation with the interface not specified."
msgstr "Opcija nije definisana."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
#, fuzzy
msgid "Option key must be set."
msgstr "Korinsik mora biti izabran."
# popup message
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
#, fuzzy
msgid "Value must be set."
msgstr "Vrednost mora biti definisana"
@@ -290,34 +288,42 @@
# CheckBox label
# Checkbox label
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
#, fuzzy
msgid "Address Range: %1-%2"
msgstr "&Dinamička IP adresa"
# translators: command line help text for the domain option
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
#, fuzzy
msgid "Default Lease Time: %1"
msgstr "Podrazumevano okruženje"
# translators: command line help text for the domain option
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
#, fuzzy
msgid "Maximum Lease Time: %1"
msgstr "Podrazumevano okruženje"
# yes-no popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
msgid "Saving the configuration failed. Change the settings?"
msgstr "Snimane podešavanja neuspešno. Promeniti podešavanja?"
+# yes-no popup
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+#| msgid "Saving the configuration failed. Change the settings?"
+msgid "Saving the configuration failed"
+msgstr "Snimane podešavanja neuspešno. Promeniti podešavanja?"
+
# dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
msgid "DHCP Server Configuration"
msgstr "DHCP Server konfiguracija"
@@ -325,20 +331,20 @@
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
msgid "Global Options"
msgstr "Globalne opcije"
# dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
msgid "Subnet Configuration"
msgstr "Subnet podešavanja"
# dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
#, fuzzy
msgid "Host with Fixed Address"
msgstr "Podešavanje računara sa fiksnom adresom"
@@ -346,78 +352,78 @@
# radio button
# radio button
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
#, fuzzy
msgid "Shared Network"
msgstr "&Deljena mreža"
# radio button
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
#, fuzzy
msgid "Pool of Addresses"
msgstr "&Skup adresa"
# dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
#, fuzzy
msgid "Group-Specific Options"
msgstr "Podešavanje specifičnih grupnih opcija"
# table header
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
msgid "Class"
msgstr "&Klasa"
# radio button
#. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
msgid "&Subnet"
msgstr "Subnet"
# radio button
#. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
msgid "&Host"
msgstr "&Naziv servera"
# radio button
# radio button
#. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
msgid "Shared &Network"
msgstr "&Deljena mreža"
# radio button
# radio button
#. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
msgid "&Group"
msgstr "Grupa"
# radio button
#. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
msgid "&Pool of Addresses"
msgstr "&Skup adresa"
# radio button
#. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
msgid "&Class"
msgstr "&Klasa"
# frame
#. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
msgid "Declaration Types"
msgstr "Tipovi deklaracija"
# frame
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
#, fuzzy
msgid "Declaration Type"
msgstr "Tipovi deklaracija"
@@ -425,8 +431,8 @@
# dialog caption
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
msgid "Interface Configuration"
msgstr "Konfiguracija interfersa"
@@ -434,8 +440,8 @@
# item of a menu button
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
msgid "TSIG Key Management"
msgstr "Upravljanje TSIG ključa"
@@ -466,7 +472,7 @@
# dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
#, fuzzy
msgid "DHCP Server: Start-Up"
msgstr "DHCP Server konfiguracija"
@@ -474,9 +480,9 @@
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
#, fuzzy
msgid "Start-Up"
msgstr "Početak"
@@ -484,21 +490,21 @@
# DIALOG TEXTS
# title of ISDN service selection dialog
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
#, fuzzy
msgid "DHCP Server: Card Selection"
msgstr "Biranje ISDN servisa"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
#, fuzzy
msgid "Card Selection"
msgstr "&Učitaj Selekciju"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
#, fuzzy
msgid "DHCP Server: Global Settings"
msgstr "Podešavanja CUPS servera"
@@ -506,15 +512,15 @@
# Translators: dialog caption
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
#, fuzzy
msgid "Global Settings"
msgstr "Osnovna podešavanja"
# push button
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
#, fuzzy
msgid "DHCP Server: Dynamic DHCP"
msgstr "&Dinamički DNS"
@@ -522,40 +528,40 @@
# push button
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
#, fuzzy
msgid "Dynamic DHCP"
msgstr "&Dinamički DNS"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
#, fuzzy
msgid "DHCP Server: Host Management"
msgstr "Menadžment"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
#, fuzzy
msgid "Host Management"
msgstr "Menadžment"
# Wireless expert dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
#, fuzzy
msgid "DHCP Server: Expert Settings"
msgstr "Napredna bežična podešavanja"
# push button
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
#, fuzzy
msgid "Expert Settings"
msgstr "&Napredna podešavanja"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
#, fuzzy
msgid "When &Booting"
msgstr "Kada sa Sistem &Učitava"
@@ -563,13 +569,13 @@
# ComboBox item
# ComboBox item (device start mode)
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
#, fuzzy
msgid "&Manually"
msgstr "Ručno"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
#, fuzzy
msgid "When Booting"
msgstr "Kada sa Sistem &Učitava"
@@ -577,87 +583,33 @@
# ComboBox item
# ComboBox item (device start mode)
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
msgid "Manually"
msgstr "Ručno"
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
-#, fuzzy
-msgid "DHCP server is running"
-msgstr "Podešavanja CUPS servera"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-#, fuzzy
-msgid "DHCP server is not running"
-msgstr "Podešavanja CUPS servera"
-
-# check box
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-#, fuzzy
-msgid "&Start DHCP Server Now"
-msgstr "Startuj DHCP server"
-
-# check box
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-#, fuzzy
-msgid "S&top DHCP Server Now"
-msgstr "Startuj DHCP server"
-
-# menubutton entry, try to keep short
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "Snimi podešavanja i restartuj DHCP server"
-
-# check box
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-#, fuzzy
-msgid "Start DHCP Server Now"
-msgstr "Startuj DHCP server"
-
-# check box
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-#, fuzzy
-msgid "Stop DHCP Server Now"
-msgstr "Startuj DHCP server"
-
-# menubutton entry, try to keep short
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "Snimi podešavanja i restartuj DHCP server"
-
# dialog caption
-#: src/include/dhcp-server/dialogs2.rb:371
+#: src/include/dhcp-server/dialogs2.rb:334
#, fuzzy
msgid "DHCP Server Start-up Arguments"
msgstr "DHCP Server konfiguracija"
# menubutton entry, try to keep short
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
#, fuzzy
msgid "Network Cards for DHCP Server"
msgstr "Restart DHCP servera"
# radio button label
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
#, fuzzy
msgid "Selected"
msgstr "Izabrani"
# frame
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
#, fuzzy
msgid "Interface Name"
msgstr "Klase interfejsa"
@@ -665,15 +617,15 @@
# tree node string
# tree node string
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
#, fuzzy
msgid "Device Name"
msgstr "Ime uređaja"
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
#, fuzzy
msgid "IP"
msgstr "SIP"
@@ -683,21 +635,21 @@
# make it short
# appears in help text too
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
msgid "&Select"
msgstr "&Selektuj"
# push button label
# push button label
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
#, fuzzy
msgid "&Deselect"
msgstr "&Obriši sve"
# table cell description
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
#, fuzzy
msgid "DHCP address"
msgstr "&IP adresa"
@@ -705,14 +657,14 @@
# Popup text
#. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
#, fuzzy
msgid "At least one network interface must be selected."
msgstr "Najmanje jedan ethernet interfejs mora biti podešen."
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
msgid ""
"One or more selected network interfaces is not configured (no assigned IP address \n"
"and netmask)."
@@ -721,8 +673,8 @@
# screen caption
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
#, fuzzy
msgid "&LDAP Support"
msgstr "SUSE Podrška"
@@ -730,69 +682,69 @@
# DIALOG TEXTS
# title of ISDN service selection dialog
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
#, fuzzy
msgid "DHCP Server &Name (optional)"
msgstr "Biranje ISDN servisa"
# text entry
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
msgid "&Domain Name"
msgstr "Naziv domena"
# text entry
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
#, fuzzy
msgid "&Primary Name Server IP"
msgstr "&Primarni DNS server"
# combo box item, NS is more technical description
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
#, fuzzy
msgid "&Secondary Name Server IP"
msgstr "NS -- Suse IMAP Server"
# ComboBox label
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
#, fuzzy
msgid "Default &Gateway (Router) "
msgstr "Podrazumevani &gejtvej"
# text entry
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
#, fuzzy
msgid "NTP &Time Server"
msgstr "SuSE IMAP Server"
# tree node string
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
#, fuzzy
msgid "&Print Server"
msgstr "Štampač"
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
#, fuzzy
msgid "&WINS Server"
msgstr "NIS serveri"
# translators: command line help text for the domain option
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
#, fuzzy
msgid "Default &Lease Time"
msgstr "Podrazumevano okruženje"
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
msgid "&Units"
msgstr ""
@@ -801,17 +753,17 @@
#. error popup
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
#, fuzzy
msgid "The specified value is not a valid hostname or IP address."
msgstr "Navedena datoteka ne postoji ili je prazna."
# dialog caption
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
#, fuzzy
#| msgid "Subnet Configuration"
msgid "Subnet Information"
@@ -820,13 +772,13 @@
# radio button
# radio button
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
#, fuzzy
msgid "Current &Network"
msgstr "&Deljena mreža"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
#, fuzzy
msgid "Current Net&mask"
msgstr "Status:"
@@ -834,7 +786,7 @@
# Table header label
# Table header 3/4
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
#, fuzzy
msgid "Netmask Bi&ts"
msgstr "Mrežna maska"
@@ -842,7 +794,7 @@
# text entry
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
#: src/include/dhcp-server/dns-server-dialogs.rb:81
#, fuzzy
msgid "Min&imum IP Address"
@@ -851,14 +803,14 @@
# text entry
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
#: src/include/dhcp-server/dns-server-dialogs.rb:83
#, fuzzy
msgid "Ma&ximum IP Address"
msgstr "&Najmanja IP adresa"
# table cell description
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
#, fuzzy
msgid "IP Address Range"
msgstr "&IP adresa"
@@ -868,10 +820,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
#, fuzzy
msgid "&First IP Address"
msgstr "&Na&jveća IP adresa"
@@ -881,55 +833,55 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
#, fuzzy
msgid "&Last IP Address"
msgstr "&Najmanja IP adresa"
# checkbox
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
msgid "Allow Dynamic &BOOTP"
msgstr "Dozvoli dinamičko &BOOTP"
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
#, fuzzy
msgid "Lease Time"
msgstr "U realnom vremenu"
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
#, fuzzy
msgid "&Default"
msgstr "Podrazumevano"
# IntField label
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
#, fuzzy
msgid "&Maximum"
msgstr "Ma&ksimum"
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
msgid "Uni&ts"
msgstr ""
# radiobutton
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
#, fuzzy
msgid "Create New DNS Zone from Scratch"
msgstr "&Pokreni novo podešavanje od početka"
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
#, fuzzy
msgid "Edit Current DNS Zone"
msgstr "Tekuči DMA mod:"
@@ -937,19 +889,19 @@
# radiobutton
# radiobutton
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
#, fuzzy
msgid "Get Current Zone Information"
msgstr "Promeni &trenutna podešavanja"
# check box
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
#, fuzzy
msgid "&Synchronize DNS Server..."
msgstr "Startuj DNS Server"
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -957,8 +909,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
msgid "Enter values for both ends of the IP address range."
msgstr ""
@@ -966,8 +918,8 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
msgid ""
"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
@@ -975,77 +927,77 @@
# selection box label
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
#, fuzzy
msgid "Registered Host"
msgstr "Udaljeni računari-host"
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
msgid "Name"
msgstr "Ime"
# Label text
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
#, fuzzy
msgid "Hardware Address"
msgstr "Ime hardware-a"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
msgid "Type"
msgstr "Tip"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
#, fuzzy
msgid "List Setup"
msgstr "&Statično podešavanje"
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
msgid "&Name"
msgstr "&Ime"
# text entry
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
msgid "&IP Address"
msgstr "&IP adresa"
# Label text
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
#, fuzzy
msgid "&Hardware Address"
msgstr "Ime hardware-a"
# combo box entry, networking technology name
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
#, fuzzy
msgid "&Ethernet"
msgstr "Ethernet"
# combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
#, fuzzy
msgid "&Token Ring"
msgstr "Token Ring"
# button label
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
#, fuzzy
msgid "C&hange in List"
msgstr "Promeni tačku &montiranja"
# Pushbutton label
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
#, fuzzy
msgid "Dele&te from List"
msgstr "Izaberite sa &liste"
@@ -1053,43 +1005,43 @@
# combo box entry, networking technology name
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
msgid "Ethernet"
msgstr "Ethernet"
# combo box entry, networking technology name
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
msgid "Token Ring"
msgstr "Token Ring"
# Popup::Error text
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
#, fuzzy
msgid "The hardware address is invalid.\n"
msgstr "IP adresa je nepravilna."
# message popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
#, fuzzy
msgid "The hardware address must be unique."
msgstr "Najmanje jedna adresa se mora definisati"
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
#, fuzzy
msgid "The hostname cannot be empty."
msgstr "Brojevi telefona ne smiju biti izostavljeni."
# Popup::Message text
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
#, fuzzy
msgid "A host named %1 already exists."
msgstr "Ime provajdera %1 već postoji."
@@ -1097,36 +1049,36 @@
# message popup
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
#, fuzzy
msgid "Enter a host IP."
msgstr "Unesite naziv stanice."
# command line error report
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
#, fuzzy
msgid "The hardware address must be defined."
msgstr "Ime sekcije se mora definsati."
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
#, fuzzy
msgid "Select a host first."
msgstr "Prvo izaberite skript"
# command line error report
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
#, fuzzy
msgid "The input value must be defined."
msgstr "Ime sekcije se mora definsati."
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -1139,15 +1091,15 @@
msgstr ""
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -1161,7 +1113,7 @@
# DIALOG TEXTS
# title of ISDN service selection dialog
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
#, fuzzy
msgid "DHCP Server Wizard (%1 of 4)"
msgstr "Biranje ISDN servisa"
@@ -1392,7 +1344,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
#, fuzzy
msgid "The last IP address must be higher than the first one."
msgstr "Najmanja adresa mora biti manja od najveće."
@@ -1417,7 +1369,7 @@
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
#, fuzzy
msgid "Invalid hostname."
msgstr "Nepravilno ime servera."
@@ -1429,9 +1381,9 @@
#. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
#: src/include/dhcp-server/dns-server-dialogs.rb:462
#: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
msgid "Invalid IP address."
msgstr "&Nepravilna IP adresa."
@@ -1448,14 +1400,14 @@
# progress step
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
#, fuzzy
msgid "Regenerating DNS zone entries..."
msgstr "Ažuriram datoteke zone..."
# frame
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
#, fuzzy
msgid "Adding a New DNS Record"
msgstr "Dodaj novi ključ"
@@ -1463,7 +1415,7 @@
# text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
#: src/include/dhcp-server/dns-server-wizard.rb:148
#, fuzzy
msgid "&Hostname"
@@ -1471,35 +1423,35 @@
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr ""
# push button
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
#, fuzzy
msgid "Removing DNS Records Matching Range"
msgstr "Promeni &NS i MX zapise"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr ""
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
msgstr ""
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1508,19 +1460,19 @@
# translators:: error message
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
#: src/include/dhcp-server/dns-server-wizard.rb:1107
#, fuzzy
msgid "Cannot create zone %1."
msgstr "Ne mogu da kreiram datoteku '%1'."
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
msgid "Synchronizing DNS reverse records..."
msgstr ""
#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
@@ -1528,74 +1480,74 @@
# text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
msgid "&Domain"
msgstr "&Domen"
# this is a menu entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
msgid "&Network"
msgstr "&Mreža"
# TextEntry label
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "Net&mask"
msgstr "Net&mask"
# push button
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
#, fuzzy
msgid "DNS Zone Records"
msgstr "Promeni &NS i MX zapise"
# text entry
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
#, fuzzy
msgid "Hostname"
msgstr "&Naziv računara"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Assigned IP"
msgstr ""
# push button label
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
#, fuzzy
msgid "&Add..."
msgstr "Doda&ti"
# Frame label
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
#, fuzzy
msgid "&Special Tasks"
msgstr "Specijalna podešavanja"
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
msgid "Add New Range of DNS Records"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr ""
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
msgid "Synchronize with Reverse Zone %1"
msgstr ""
# DIALOG TEXTS
# title of ISDN service selection dialog
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
#, fuzzy
msgid "DHCP Server: DNS Server Synchronization"
msgstr "Biranje ISDN servisa"
@@ -1941,8 +1893,7 @@
# help text 1/2
#. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1969,22 +1920,9 @@
"Interfejsi zaštitnog zida <b>nisu</b> dodati ili obrisani.\n"
"Ova opcija je dostupna samo ako je zaštitni zid uključen.</p>\n"
-# help text 1/4
-#. help text 1/5
-#: src/include/dhcp-server/helps.rb:39
-#, fuzzy
-msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>Pokreni DHCP Server</big></b><br>\n"
-"Za pokretanje DHCP servera svaki put kada se uključi računar, podesite\n"
-"<b>Pokretanje DHCP Servera</b>.</p>"
-
# help text 2/4
#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
+#: src/include/dhcp-server/helps.rb:39
#, fuzzy
msgid ""
"<p>\n"
@@ -1998,7 +1936,7 @@
"u chroot zatvoru je bezbednije i preporučuje se."
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -2007,7 +1945,7 @@
# help text 3/4
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
#, fuzzy
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
@@ -2024,7 +1962,7 @@
# help text 4/4
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
#, fuzzy
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
@@ -2041,7 +1979,7 @@
# help text 1/3, alt. 1
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
#, fuzzy
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
@@ -2052,7 +1990,7 @@
# help text 1/3, alt. 1
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
#, fuzzy
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
@@ -2065,7 +2003,7 @@
# help text 1/3, alt. 3
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
#, fuzzy
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
@@ -2079,7 +2017,7 @@
# help text 1/3, alt. 4
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
#, fuzzy
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
@@ -2093,7 +2031,7 @@
# help text 1/3, alt. 5
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
#, fuzzy
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
@@ -2107,7 +2045,7 @@
# help text 1/3, alt. 6
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
#, fuzzy
msgid ""
"<p><b><big>Class</big></b><br>\n"
@@ -2118,7 +2056,7 @@
# help text 2/3
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
#, fuzzy
msgid ""
"<p>\n"
@@ -2135,7 +2073,7 @@
# help text 3/3
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
#, fuzzy
msgid ""
"<p>\n"
@@ -2146,7 +2084,7 @@
# help text 1/4
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -2158,7 +2096,7 @@
# help text 2/4
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -2175,7 +2113,7 @@
# help text 3/4
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -2189,7 +2127,7 @@
# help text 4/4
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -2202,7 +2140,7 @@
"server, you can leave the fields empty.</p>"
#. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
"Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -2212,7 +2150,7 @@
# Network cards overview dialog help 1/3
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
#, fuzzy
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
@@ -2223,7 +2161,7 @@
"promenite njihova podešavanja.<br></p>"
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
@@ -2231,7 +2169,7 @@
# help text 1/3, alt. 6
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
#, fuzzy
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
@@ -2242,14 +2180,14 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -2258,7 +2196,7 @@
# help text 3/3
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
#, fuzzy
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
@@ -2269,33 +2207,33 @@
"putanja.</p>\n"
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
msgstr ""
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr ""
#. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
msgstr ""
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
msgid ""
"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
msgstr ""
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -2304,7 +2242,7 @@
msgstr ""
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -2315,7 +2253,7 @@
msgstr ""
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -2323,14 +2261,14 @@
msgstr ""
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
msgstr ""
#. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
#, fuzzy
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
@@ -2342,7 +2280,7 @@
# help text 1/3, alt. 1
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
#, fuzzy
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
@@ -2353,7 +2291,7 @@
"specijalne opcije.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -2364,7 +2302,7 @@
# help 2/4, optional
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
#, fuzzy
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr ""
@@ -2373,14 +2311,14 @@
# help text 1/7
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
#, fuzzy
msgid "<p>Select the type of declaration to add.</p>"
msgstr "<p>Izaberite tip deklaracije za dodavanje.</p>"
# help text 2/7, optional
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
@@ -2390,7 +2328,7 @@
# help text 3/7, optional
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
#, fuzzy
msgid ""
"<p>To add a host that needs special parameters\n"
@@ -2401,7 +2339,7 @@
# help text 4/7, optional
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
@@ -2411,7 +2349,7 @@
# help text 5/7, optional
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
@@ -2421,7 +2359,7 @@
# help text 6/7, optional
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2433,7 +2371,7 @@
# help text 7/7, optional
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
#, fuzzy
msgid ""
"<p>To create a condition class that can be used for\n"
@@ -2448,17 +2386,17 @@
#. selection box
#. selection box
#. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
msgid "A&ddresses"
msgstr "A&drese"
# popup message
#. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
#, fuzzy
msgid "The entered address is not valid."
msgstr "Uneta adresa nije ispravna."
@@ -2466,8 +2404,8 @@
# message popup
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
#, fuzzy
msgid "At least one address must be specified."
msgstr "Najmanje jedna adresa se mora definisati"
@@ -2479,87 +2417,87 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
msgid "&Values"
msgstr "&Vrednosti"
# message popup
#. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
#, fuzzy
msgid "The entered addresses are not valid."
msgstr "Unete adrese nisu ispravne."
# message popup
#. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
#, fuzzy
msgid "At least one address pair must be specified."
msgstr "Najmanje jedna adresa se mora definisati"
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
msgid "On"
msgstr "Uključeno"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
msgid "Off"
msgstr "Isključeno"
# popup message
#. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
#, fuzzy
msgid "A value must be specified."
msgstr "Vrednost mora biti definisana"
# text entry
#. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
msgid "&New Address"
msgstr "&Nova adresa"
# int field
#. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
msgid "&New Value"
msgstr "&Nova vrednost"
# label (in role of help text)
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
#, fuzzy
msgid "Separate multiple addresses with spaces."
msgstr "Odvojite adrese sa razmakom"
# push button
#. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
msgid "&Add Address Pair"
msgstr "&Dodaj par adresa"
# popup message
#. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
msgid "The lowest address must be lower than the highest one."
msgstr "Najmanja adresa mora biti manja od najveće."
# label -- help text
#. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
msgid "If you change this, also update the syslog configuration."
msgstr "Ako ovo promenite, takođe ažurirajte syslog podešavanje."
# combo box
#. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
msgid "&Hardware Type"
msgstr "&Hardware-ski tip"
@@ -2567,25 +2505,25 @@
# translation would decrease the understandability
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
msgid "&MAC Address"
msgstr "&MAC Adresa"
# text entry
#. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
msgid "&Lowest IP Address"
msgstr "&Najmanja IP adresa"
# text entry
#. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
msgid "&Highest IP Address"
msgstr "&Na&jveća IP adresa"
# Yes-No popup
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
#, fuzzy
msgid ""
"If you leave the DHCP server configuration without saving,\n"
@@ -2595,7 +2533,7 @@
"Sva podešavanja će biti izgubljena."
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2603,7 +2541,7 @@
msgstr ""
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
"%1\n"
@@ -2611,7 +2549,7 @@
msgstr ""
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
"Run the YaST firewall configuration to assign it to a zone."
@@ -2619,8 +2557,8 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
#, fuzzy
msgid ""
"This function is not available during\n"
@@ -2629,174 +2567,160 @@
"Ova funkcija nije dostupna dok traje\n"
"priprema za autoinstalaciju.\n"
-# menubutton entry, try to keep short
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-msgid "Restart DHCP Server"
-msgstr "Restart DHCP servera"
-
-# menubutton entry, try to keep short
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-msgid "Save Settings and Restart DHCP Server"
-msgstr "Snimi podešavanja i restartuj DHCP server"
-
# tree widget
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
msgid "&Configured Declarations"
msgstr "Konfigurisane deklaracije"
# push button
#. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
msgid "&Dynamic DNS"
msgstr "&Dinamički DNS"
# combo box
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
msgid "Forward Zone TSIG &Key"
msgstr "Napredna zona TSIG &ključa"
# combo box
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
msgid "Reverse Zone TSIG &Key"
msgstr "Povratna zona TSIG &kluča"
# popup headline
#. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
msgid "Select File with Authentication Key"
msgstr "Izaberite datoteku sa autentifikacionim ključem"
-# check box
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-msgid "&Start DHCP Server"
-msgstr "Startuj DHCP server"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
# check box
#. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
msgid "&Run DHCP Server in Chroot Jail"
msgstr "&Pokreni DHCP Server u Chroot zatvoru"
# menu button
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
msgid "Ad&vanced"
msgstr "&Napredna podešavanja"
# item of a menu button
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
msgid "Display &Log"
msgstr "Prikaži iz&veštaj"
# item of a menu button
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
msgid "&Interface Configuration"
msgstr "Konfiguracija interfejsa"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
msgid "&Network Address"
msgstr "&Mrežna adresa"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
msgid "Network &Mask"
msgstr "&Mrežna maska"
# text entry
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
msgid "Group &Name"
msgstr "Ime grupe"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
msgid "Pool &Name"
msgstr "Ime &skupa"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
msgid "Shared Network &Name"
msgstr "Ime deljene &mreže"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
msgid "Class &Name"
msgstr "I&me klase"
# multi selection box
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
msgid "Available Interfaces"
msgstr "Raspoloživi interfejsi"
# popup title to select a interface for an edit/delete operation
#. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
#, fuzzy
msgid "Open &Firewall for Selected Interfaces"
msgstr "&Izaberite interfejs"
# check box
#. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
msgid "&Enable Dynamic DNS for This Subnet"
msgstr "&Uključi dinamički DNS za ovu podmrežu"
# check box
#. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
#, fuzzy
msgid "&Update Global Dynamic DNS Settings"
msgstr "Ažuriraj opšta dinamička DNS podešavanja"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
msgid "&Zone"
msgstr "&Zona"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
msgid "&Primary DNS Server"
msgstr "&Primarni DNS server"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
msgid "Re&verse Zone"
msgstr "Povra&tna zona"
# text entry
#. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
msgid "Pr&imary DNS Server"
msgstr "Prim&arni DNS server"
# dialog caption
#. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
#, fuzzy
msgid "DHCP Server &Expert Configuration..."
msgstr "DHCP Server konfiguracija"
@@ -2804,68 +2728,68 @@
# Dhcp-server read dialog caption
# Dhcp-server read dialog caption
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
msgid "Initializing DHCP Server Configuration"
msgstr "Pokretanje podešavanja DHCP Servera"
# progress stage
#. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
msgid "Check the environment"
msgstr "Proverite okruženje"
# step 4/5
#. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
msgid "Read firewall settings"
msgstr "Čitanje podešavanja zaštitnog zida"
#. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
#, fuzzy
msgid "Read DHCP server settings"
msgstr "Podešavanja CUPS servera"
#. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
#, fuzzy
msgid "Read DNS server settings"
msgstr "Podešavanja CUPS servera"
# progress step
#. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
msgid "Checking the environment..."
msgstr "Provera okruženja..."
# Progress step 8/9
#. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
msgid "Reading firewall settings..."
msgstr "Čitanje podešavanja zaštitnog zida..."
# progress stage
#. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
#, fuzzy
msgid "Reading DHCP server settings..."
msgstr "Čitanje podešavanja korisnika..."
# progress stage
#. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
#, fuzzy
msgid "Reading DNS server settings..."
msgstr "Čitanje podešavanja korisnika..."
# progress step
#. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
msgid "Finished"
msgstr "&Završeno"
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2876,14 +2800,14 @@
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:1475
+#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
msgstr ""
#. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
@@ -2891,82 +2815,82 @@
# Dhcp-server read dialog caption */
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
msgid "Saving DHCP Server Configuration"
msgstr "Snimanje konfiguracije DHCP servera"
# progress stage:
#. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
#, fuzzy
msgid "Write DHCP server settings"
msgstr "Snimi podešavanja korisnika"
# Progress stage 3/7
#. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
msgid "Write firewall settings"
msgstr "Snimanje podešavanja zaštitnog zida"
# progress stage
#. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
msgid "Restart DHCP server"
msgstr "Restartovanje DHCP servera"
# progress stage:
#. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
#, fuzzy
msgid "Write DNS server settings"
msgstr "Snimi podešavanja korisnika"
#. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
#, fuzzy
msgid "Writing DHCP server settings..."
msgstr "Snimam NFS server konfiguraciju"
# Progress step 3/7
#. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
msgid "Writing firewall settings..."
msgstr "Snimanje podešavanja zaštitnog zida..."
# progress step
#. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
msgid "Restarting DHCP server..."
msgstr "Restartovanje DHCP servera..."
#. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
#, fuzzy
msgid "Writing DNS server settings..."
msgstr "Snimam NFS server konfiguraciju"
# error report
#. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
#, fuzzy
msgid "Error occurred while restarting the DHCP daemon."
msgstr "Dogodila se greška prilikom restartovanja DHCP daemon-a."
# summary string
#. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
msgid "The DHCP server is started at boot time"
msgstr "DHCP server je startovan pri pokretanju računara"
# summary string
#. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
msgid "The DHCP server is not started at boot time"
msgstr "DHCP server nije startovan pri pokretanju računara"
# translators: table entry for Listen statements
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
#, fuzzy
msgid "Listen On: %1"
msgstr "Slušati"
@@ -2974,23 +2898,23 @@
# CheckBox label
# Checkbox label
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
#, fuzzy
msgid "Dynamic Address Range: %1"
msgstr "&Dinamička IP adresa"
#. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
#, fuzzy
msgid "DHCP service DN is not defined."
msgstr "CUPS server nije naveden."
@@ -3001,21 +2925,21 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#: src/modules/DhcpServer.pm:2754
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "Greška pri snimanju reda %1."
# error report
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
#, fuzzy
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "Dogodila se greška prilikom restartovanja DHCP daemon-a."
@@ -3023,11 +2947,72 @@
# message popup
# message popup
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
#, fuzzy
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
+#, fuzzy
+#~ msgid "DHCP server is running"
+#~ msgstr "Podešavanja CUPS servera"
+
+#, fuzzy
+#~ msgid "DHCP server is not running"
+#~ msgstr "Podešavanja CUPS servera"
+
+# check box
+#, fuzzy
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "Startuj DHCP server"
+
+# check box
+#, fuzzy
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "Startuj DHCP server"
+
+# menubutton entry, try to keep short
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "Snimi podešavanja i restartuj DHCP server"
+
+# check box
+#, fuzzy
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "Startuj DHCP server"
+
+# check box
+#, fuzzy
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "Startuj DHCP server"
+
+# menubutton entry, try to keep short
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "Snimi podešavanja i restartuj DHCP server"
+
+# help text 1/4
+#, fuzzy
+#~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Pokreni DHCP Server</big></b><br>\n"
+#~ "Za pokretanje DHCP servera svaki put kada se uključi računar, podesite\n"
+#~ "<b>Pokretanje DHCP Servera</b>.</p>"
+
+# menubutton entry, try to keep short
+#~ msgid "Restart DHCP Server"
+#~ msgstr "Restart DHCP servera"
+
+# menubutton entry, try to keep short
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "Snimi podešavanja i restartuj DHCP server"
+
+# check box
+#~ msgid "&Start DHCP Server"
+#~ msgstr "Startuj DHCP server"
+
# translators: error message - default host cannot be deleted
#, fuzzy
#~ msgid "Cannot determine the hostname of %1."
Modified: trunk/yast/sr@Latn/po/dns-server.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/dns-server.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/dns-server.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2004-04-22 11:38+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -464,9 +464,9 @@
#. Table menu item - Records listing
#: 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:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
msgid "Value"
msgstr "Vrednost"
@@ -487,7 +487,7 @@
#. TRANSLATORS: commandline table header item
#. Textentry - DNS adding zone - Name
#: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
msgid "Name"
msgstr "Ime"
@@ -498,9 +498,9 @@
#. Table header item - DNS listing zones
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
msgid "Type"
msgstr "Tip"
@@ -517,8 +517,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
#: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
#, fuzzy
msgid "Forwarders"
msgstr "Napred"
@@ -560,7 +560,7 @@
#: 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:1905
+#: src/include/dns-server/dialog-main.rb:1639
msgid "Zone"
msgstr "Zona"
@@ -598,7 +598,7 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
msgid "Mail Server"
msgstr "Email Server"
@@ -606,7 +606,7 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
#, fuzzy
msgid "Priority"
msgstr "P&rioritet"
@@ -687,8 +687,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:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
#, fuzzy
msgid "DNS Zones"
msgstr "Zona"
@@ -716,7 +716,7 @@
#. check box
#. TRANSLATORS: checkbox label, turning LDAP support on or off
#: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
#, fuzzy
msgid "&LDAP Support Active"
msgstr "&Ključ za podršku:"
@@ -749,101 +749,52 @@
msgstr "Podešavanje DNS servera"
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
#, fuzzy
msgid "DNS Server"
msgstr "NIS serveri"
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#, fuzzy
-msgid "Apply Changes"
-msgstr "Promeni"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-#, fuzzy
-msgid "Start-Up"
-msgstr "Početak"
-
-# frame label
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-#, fuzzy
-msgid "Basic Options"
-msgstr "Opcije arhiviranja"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "Zapisivanje događaja"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: 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"
-msgstr ""
-
-# combo box
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-#, fuzzy
-msgid "TSIG Keys"
-msgstr "TSIG &Ključ"
-
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
msgid "Local DNS Resolution &Policy"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
msgid "Merging forwarders is disabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
msgid "Automatic merging"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
msgid "Merging forwarders is enabled"
msgstr ""
# Translators: dialog caption
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
#, fuzzy
msgid "Custom configuration"
msgstr "Konfiguracija NIS servera"
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
#, fuzzy
msgid "Custom policy"
msgstr "пушто"
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
msgid "Local DNS Resolution &Forwarder"
msgstr ""
# selection box
# selection box
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
#, fuzzy
msgid "Using system name servers"
msgstr "Glavni serveri"
@@ -851,26 +802,26 @@
# selection box
# selection box
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
#, fuzzy
msgid "This name server (bind)"
msgstr "Glavni serveri"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
msgid "Local dnsmasq server"
msgstr ""
# table cell description
#. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
#, fuzzy
msgid "Add IP Address"
msgstr "&IP adresa"
# table cell description
#. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
#, fuzzy
msgid "IPv4 or IPv6 A&ddress"
msgstr "&IP adresa"
@@ -879,24 +830,24 @@
# radio button, type of zone
#. Selectionbox for listing current DNS-Forwarders
#. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
#, fuzzy
msgid "Forwarder &List"
msgstr "Napred"
#. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
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:877
+#: src/include/dns-server/dialog-main.rb:611
msgid "Cannot find local equivalent for IP %1."
msgstr ""
#. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
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"
@@ -904,32 +855,32 @@
msgstr ""
#. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
#, fuzzy
msgid "Invalid IPv4 or IPv6 address."
msgstr "&Nepravilna IP adresa."
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
msgid ""
"A valid IPv6 address consists of letters a-f, numbers,\n"
"and colons."
msgstr ""
#. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
#, fuzzy
msgid "The specified forwarder is already present."
msgstr "Navedeni naziv posla %1 već postoji."
# command line help text for add action
#. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
#, fuzzy
msgid "Add or Change Option"
msgstr "&Dodaj novu sekciju"
#. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
#, fuzzy
msgid "O&ption"
msgstr "O&pcije"
@@ -937,35 +888,35 @@
# selection box
#. Textentry for setting the basic-option value
#. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
#, fuzzy
msgid "&Value"
msgstr "&Vrednosti"
#. Pushbutton for changing the basic-option
#. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
#, fuzzy
msgid "C&hange"
msgstr "Promeni"
# heading / label
#. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
#, fuzzy
msgid "Current Options"
msgstr "Trenutna opcija:"
# table header
#. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
msgid "Option"
msgstr "Opcija"
#. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
#, fuzzy
msgid ""
"Really set this\n"
@@ -974,7 +925,7 @@
# translators: error message if option has a value, but cannot have one
#. 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:1173
+#: src/include/dns-server/dialog-main.rb:907
#, fuzzy
msgid ""
"Option %1 can only have a yes or no value set.\n"
@@ -982,117 +933,117 @@
msgstr "Opcija '%1' ne može da ima vrednost. Data vrednost: %2"
#. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1190
+#: src/include/dns-server/dialog-main.rb:924
msgid ""
"Option %1 can only be a number.\n"
"Really set it to %2?\n"
msgstr ""
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
msgid ""
"Quotes are not used correctly in this option.\n"
"Really set it to %1?\n"
msgstr ""
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
msgid ""
"Brackets are not used correctly in this option.\n"
"Really set it to %1?\n"
msgstr ""
#. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
msgid ""
"Option %1 should be set only once.\n"
"Really add another one?\n"
msgstr ""
#. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
#, fuzzy
msgid "Log Type"
msgstr " Tip "
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
#, fuzzy
msgid "&System Log"
msgstr "Sistem"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
msgid "&File"
msgstr "Datoteke"
#. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
msgid "Maximum &Size (MB)"
msgstr ""
#. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
#, fuzzy
msgid "Maximum &Versions"
msgstr "&Verzije"
#. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
#, fuzzy
msgid "Additional Logging"
msgstr "Dodatni domeni"
# Frame label
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
#, fuzzy
msgid "Log All DNS &Queries"
msgstr "Serveri imena"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
#, fuzzy
msgid "Log Zone &Updates"
msgstr "Pomoć za &Update"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
msgid "Log Zone &Transfers"
msgstr ""
#. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
#, fuzzy
msgid "Select File for Log"
msgstr "Izaberite Fajl"
#. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
#, fuzzy
msgid "Option Setup"
msgstr "Dio sa opcijama"
#. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
msgid "&Name"
msgstr "&Ime"
# Frame label
#. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
#, fuzzy
msgid "Current ACL List"
msgstr "Trenutni host računari"
#. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
#, fuzzy
msgid "ACL"
msgstr "ACT"
#. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
msgid ""
"This ACL is used by %1 zones.\n"
"Really remove it?\n"
@@ -1100,14 +1051,14 @@
# translators: error message for adding a new Listen statement
#. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
#, fuzzy
msgid "The specified ACL entry already exists."
msgstr "Ulaz '%1' već postoji."
# frame
#. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
#, fuzzy
msgid "Add New Zone "
msgstr "Dodaj novi ključ"
@@ -1118,8 +1069,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:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
msgid "Master"
msgstr "Primarni"
@@ -1129,9 +1080,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:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
msgid "Slave"
msgstr "Sekundarni"
@@ -1142,15 +1093,15 @@
#. TRANSLATORS: Table item - Server type
#. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-#
#. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
#, fuzzy
msgid "Forward"
msgstr "Napred"
# summary string, %s is list of DNS zones (their names), coma separated
#. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
#, fuzzy
msgid "Configured DNS Zones"
msgstr "Konfigurisane zone: %s"
@@ -1158,7 +1109,7 @@
# these are for future use:
# error message - the entered server name is already configured in another virtual host
#. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
#, fuzzy
msgid "A zone with the specified name is already configured."
msgstr "Ime servera je već konfigurisano."
@@ -1166,13 +1117,13 @@
# yes-no popup
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
msgid "Saving the configuration failed. Change the settings?"
msgstr "Snimanje podešavanja neuspešno. Promeniti podešavanja?"
# progress stage
#. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
+#: src/include/dns-server/dialog-main.rb:1903
#, fuzzy
#| msgid "Save configuration files"
msgid "Saving the configuration failed"
@@ -1180,7 +1131,7 @@
# Yes-No popup
#. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
#, fuzzy
msgid ""
"All changes will be lost.\n"
@@ -1189,42 +1140,91 @@
"Zaista napustiti DHCP server podešavanja bez snimanja?\n"
"Sva podešavanja će biti izgubljena."
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+#, fuzzy
+msgid "Apply Changes"
+msgstr "Promeni"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+#, fuzzy
+msgid "Start-Up"
+msgstr "Početak"
+
+# frame label
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+#, fuzzy
+msgid "Basic Options"
+msgstr "Opcije arhiviranja"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "Zapisivanje događaja"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr ""
+
+# combo box
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+#, fuzzy
+msgid "TSIG Keys"
+msgstr "TSIG &Ključ"
+
# check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
msgid "A&llow Dynamic Updates"
msgstr "Dozvo&liti dinamičko ažuriranje"
# combo box
#. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
msgid "TSIG &Key"
msgstr "TSIG &Ključ"
#. check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
msgid "Enable &Zone Transport"
msgstr ""
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
msgid "A&utomatically Generate Records From"
msgstr ""
#. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
msgid "Zon&e"
msgstr ""
#. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
msgid "Connected Reverse Zones"
msgstr ""
#. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
msgid ""
"This function is not available during\n"
"preparation for autoinstallation.\n"
@@ -1234,14 +1234,14 @@
# yes-no popup
#. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
#, fuzzy
msgid "No TSIG key is defined."
msgstr "Nije definisan TSIG kluč. Definisati sada?"
# text entry
#. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
#, fuzzy
msgid "&Name Server to Add"
msgstr "SuSE IMAP Server"
@@ -1249,27 +1249,27 @@
# Frame label
#. Selectionbox - listing current nameservers
#. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
#, fuzzy
msgid "Na&me Server List"
msgstr "Serveri imena"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
#, fuzzy
msgid "The specified name server already exists."
msgstr "Navedeni naziv posla %1 već postoji."
# Label text
#. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
#, fuzzy
msgid "Mail Server to Add"
msgstr "Email Server"
#. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
#, fuzzy
msgid "&Address"
msgstr "Adresa"
@@ -1279,144 +1279,144 @@
#. IntField - zone settings - Record Value
#. IntField - zone settings - Record Value
#. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
#: src/include/dns-server/options.rb:435
msgid "&Priority"
msgstr "P&rioritet"
# selection box label
#. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
#, fuzzy
msgid "Mail Relay List"
msgstr "Pre&nosnici pošte"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
#, fuzzy
msgid "The specified value is not a valid hostname or IP address."
msgstr "Navedeni naziv posla %1 već postoji."
# Popup text:
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
#, fuzzy
msgid "The specified mail server already exists."
msgstr "Profil sa tim imenom već postoji."
# Text entry label
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
#, fuzzy
msgid "Seconds"
msgstr "&Drugi"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
#, fuzzy
msgid "Minutes"
msgstr "Minut"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
#, fuzzy
msgid "Hours"
msgstr "Sat"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
#, fuzzy
msgid "Days"
msgstr "Čekanje"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
#, fuzzy
msgid "Weeks"
msgstr "Nedeljno"
# text entry
#. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
#, fuzzy
msgid "Seri&al"
msgstr "Serijski"
# text entry
#. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
#, fuzzy
msgid "TT&L"
msgstr "$TT&L"
#. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
#, fuzzy
msgid "&Unit"
msgstr "Neimenovano"
# text entry
#. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
msgid "Re&fresh"
msgstr "Os&veži"
#. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
#, fuzzy
msgid "Un&it"
msgstr "Neimenovano"
#. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
#, fuzzy
msgid "Retr&y"
msgstr "Ponovno pokušaj"
# text entry
#. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
#, fuzzy
msgid "Ex&piration"
msgstr "Rok trajanja"
#. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
#, fuzzy
msgid "U&nit"
msgstr "Neimenovano"
# IntField label
#. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
msgid "&Minimum"
msgstr "&Minimum "
#. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
#, fuzzy
msgid "Uni&t"
msgstr "Neimenovano"
# command line error report
#. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
#, fuzzy
msgid "The serial number of the zone must be specified."
msgstr "Ime sekcije se mora definsati."
# Popup text
#. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
#, fuzzy
msgid "The serial number must be no more than %1 digits long."
msgstr "Ime mreže mora biti manje od 32 slova."
#. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
msgid ""
"The expiration time-out is higher than the time period\n"
"of zone refreshes. The zone will not be reachable\n"
@@ -1427,9 +1427,9 @@
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
#, fuzzy
msgid "&Record Key"
msgstr "Snimači"
@@ -1437,9 +1437,9 @@
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
#, fuzzy
msgid "T&ype"
msgstr "Tip"
@@ -1447,107 +1447,107 @@
#. Textentry - zone settings - Record Value
#. IntField - zone settings - Record Value
#. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
#, fuzzy
msgid "Val&ue"
msgstr "Vre&dnosti"
# text entry
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
#, fuzzy
#| msgid "&Name Server"
msgid "&Service"
msgstr "SuSE IMAP Server"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
msgid "&Protocol"
msgstr ""
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
msgid "&Weight"
msgstr ""
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
msgid "&Port"
msgstr ""
# combo box item, A is more technical description
#. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
#, fuzzy
msgid "A: IPv4 Domain Name Translation"
msgstr "A -- Prevođenje imena domena"
# combo box item, A is more technical description
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
#, fuzzy
msgid "AAAA: IPv6 Domain Name Translation"
msgstr "A -- Prevođenje imena domena"
# combo box item, CNAME is more technical description
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
#, fuzzy
msgid "CNAME: Alias for Domain Name"
msgstr "CNAME -- Drugačije za ime domena"
# combo box item, NS is more technical description
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
#, fuzzy
msgid "NS: Name Server"
msgstr "NS -- Suse IMAP Server"
# combo box item, MX is more technical description
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
#, fuzzy
msgid "MX: Mail Relay"
msgstr "MX -- Prenosnik pošte"
# combo box item, PTR is more technical description
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
#, fuzzy
msgid "PTR: Reverse Translation"
msgstr "RTP -- Obrnuto prevođenje"
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
msgid "SRV: Services Record"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
msgid "TXT: Text Record"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
msgid "SPF: Sender Policy Framework"
msgstr ""
# screen title for uml options
#. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
#, fuzzy
msgid "Record Settings"
msgstr "Setovanje Mreže"
# button label
#. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
#, fuzzy
msgid "Configured Resource Records"
msgstr "Konfigurisanje resursa"
#. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
#, fuzzy
msgid "Record Key"
msgstr "Snimači"
#. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
msgid ""
"Invalid IPv6 reverse IP.\n"
"\n"
@@ -1556,14 +1556,14 @@
msgstr ""
#. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
#, fuzzy
msgid "Invalid IPv6 address."
msgstr "&Nepravilna IP adresa."
#. TRANSLATORS: Error message
#. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
msgid ""
"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
"and must be at least one character long."
@@ -1573,21 +1573,21 @@
#. %{type} - replaced with record type (TXT or SPF)
#. %{max} - replaced with the maximal length
#. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
msgid ""
"Maximal length of a %{type} record is %{max} characters.\n"
"This message is %{current} characters long."
msgstr ""
#. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
msgid "CNAME cannot point to itself."
msgstr ""
# popup text
# popup text
#. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
#, fuzzy
msgid "An internal error has occurred."
msgstr "Dogodila se interna greška!"
@@ -1595,8 +1595,8 @@
# tree node string
#. Dialog Caption - Expert Settings - Zone Editor
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
#, fuzzy
msgid "Zone Editor"
msgstr "Monitor"
@@ -1604,16 +1604,16 @@
# Button label
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
#, fuzzy
msgid "&Basics"
msgstr "&Nazad"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
#, fuzzy
msgid "NS Recor&ds"
msgstr "Snimači"
@@ -1621,22 +1621,22 @@
# push button
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
#, fuzzy
msgid "&SOA"
msgstr "Promeni &SOA"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
#, fuzzy
msgid "R&ecords"
msgstr "Snimači"
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
#, fuzzy
msgid "M&X Records"
msgstr "Snimači"
@@ -1646,23 +1646,16 @@
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
#, fuzzy
msgid "Settings for Zone"
msgstr "Setovanje password-a za korisnika %1:"
-# menu button
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "&Napredna podešavanja"
-
# message popup
#. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
#, fuzzy
msgid "At least one NS server must be set."
msgstr "Najmanje jedna adresa se mora definisati"
@@ -1671,7 +1664,7 @@
#.
#. Automatically Generate Records From is a feature that makes YaST to generate
#. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
msgid ""
"Current zone records are automatically generated from %1 zone.\n"
"To change records manually disable the Automatically Generate Records From feature."
@@ -1679,20 +1672,20 @@
# menubutton entry, try to keep short
#. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
#, fuzzy
msgid "&Master DNS Server IP"
msgstr "Restartuj DNS server"
# menubutton entry, try to keep short
#. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
#, fuzzy
msgid "Missing Master Server"
msgstr "Restartuj DNS server"
#. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
msgid ""
"Every slave zone must have its master server IP defined.\n"
"Configuration of a DNS server without a master server would fail.\n"
@@ -1700,39 +1693,39 @@
msgstr ""
#. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
#, fuzzy
msgid "No master DNS server defined."
msgstr "NIS server nije pronađen"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
#, fuzzy
msgid "The specified master name server is not a valid IP address."
msgstr "Navedeni naziv posla %1 već postoji."
# text entry
#. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
#, fuzzy
msgid "New &Forwarder IP Address"
msgstr "&Najmanja IP adresa"
#. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
#, fuzzy
msgid "Current &Zone Forwarders"
msgstr "Tekuči DMA mod:"
# tree node string
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
#, fuzzy
msgid "Forward Zone Editor"
msgstr "Monitor"
#. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
msgid ""
"This forward zone has no forwarders defined, which means\n"
"that all DNS queries for this zone are denied.\n"
@@ -2774,68 +2767,68 @@
# DNS server read dialog caption
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
msgid "Initializing DNS Server Configuration"
msgstr "Pokretanje podešavanja DNS servera"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
msgid "Check the environment"
msgstr "Proverite okruženje"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
msgid "Flush caches of the DNS daemon"
msgstr "Čišćenje memorije DNS servisa"
# step 4/5
#. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
#, fuzzy
msgid "Read the firewall settings"
msgstr "Čitanje podešavanja zaštitnog zida"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
msgid "Read the settings"
msgstr "Pročitajte podešavanja"
# progress step
#. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
msgid "Checking the environment..."
msgstr "Proveravanje okruženja..."
# progress step
#. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
msgid "Flushing caches of the DNS daemon..."
msgstr "Čistim memoriju DNS servisa..."
# Progress step 8/9
#. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
#, fuzzy
msgid "Reading the firewall settings..."
msgstr "Čitanje podešavanja zaštitnog zida..."
# progress step
#. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
msgid "Reading the settings..."
msgstr "Čitam podešavanja..."
# progress step
#. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
msgid "Finished"
msgstr "&Završeno"
# error report
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
#, fuzzy
msgid ""
"Error occurred while calling netconfig.\n"
@@ -2844,86 +2837,86 @@
# Dhcp-server read dialog caption */
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
#, fuzzy
msgid "Saving DNS Server Configuration"
msgstr "Snimanje konfiguracije DHCP servera"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
msgid "Save configuration files"
msgstr "Snimi konfiguracione fajlove"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
msgid "Restart the DNS daemon"
msgstr "Restartujte DNS daemon"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
msgid "Update zone files"
msgstr "Ažuriranje datoteka zone"
# progress stage
#. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
msgid "Adjust the DNS service"
msgstr "Podešavanje DNS servisa"
#. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
msgid "Call netconfig"
msgstr ""
# Progress stage 3/7
#. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
#, fuzzy
msgid "Write the firewall settings"
msgstr "Snimanje podešavanja zaštitnog zida"
# progress step
#. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
msgid "Saving configuration files..."
msgstr "Snimanje konfiguracionih fajlova..."
# progress step
#. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
msgid "Restarting the DNS daemon..."
msgstr "Restartovanje DNS daemon-a..."
# progress step
#. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
msgid "Updating zone files..."
msgstr "Ažuriram datoteke zone..."
# progress step
#. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
msgid "Adjusting the DNS service..."
msgstr "Prilagođavanje DNS servisa..."
#. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
msgid "Calling netconfig..."
msgstr ""
# Progress step 3/7
#. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
#, fuzzy
msgid "Writing the firewall settings..."
msgstr "Snimanje podešavanja zaštitnog zida..."
# error report
#. Cannot start service 'named', because of error that follows Error:. Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
#, fuzzy
msgid ""
"Error occurred while starting service named.\n"
@@ -2932,53 +2925,53 @@
# radio button, type of zone
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
#, fuzzy
msgid "Stub"
msgstr "Os&tatak"
# type of zone to be used in summary
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
#, fuzzy
msgid "Hint"
msgstr "nagoveštaj"
# summary string
#. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
#, fuzzy
msgid "The DNS server starts when booting the system."
msgstr "DNS server se startuje prilikom pokretanja sistema."
# summary string
#. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
msgid "The DNS server does not start when booting the system."
msgstr "DNS server se ne startuje prilikom pokretanja sistema."
# summary string, %s is list of DNS zones (their names), coma separated
#. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
#, perl-format
msgid "Configured Zones: %s"
msgstr "Konfigurisane zone: %s"
#. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
# checkbox label
#. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
#, fuzzy
msgid "Enable LDAP support?"
msgstr "&Uključi LDAP korisnicima logovanje"
# error popup
#. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
#, fuzzy
msgid ""
"Installation of required packages failed.\n"
@@ -2986,14 +2979,14 @@
msgstr "Instaliranje zahtevanih paketa neuspešno."
#. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
msgid "Unknown LDAP initialization error."
msgstr ""
# message popup
# message popup
#. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
@@ -3001,13 +2994,13 @@
# message popup
# message popup
#. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
#, fuzzy
msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "Greška pri snimanju reda %1."
@@ -3015,11 +3008,15 @@
# message popup
# message popup
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
#, fuzzy
msgid "Error occurred while creating %1. Not using LDAP."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
+# menu button
+#~ msgid "Ad&vanced"
+#~ msgstr "&Napredna podešavanja"
+
#, fuzzy
#~ msgid "When &Booting"
#~ msgstr "Kada sa Sistem &Učitava"
Modified: trunk/yast/sr@Latn/po/docker.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/docker.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/docker.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-08-25 18:36+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,6 +17,110 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+msgid "Changes in Container"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr ""
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+msgid "&Exit"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+msgid "Commit Container"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+msgid "Repository"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+msgid "Tag"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+msgid "Inject Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
#. 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."
@@ -58,14 +162,6 @@
msgid "Running Docker Containers"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:217
-msgid "Repository"
-msgstr ""
-
-#: src/lib/ydocker/main_dialog.rb:218
-msgid "Tag"
-msgstr ""
-
#: src/lib/ydocker/main_dialog.rb:219
msgid "Image ID"
msgstr ""
@@ -86,15 +182,11 @@
msgid "Image"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
msgid "Command"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr ""
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
msgid "Ports"
msgstr ""
@@ -130,10 +222,59 @@
msgid "&Commit"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:304
-msgid "&Exit"
-msgstr ""
-
#: src/lib/ydocker/main_dialog.rb:315
msgid "Do you really want to delete image \"%s\"?"
msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+msgid "Run Container"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+msgid "Container"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""
Modified: trunk/yast/sr@Latn/po/drbd.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/drbd.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/drbd.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2011-06-23 16:07+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -208,7 +208,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr ""
@@ -222,15 +222,16 @@
msgid ""
"\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>\"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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. 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"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -256,11 +257,11 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:112
+#: src/include/drbd/helps.rb:113
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr ""
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -269,20 +270,22 @@
"\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"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
"\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
+"\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr ""
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr ""
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
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"
@@ -292,7 +295,7 @@
" set it to 0 to disable redrawing completely. </p>"
msgstr ""
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -302,14 +305,14 @@
msgstr ""
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
"Configure drbd here.<br></p>\n"
msgstr ""
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Choose an drbd from the list of detected drbds.\n"
@@ -318,7 +321,7 @@
msgstr ""
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
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"
@@ -326,7 +329,7 @@
msgstr ""
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
"Obtain an overview of installed drbds. Additionally\n"
@@ -334,14 +337,14 @@
msgstr ""
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Press <b>Add</b> to configure a drbd.</p>"
msgstr ""
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"Choose a drbd to change or remove.\n"
@@ -349,7 +352,7 @@
msgstr ""
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -358,7 +361,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -366,7 +369,7 @@
msgstr ""
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -374,50 +377,126 @@
msgstr ""
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
msgid "LVM Filter Configuration of DRBD"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
msgid "Device Filter"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
msgid "Writing the LVM cache"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
msgid "Enable LVM Cache"
msgstr ""
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning! Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning! Should not use lvmetad for cluster."
+msgstr ""
+
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:144
msgid "Resource Name"
msgstr ""
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:151
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:156
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:188
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:336
msgid "Protocol"
msgstr ""
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
-msgid "Node names must be different."
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:560
+msgid "OK"
msgstr ""
-#: src/include/drbd/resource_conf.rb:578
+#: src/include/drbd/resource_conf.rb:561
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:575
+msgid "Node name can not be empty."
+msgstr ""
+
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:719
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:739
msgid "Please fill out all fields."
msgstr ""
+#: src/include/drbd/resource_conf.rb:754
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:789
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:795
+msgid "Node name must be different."
+msgstr ""
+
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar <mlazar(a)suse.cz>
@@ -519,81 +598,81 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:114
msgid "Failed to merge separated DRBD conf files\n"
msgstr ""
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:136
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr ""
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:191
msgid "Initializing DRBD Configuration"
msgstr ""
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:199
msgid "Read global settings"
msgstr ""
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:200
msgid "Read resources"
msgstr ""
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:201
msgid "Read LVM configurations"
msgstr ""
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:202
msgid "Read daemon status"
msgstr ""
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
msgid "Read SuSEFirewall Settings"
msgstr ""
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:206
msgid "Reading global settings..."
msgstr ""
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:207
msgid "Reading resources..."
msgstr ""
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:208
msgid "Reading LVM configurations..."
msgstr ""
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:209
msgid "Reading daemon status..."
msgstr ""
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
msgid "Finished"
msgstr ""
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:514
msgid "Failed to backup drbd.conf"
msgstr ""
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:523
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr ""
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:547
msgid ""
"Invalid configuration of resource %1\n"
"%2"
msgstr ""
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:566
msgid "Failed to bring drbd.conf back"
msgstr ""
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:637
msgid "Writing DRBD Configuration"
msgstr ""
@@ -601,46 +680,46 @@
#. 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:617
+#: src/modules/Drbd.rb:649
msgid "Write global settings"
msgstr ""
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:650
msgid "Write resources"
msgstr ""
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:651
msgid "Write LVM configurations"
msgstr ""
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:652
msgid "Set daemon status"
msgstr ""
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:653
msgid "Write the SuSEfirewall settings"
msgstr ""
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:656
msgid "Writing global settings..."
msgstr ""
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:657
msgid "Writing resources..."
msgstr ""
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:658
msgid "Writing LVM configurations..."
msgstr ""
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:659
msgid "Setting daemon status..."
msgstr ""
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:660
msgid "Writing the SuSEFirewall settings"
msgstr ""
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:671
msgid "Failed to make directory /etc/drbd.d"
msgstr ""
Modified: trunk/yast/sr@Latn/po/fcoe-client.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/fcoe-client.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/fcoe-client.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-01-30 16:28+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -487,33 +487,33 @@
msgstr ""
#. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
msgid "Cannot start service 'lldpad'"
msgstr ""
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
msgid "Cannot start service 'fcoe'"
msgstr ""
#. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
msgid "Cannot start lldpad systemd socket"
msgstr ""
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
msgid "Cannot start lldpad service."
msgstr ""
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
msgid "Cannot start fcoemon systemd socket."
msgstr ""
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
msgid "Cannot start fcoe service."
msgstr ""
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -521,154 +521,154 @@
msgstr ""
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
msgid "Initializing fcoe-client Configuration"
msgstr ""
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
msgid "Check installed packages"
msgstr ""
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
msgid "Check services"
msgstr ""
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
msgid "Detect network cards"
msgstr ""
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
msgid "Read /etc/fcoe/config"
msgstr ""
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
msgid "Checking for installed packages..."
msgstr ""
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
msgid "Checking for services..."
msgstr ""
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
msgid "Detecting network cards..."
msgstr ""
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
msgid "Reading /etc/fcoe/config"
msgstr ""
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
msgid "Finished"
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
msgid "Starting of services failed."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
msgid "Cannot detect devices."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
msgid "Cannot read /etc/fcoe/config."
msgstr ""
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
msgid "Saving fcoe-client Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
msgid "Write the settings"
msgstr ""
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
msgid "Restart FCoE service"
msgstr ""
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
msgid "Adjust start of services"
msgstr ""
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
msgid "Restarting FCoE service..."
msgstr ""
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
msgid "Adjusting start of services..."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
msgid "Cannot write settings to /etc/fcoe/config."
msgstr ""
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
msgid "Restarting of service fcoe failed."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr ""
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
msgid "<b>General FCoE configuration</b>"
msgstr ""
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
msgid "<b>Interfaces</b>"
msgstr ""
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
msgid "<i>Netcard</i>:"
msgstr ""
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
msgid "<b>Starting of services</b>"
msgstr ""
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
msgid "enabled"
msgstr ""
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
msgid "disabled"
msgstr ""
Modified: trunk/yast/sr@Latn/po/firewall.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/firewall.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/firewall.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-22 13:48+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -16,6 +16,16 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
#. TRANSLATORS: message popup
#: src/clients/firewall_proposal.rb:113
msgid ""
@@ -206,7 +216,7 @@
#. TRANSLATORS: tree menu item
#: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
#: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
#, fuzzy
msgid "Logging Level"
msgstr "Zapisivanje događaja"
@@ -635,7 +645,7 @@
#: src/include/firewall/subdialogs.rb:349
#: src/include/firewall/subdialogs.rb:509
#: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
#, fuzzy
msgid "Source Network"
msgstr "&Deljena mreža"
@@ -647,8 +657,8 @@
#: src/include/firewall/subdialogs.rb:351
#: src/include/firewall/subdialogs.rb:511
#: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
msgid "Protocol"
msgstr "Protokol"
@@ -717,7 +727,7 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
#, fuzzy
msgid "Req. IP"
msgstr "Sirovi IP"
@@ -726,7 +736,7 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
#, fuzzy
msgid "Req. Port"
msgstr "Port"
@@ -734,14 +744,14 @@
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
msgid "Redir. to IP"
msgstr ""
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
msgid "Redir. to Port"
msgstr ""
@@ -881,10 +891,10 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
msgid "Zone"
msgstr "Zona"
@@ -1449,38 +1459,38 @@
# Read dialog caption
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
msgid "Firewall configuration"
msgstr "Podešavanja zaštitnog zida"
# label text
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
#, fuzzy
msgid "Start-up settings"
msgstr "Početna stanja"
# Progress stage 1/3
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
#, fuzzy
msgid "Known firewall zones"
msgstr "Zaustavi zaštitnog zida"
# step 4/13
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
#, fuzzy
msgid "Network interfaces configuration"
msgstr "Snimanje podešavanja interfejsa"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
msgid "Allowed services, ports, and protocols"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
#, fuzzy
msgid "Broadcast packet settings"
msgstr "Učitaj trenutna podešavanja"
@@ -1488,224 +1498,226 @@
# Translators: progress label
# Translators: progress label
#. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
#, fuzzy
msgid "Masquerading settings"
msgstr "Čitam podešavanja"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
#, fuzzy
msgid "Redirect requests to masqueraded IP"
msgstr "Zaštita sa internog"
# Login dialog caption
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
#, fuzzy
msgid "Logging settings"
msgstr "Login Setovanja"
# Read dialog caption
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
#, fuzzy
msgid "Firewall configuration summary"
msgstr "Podešavanja zaštitnog zida"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
#, fuzzy
msgid "Enables firewall"
msgstr "Podesi &Firewall"
# step 5/13
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
#, fuzzy
msgid "Disables firewall"
msgstr "Snimanje zaštitnog zida"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
#, fuzzy
msgid "Show current settings"
msgstr "Učitaj trenutna podešavanja"
# Checkbox option
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
#, fuzzy
msgid "Start firewall in the boot process"
msgstr "Zaustavi zaštitni zid i obriši sa spiska boot procesa"
# Progress stage 3/3
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
#, fuzzy
msgid "Start firewall manually"
msgstr "Startuj zaštitni zid"
# translators: help text for list subcommand (listen command line action)
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
msgid "List configured entries"
msgstr "Izlistaj podešene zapise"
# text entry
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
#, fuzzy
msgid "Zone short name"
msgstr "Ime zone"
# command line help text for add action
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
#, fuzzy
msgid "Add a new record"
msgstr "&Dodaj novu sekciju"
# translators: command line help text for remove action
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
#, fuzzy
msgid "Remove a record"
msgstr "Obrišite yvučnu kartu"
# step 4/13
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
#, fuzzy
msgid "Network interface configuration name"
msgstr "Snimanje podešavanja interfejsa"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
msgid "Logging accepted packets (all|crit|none)"
msgstr ""
# CheckBox label
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
#, fuzzy
msgid "Logging not accepted packets (all|crit|none)"
msgstr "Snimanje izveštaja svih &prihvaćenih paketa"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
#, fuzzy
msgid "Logging broadcast packets (yes|no)"
msgstr "&Prihvati Emitovane Pakete"
# help text for option 'value'
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
#, fuzzy
msgid "Set value"
msgstr "Nova vrednost"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
msgid "Port name or number; comma-separate multiple ports"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
msgid "Known firewall service; comma-separate multiple services"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
msgid "TCP port name or number; comma-separate multiple ports"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
msgid "UDP port name or number; comma-separate multiple ports"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
msgid "RPC port name; comma-separate multiple ports"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
msgid "IP protocol name; comma-separate multiple protocols"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
msgid "Set zone protection (yes|no)"
msgstr ""
# command description
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
#, fuzzy
msgid "Detailed information"
msgstr "Prikaži detaljne informacije"
# progress stages
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
#, fuzzy
msgid "Enable option"
msgstr "Snimi opcije"
# progress stages
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
#, fuzzy
msgid "Disable option"
msgstr "Snimi opcije"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
#, fuzzy
msgid "Protocol (tcp|udp)"
msgstr "Protokol"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
msgid "Requested external IP (optional)"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
msgid "Requested port name or number"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
#, fuzzy
msgid "Redirect to internal IP"
msgstr "Zaštita sa internog"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
msgid "Redirect to port on internal IP (optional)"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
#, fuzzy
msgid "Record number"
msgstr "Snimači"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
msgid "Use port names instead of port numbers"
msgstr ""
#. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
#, fuzzy
msgid "Unknown zone %1."
msgstr "Nepoznata opcija: '%1'"
@@ -1719,28 +1731,28 @@
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
#, fuzzy
msgid "Parameter %1 must be set."
msgstr "Korinsik mora biti izabran."
# stage 5 in writing current ISDN setup
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
#, fuzzy
msgid "Listing Known Firewall Zones:"
msgstr "Snimanje podešavanja zaštitnog zida"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
#, fuzzy
msgid "Shortcut"
msgstr "Shoot"
@@ -1749,22 +1761,22 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
#, fuzzy
msgid "Zone Name"
msgstr "Ime zone"
# header in email body
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
msgid "Summary:"
msgstr "Sadržaj:"
# CheckBox label
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
#, fuzzy
msgid "Only one parameter is allowed."
msgstr "Samo i&zlistani brojevi smeju"
@@ -1772,21 +1784,21 @@
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
#, fuzzy
msgid "Start-Up:"
msgstr "Početak"
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
msgid "Enabling firewall in the boot process..."
msgstr ""
# Progress step 8/9
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
#, fuzzy
msgid "Removing firewall from the boot process..."
msgstr "Čitanje podešavanja zaštitnog zida..."
@@ -1794,20 +1806,20 @@
# Translators: In autoinstallation mode:
# The package name is stored in %1. This is Popup::ContinueCancel.
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
#, fuzzy
msgid "Firewall is enabled in the boot process"
msgstr "Paket %1 će biti instaliran tokom procesa snimanja."
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
msgid "Firewall needs manual starting"
msgstr ""
# RichText label
# RichText label
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
#, fuzzy
msgid "Network Interfaces in Firewall Zones:"
msgstr "&Mreža"
@@ -1816,14 +1828,14 @@
# `Left(`Label(_("It seems that SuSEfirewall2 is already activate"))),
# Checkbox option
#. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
#, fuzzy
msgid "Special firewall string"
msgstr "Ponovo podesiti zaštitni zid"
# PushButton label
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
#, fuzzy
msgid "Interface"
msgstr "&Mreža"
@@ -1831,14 +1843,14 @@
# tree node string
# tree node string
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
#, fuzzy
msgid "Device Name"
msgstr "Ime uređaja"
# status message - %1 is device name (/dev/hdc), %2 is mode name (udma2), %3 is result (Success/Failed)
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
#, fuzzy
msgid "Adding special string %1 into zone %2..."
msgstr ""
@@ -1847,7 +1859,7 @@
# status message - %1 is device name (/dev/hdc), %2 is mode name (udma2), %3 is result (Success/Failed)
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
#, fuzzy
msgid "Adding interface %1 into zone %2..."
msgstr ""
@@ -1855,13 +1867,13 @@
"Setujem uređaj '%1' u mod '%2': %3"
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
msgid "Removing special string %1 from zone %2..."
msgstr ""
# status message - %1 is device name (/dev/hdc), %2 is mode name (udma2), %3 is result (Success/Failed)
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
#, fuzzy
msgid "Removing interface %1 from zone %2..."
msgstr ""
@@ -1869,84 +1881,84 @@
"Setujem uređaj '%1' u mod '%2': %3"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
#, fuzzy
msgid "Log all"
msgstr "Sve"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
msgid "Log only critical"
msgstr ""
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
#, fuzzy
msgid "Do not log any"
msgstr "N&emoj brisati ništa"
# Login dialog caption
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
#, fuzzy
msgid "Global Logging Settings:"
msgstr "Login Setovanja"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
#, fuzzy
msgid "Rule Type"
msgstr "Tip Izvora"
# table header
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
msgid "Value"
msgstr "Vrednost"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
#, fuzzy
msgid "Accepted"
msgstr "&Prihvati"
# Button label
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
#, fuzzy
msgid "Not accepted"
msgstr "N&e prihvataj"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
#, fuzzy
msgid "Logging Broadcast Packets:"
msgstr "&Prihvati Emitovane Pakete"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
#, fuzzy
msgid "Logging enabled"
msgstr "Klijent uključen"
# translators: service status radio button label
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
#, fuzzy
msgid "Logging disabled"
msgstr "&Isključen"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
#, fuzzy
msgid "Short"
msgstr "Shoot"
# translators: toggle button label
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
#, fuzzy
msgid "Logging Status"
msgstr "&Promena statusa"
@@ -1956,16 +1968,16 @@
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
msgid "Value %1 is not allowed for option %2."
msgstr ""
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
#, fuzzy
msgid "Allowed Broadcast Ports:"
msgstr "&Prihvati Emitovane Pakete"
@@ -1973,78 +1985,78 @@
# table header
#. TRANSLATORS: CommandLine header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
msgid "Port"
msgstr "Port"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
msgid "Only one action command is allowed here."
msgstr ""
# dialog caption
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
#, fuzzy
msgid "Defined Firewall Services:"
msgstr "Podešavanja zaštitnog zida"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
#, fuzzy
msgid "ID"
msgstr "IDE"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
#, fuzzy
msgid "Service Name"
msgstr "Naziv servera"
# table header
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
#, fuzzy
msgid "TCP port"
msgstr "Port"
# table header
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
#, fuzzy
msgid "UDP port"
msgstr "Port"
# table header
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
#, fuzzy
msgid "RPC port"
msgstr "Port"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
#, fuzzy
msgid "IP protocol"
msgstr "Protokol"
# check box
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
#, fuzzy
msgid "Allowed Services in Zones:"
msgstr "Dozvoliti &demilitarizovanu zonu"
# Label text
#. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
#, fuzzy
msgid "All services"
msgstr "Email Server"
@@ -2052,83 +2064,83 @@
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
msgid "Entire zone unprotected"
msgstr ""
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
#, fuzzy
msgid "Service ID"
msgstr "Servis"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
#, fuzzy
msgid "Additional Allowed Ports:"
msgstr "Dodatni Fajl"
#. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
#, fuzzy
msgid "All ports"
msgstr "Svi Pečevi"
# check box
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
#, fuzzy
msgid "Allowed Additional IP Protocols in Zones:"
msgstr "Dozvoliti &demilitarizovanu zonu"
#. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
#, fuzzy
msgid "All IP protocols"
msgstr "Protokol"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
#, fuzzy
msgid "IP Protocol"
msgstr "Protokol"
# Label text (Network device: unknown device)
#. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
#, fuzzy
msgid "Unknown service %1."
msgstr "Nepoznati uređaj"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
msgid "Protection can only be set for internal zones."
msgstr ""
# error popup
#. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
#, fuzzy
msgid "At least one of %1 must be set."
msgstr "Najmanje jedan disk je potreban"
# error popup
#. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
#, fuzzy
msgid "At least one action command from %1 must be set."
msgstr "Najmanje jedan disk je potreban"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
#, fuzzy
msgid "Redirect Requests to Masqueraded IP:"
msgstr "Zaštita sa internog"
#. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
#, fuzzy
msgid "Unknown port name %1."
msgstr "Nepoznata opcija: '%1'"
@@ -2136,29 +2148,40 @@
# Translators: progress label
# Translators: progress label
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
#, fuzzy
msgid "Masquerading Settings:"
msgstr "Čitam podešavanja"
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
# Translators: dialog caption
# Translators: dialog caption
#. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
#, fuzzy
-msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
msgstr "Lažno prikazivanje"
# translators: service status radio button label
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
#, fuzzy
msgid "enabled"
msgstr "Uključeno"
# translators: service status radio button label
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
#, fuzzy
msgid "disabled"
msgstr "&Isključen"
Modified: trunk/yast/sr@Latn/po/firstboot.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/firstboot.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/firstboot.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -123,17 +123,17 @@
msgid "Label"
msgstr "Natpis"
+# table header: module status
+#: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "Status"
+
# Text entry label
#: src/clients/firstboot_config.rb:68
#, fuzzy
msgid "Module Name"
msgstr "&Ime modula"
-# table header: module status
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "Status"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
@@ -319,7 +319,7 @@
msgstr ""
#. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
msgid "There is not enough space to install all additional packages."
msgstr ""
Modified: trunk/yast/sr@Latn/po/fonts.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/fonts.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/fonts.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-08-25 18:36+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,59 +20,59 @@
#. 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
+#: src/lib/fonts/fonts-config-state.rb:59
msgid "Bitmap Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
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
+#: src/lib/fonts/fonts-config-state.rb:107
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
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
+#: src/lib/fonts/fonts-config-state.rb:127
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
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
+#: src/lib/fonts/fonts-config-state.rb:147
msgid "Default"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
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
+#: src/lib/fonts/fonts-config-state.rb:167
msgid "CFF Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
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
+#: src/lib/fonts/fonts-config-state.rb:210
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
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
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: trunk/yast/sr@Latn/po/geo-cluster.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/geo-cluster.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/geo-cluster.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-08-25 18:36+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -60,8 +60,8 @@
#.
#. $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:465
-#: src/include/geo-cluster/dialogs.rb:814 src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
msgid "Geo Cluster Configuration"
msgstr ""
@@ -113,17 +113,17 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:819
msgid "Add"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:820
msgid "Edit"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:821
msgid "Delete"
msgstr ""
@@ -131,24 +131,24 @@
msgid "site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
msgid "ticket"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:106
-msgid "Authentification"
+msgid "Authentication"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
msgid "Ca&ncel"
msgstr ""
#. 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
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
msgid "OK"
msgstr ""
@@ -157,176 +157,184 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:128
-msgid "Authentification file"
+msgid "Authentication file"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:146
-msgid "Generate Authentification Key File"
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:151
+msgid "Generate Authentication Key File"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:159
msgid "Basic"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
msgid "Cancel"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
msgid "Please enter a valid ip address"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
msgid "timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
msgid "retries"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
msgid "weights"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
msgid "expire"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
msgid "acquire-after"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
msgid "timeout is invalid"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
msgid "expire is invalid"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
msgid "acquireafter is invalid"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
msgid "retries is invalid"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
msgid "weights is invalid"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
msgid "ticket can not be empty"
msgstr ""
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407 src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr ""
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:569
msgid "Enter an IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:580
msgid "Edit IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:596
msgid "Enter an IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:607
msgid "Edit IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:629
msgid "Ticket name already exist!"
msgstr ""
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:661
msgid "Configuration name can not be empty."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:664
msgid "Configuration name can not be duplicated."
msgstr ""
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:672
msgid "port is invalid!"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:678
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:684
msgid "arbitrator have to be filled!"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:689
msgid "site have to be filled!"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:694
msgid "ticket have to be filled!"
msgstr ""
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
-msgid "Failed to create authentification file "
+#: src/include/geo-cluster/dialogs.rb:748
+msgid "Failed to create authentication file "
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:736
-msgid "Succeed to created authentification file "
+#: src/include/geo-cluster/dialogs.rb:751
+msgid "Authentication file "
msgstr ""
+#: src/include/geo-cluster/dialogs.rb:751
+msgid " created successfully."
+msgstr ""
+
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:810
msgid "GeoCluster Configuration Select"
msgstr ""
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:816
msgid "Choose configuration file:"
msgstr ""
#: src/include/geo-cluster/wizards.rb:47
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
msgstr ""
#. Initialization dialog contents
Modified: trunk/yast/sr@Latn/po/installation.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/installation.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/installation.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-25 18:17+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -51,7 +51,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
msgid "Initializing..."
msgstr ""
"YaST2\n"
@@ -159,27 +159,27 @@
"ali će ekrani izgledati različito nego u uputstvu.\n"
#. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
msgid "Start service %1"
msgstr ""
# progress step label
#. TRANSLATORS: progress stage, %1 stands for service name
#. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
#: src/lib/installation/clients/inst_restore_settings.rb:47
#, fuzzy
msgid "Starting service %1..."
msgstr "Pokrećem servise..."
#. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
msgid "Adjusting Network Settings"
msgstr ""
# Help text for last dialog of base installation
#. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
#, fuzzy
msgid "Network settings are being adjusted."
msgstr ""
@@ -188,7 +188,7 @@
"<br></p>"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
msgid ""
"The previous installation has failed.\n"
"Would you like it to continue?\n"
@@ -197,7 +197,7 @@
msgstr ""
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
msgid ""
"The previous installation has been aborted.\n"
"Would you like it to continue?\n"
@@ -208,7 +208,7 @@
#. popup headline (#x1)
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
#: src/lib/installation/clients/inst_doit.rb:60
#, fuzzy
msgid "Starting Installation..."
@@ -246,14 +246,14 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:133
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr ""
#. 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
+#: src/lib/installation/proposal_runner.rb:121
#, fuzzy
msgid "Confirm Update"
msgstr "&Nastavi nadogradnju"
@@ -261,14 +261,14 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:125
msgid "<p>Information required to perform an update is now complete.</p>"
msgstr ""
#. 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
+#: src/lib/installation/proposal_runner.rb:127
msgid ""
"\n"
"<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -279,7 +279,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:136
#, fuzzy
msgid "Start &Update"
msgstr "Pokreni &mod"
@@ -318,51 +318,9 @@
msgid "Blacklisting Devices..."
msgstr "Pokrećem servise..."
-#. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr ""
-
-#. TRANSLATORS: help text
-#: src/lib/installation/clients/clone_proposal.rb:39
-msgid ""
-"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"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 <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-
-#: 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/lib/installation/clients/clone_proposal.rb:71
-#, fuzzy
-msgid "Clone System Configuration"
-msgstr "Osveži konfiguraciju"
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-#, fuzzy
-msgid "&Clone System Configuration"
-msgstr "Osveži konfiguraciju"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
-msgstr ""
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
-msgstr ""
-
# progress stages
#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:83
#, fuzzy
msgid "Copying files to installed system..."
msgstr "Kopiraj datoteke na instalirani sistem"
@@ -564,7 +522,7 @@
msgstr ""
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:321
#, fuzzy
#| msgid "Unknown"
msgid "Unknown Product"
@@ -598,53 +556,29 @@
"You may skip this step and run an online update later.\n"
msgstr ""
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
msgid "Language, Keyboard and License Agreement"
msgstr ""
-# menue label text
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: 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 "&Jezik"
+# caption for dialog "Release Notes"
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:319
+#, fuzzy
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Obaveštenja o izdavanju"
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr ""
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
-msgid "I &Agree to the License Terms."
-msgstr ""
-
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
-msgid "K&eyboard Test"
-msgstr ""
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr ""
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-msgid "License &Translations..."
-msgstr ""
-
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -654,7 +588,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -665,7 +599,7 @@
# Address dialog help 5/8
# Address dialog help 5/8
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
#, fuzzy
msgid ""
"<p>\n"
@@ -677,7 +611,7 @@
"</p>"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -688,7 +622,7 @@
# Help text for installation proposal
# General part ("You can change values...") is added as the next paragraph.
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -705,25 +639,56 @@
"instalirani sistem.\n"
"</p>\n"
-# caption for dialog "Release Notes"
-#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: 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 "Obaveštenja o izdavanju"
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
+msgid "License Agreement"
+msgstr ""
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+# menue label text
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:429
+msgid "&Language"
+msgstr "&Jezik"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
+msgid "&Keyboard Layout"
+msgstr ""
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
+msgid "I &Agree to the License Terms."
+msgstr ""
+
+#. Report error about missing license acceptance
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
msgid "You must accept the license to install this product"
msgstr ""
+# progress stages
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+msgid "EULA location in the installed system: %s"
+msgstr "Kopiraj datoteke na instalirani sistem"
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
+msgid "K&eyboard Test"
+msgstr ""
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
+msgid "License &Translations..."
+msgstr ""
+
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
msgid "&Disable ZMD Service"
@@ -844,7 +809,7 @@
msgstr ""
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
msgid "The system will reboot now..."
msgstr ""
@@ -853,16 +818,16 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
#: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
msgid "Deploying Images..."
msgstr ""
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:168
#, fuzzy
msgid ""
"Deploying images has failed.\n"
@@ -870,27 +835,27 @@
msgstr "Instalacija paketa nije uspela."
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:200
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/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:376
msgid "Downloading image at speed %1/s"
msgstr ""
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:381
msgid "Downloading image %1 at speed %2/s"
msgstr ""
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:441
msgid "Deploying image..."
msgstr ""
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:444
msgid "Deploying image %1..."
msgstr ""
@@ -907,51 +872,52 @@
msgid "&Disk to Use"
msgstr ""
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
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/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
msgid "Hard Disk for Image Deployment"
msgstr ""
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
#, fuzzy
msgid "Detecting Available Controllers"
msgstr "Raspoloživi profili"
# ComboBox label
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
#, fuzzy
msgid "Disk Activation"
msgstr "&Aktiviranje uređaja"
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
#, fuzzy
msgid "Configure &DASD Disks"
msgstr "Podešavanje diskova"
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
#, fuzzy
msgid "Configure &ZFCP Disks"
msgstr "Podešavanje diskova"
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
#, fuzzy
msgid "Configure &FCoE Interfaces"
msgstr "Podešavanje diskova"
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
#, fuzzy
msgid "Configure &iSCSI Disks"
msgstr "Podešavanje diskova"
# Write dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:111
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
#, fuzzy
-msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
msgstr "Snimanje podešavanja mreže"
# headline for installation proposal
@@ -974,7 +940,7 @@
#. bug #302384
#: 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
+#: src/lib/installation/clients/inst_installation_options.rb:149
#, fuzzy
#| msgid "Initializing..."
msgid "Initializing"
@@ -1005,84 +971,87 @@
msgid "Show &package updates"
msgstr ""
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+msgid "Calling step %1..."
+msgstr ""
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr ""
+
+# screen title for uml source
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+#, fuzzy
+msgid "Installation Error"
+msgstr "Izvor instalacije"
+
# Headline for last dialog of base installation: Install LILO etc.
#. Adjust a SlideShow dialog if not configured
#. kilobytes
#. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
msgid "Finishing Basic Installation"
msgstr "Završavam osnovnu instalaciju"
#. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
msgid "Creating list of finish scripts to call..."
msgstr ""
+# progress step
+#: src/lib/installation/clients/inst_finish.rb:307
+#, fuzzy
+msgid "Finished"
+msgstr "Završeno"
+
# progress stages
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:456
msgid "Copy files to installed system"
msgstr "Kopiraj datoteke na instalirani sistem"
# summary heading: configured shares
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:463
#, fuzzy
msgid "Save configuration"
msgstr "Konfiguracija ..."
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:470
#, fuzzy
msgid "Save installation settings"
msgstr "Podešavanja Instalacije"
# progress stages
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:479
msgid "Install boot manager"
msgstr "&Instaliraj boot menadžer"
# progress stages
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:486
msgid "Prepare system for initial boot"
msgstr "Priprema sistema za prvo pokretanje"
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
# module method progress label
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
#, fuzzy
msgid "Checking stage: %1..."
msgstr "Provera verzija..."
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
-msgid "Calling step %1..."
-msgstr ""
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
-msgid " * %1"
-msgstr ""
-
-# progress step
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
-#, fuzzy
-msgid "Finished"
-msgstr "Završeno"
-
-# screen title for uml source
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
-#, fuzzy
-msgid "Installation Error"
-msgstr "Izvor instalacije"
-
# Button to accept a license agreement
#. Button to accept a license agreement
#: src/lib/installation/clients/inst_info.rb:63
@@ -1115,24 +1084,24 @@
# screen title for uml source
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
#, fuzzy
msgid "Installation Options"
msgstr "Izvor instalacije"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
msgid "&Add Online Repositories Before Installation"
msgstr ""
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
msgid "In&clude Add-on Products from Separate Media"
msgstr ""
# help text for installation method
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
#, fuzzy
msgid "<p><big><b>Installation Options</b></big></p>"
msgstr ""
@@ -1141,7 +1110,7 @@
"</p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1149,7 +1118,7 @@
msgstr ""
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
msgid ""
"<p>\n"
"To install an add-on product from separate media together with &product;, select\n"
@@ -1157,7 +1126,7 @@
msgstr ""
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr ""
@@ -1279,7 +1248,7 @@
# progress stage title
#. Use 'zero' if image installation is not used
#. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
#, fuzzy
#| msgid "Installing boot manager..."
msgid "Installing Packages..."
@@ -1326,7 +1295,7 @@
# Help text for last dialog of base installation
#. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -1361,75 +1330,75 @@
# Initial contents of proposal subwindow while proposals are calculated
#. This dialog in not interactive
#. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
#, fuzzy
msgid "Analyzing the Computer"
msgstr "Analiza vašeg sistema..."
# give user feedback what's happening
#. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
#, fuzzy
#| msgid "Probing USB devices"
msgid "Probe USB devices"
msgstr "Testiranje USB uređaja"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
#, fuzzy
#| msgid "Probing USB devices"
msgid "Probing USB devices..."
msgstr "Testiranje USB uređaja"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
#, fuzzy
#| msgid "Probing FireWire devices..."
msgid "Probe FireWire devices"
msgstr "Testiranje FireWire uređaja..."
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
msgid "Probing FireWire devices..."
msgstr "Testiranje FireWire uređaja..."
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
#, fuzzy
#| msgid "Probing floppy disk devices"
msgid "Probe floppy disk devices"
msgstr "Testiranje uređaja disketne jedinice"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
#, fuzzy
#| msgid "Probing floppy disk devices"
msgid "Probing floppy disk devices..."
msgstr "Testiranje uređaja disketne jedinice"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
#, fuzzy
#| msgid "Probing hard disk controllers"
msgid "Probe hard disk controllers"
msgstr "Testiranje hard disk kontrolera"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
#, fuzzy
#| msgid "Probing hard disk controllers"
msgid "Probing hard disk controllers..."
msgstr "Testiranje hard disk kontrolera"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
#, fuzzy
#| msgid "Loading kernel modules for hard disk controllers"
msgid "Load kernel modules for hard disk controllers"
msgstr "Učitavanje kernel modula za hard disk kontrolere"
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
#, fuzzy
#| msgid "Loading kernel modules for hard disk controllers"
msgid "Loading kernel modules for hard disk controllers..."
@@ -1439,7 +1408,7 @@
# Hard disks
# --------------------------------------------------------------
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
#, fuzzy
#| msgid "Probing hard disks"
msgid "Probe hard disks"
@@ -1449,46 +1418,46 @@
# Hard disks
# --------------------------------------------------------------
# give user feedback what's happening
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
#, fuzzy
#| msgid "Probing hard disks"
msgid "Probing hard disks..."
msgstr "Testiranje hard diskova"
#. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
msgid "Search for system files"
msgstr ""
# Initial contents of proposal subwindow while proposals are calculated
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
#, fuzzy
#| msgid "Analyzing your system..."
msgid "Searching for system files..."
msgstr "Analiza vašeg sistema..."
# progress stage title
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
#, fuzzy
#| msgid "Initializing default window manager"
msgid "Initialize software manager"
msgstr "Pokretanje podrazumevanog menadžera prozora"
# progress stage title
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
#, fuzzy
msgid "Initializing software manager..."
msgstr "Pokretanje podrazumevanog menadžera prozora"
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
#, fuzzy
msgid "System Probing"
msgstr "Provera sistema"
# Help text for last dialog of base installation
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -1501,7 +1470,7 @@
"<br></p>"
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:257
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1514,7 +1483,7 @@
"Proverite vaš hardware!\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:271
#, fuzzy
#| msgid ""
#| "No hard disks and no hard disk controllers were\n"
@@ -1529,7 +1498,7 @@
"hard disk kontrolera za instalaciju.\n"
"Proverite vaš hardware!"
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:281
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1537,7 +1506,7 @@
msgstr ""
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:292
#, fuzzy
#| msgid ""
#| "No hard disks and no hard disk controllers were\n"
@@ -1554,13 +1523,59 @@
"Proverite vaš hardware!"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:337
#, fuzzy
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
msgstr "Instalacija paketa nije uspela."
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:187
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:193
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:265
+msgid ""
+"Downloading the optional installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
+msgstr ""
+
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
msgid "Removed"
@@ -1612,8 +1627,8 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
msgid "&Change..."
msgstr "&Promeni..."
@@ -1816,7 +1831,7 @@
"</p>"
#. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
msgid "No workflow defined for this kind of installation."
msgstr ""
@@ -1844,7 +1859,7 @@
# Write dialog caption
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
#, fuzzy
msgid "Saving network configuration..."
msgstr "Snimanje podešavanja mreže"
@@ -1919,6 +1934,24 @@
msgid "Saving hardware configuration..."
msgstr "Snimi informacije opreme..."
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+msgid "Import SSH Host Keys and Configuration"
+msgstr "Osveži konfiguraciju"
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "Osveži konfiguraciju"
+
# progress stage title
#. progress step title
#: src/lib/installation/clients/ssh_settings_finish.rb:64
@@ -1986,6 +2019,36 @@
msgid "Copying log files to installed system..."
msgstr "Kopiranje datoteka izveštaja na instalirani sistem"
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+msgid "&Device"
+msgstr ""
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+# 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.
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "Import SSH Configuration"
+msgstr "&Preskoči podešavanja"
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
@@ -1993,38 +2056,25 @@
# question in a popup box
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
msgid "Really reset everything to default values?"
msgstr "Zaista sve podesiti na podrazumevana podešavanja?"
# explain consequences of a decision
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
msgid "You will lose all changes."
msgstr "Izgubićete sve promene."
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-#, fuzzy
-#| msgid "Update Configuration"
-msgid "Location of Stored Configuration"
-msgstr "Osveži konfiguraciju"
-
-#. 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 ""
-
# message show when user has disabled the configuration
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
msgid "Skipping configuration upon user request"
msgstr "Preskakanje podešavanja na korisnikov zahtev"
# error message is a popup
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
@@ -2033,20 +2083,20 @@
"pre nego što se nastavi dalje.\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
msgid "Adapting the proposal to the current settings..."
msgstr ""
# Initial contents of proposal subwindow while proposals are calculated
#. 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
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
msgid "Analyzing your system..."
msgstr "Analiza vašeg sistema..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
msgid "ERROR: No proposal"
msgstr ""
@@ -2054,7 +2104,7 @@
# text for a message box
#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -2071,32 +2121,20 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
msgid "&Skip Configuration"
msgstr "&Preskoči podešavanja"
#. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
msgid "&Use Following Configuration"
msgstr "Koristi sledeća podešavanja"
-# 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.
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Export Configuration"
-msgstr "&Preskoči podešavanja"
-
# Help message between headline and installation proposal / settings summary.
# May contain newlines, but don't make it very much longer than the original.
#. 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
+#: src/lib/installation/proposal_runner.rb:693
#, 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."
@@ -2104,7 +2142,7 @@
# 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:717
+#: src/lib/installation/proposal_runner.rb:697
#, fuzzy
#| msgid "Click any headline to make changes or use the \"Change...\" menu below."
msgid "Click a headline to make changes."
@@ -2112,19 +2150,19 @@
# maybe some submodules are not installed
#. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
msgid "&Reset to defaults"
msgstr "&Resetuj na podrazumevano"
# Proposal for installation mode
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
#, fuzzy
msgid "&Update"
msgstr "&Dogradnja"
# Button label
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Install"
msgstr "&Instaliraj"
@@ -2176,7 +2214,7 @@
# General part ("You can change values...") is added as the next paragraph.
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2197,7 +2235,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:434
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2217,7 +2255,7 @@
# General part ("You can change values...") is added as the next paragraph.
#. 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
+#: src/lib/installation/proposal_store.rb:443
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -2231,7 +2269,7 @@
# General part ("You can change values...") is added as the next paragraph.
#. 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
+#: src/lib/installation/proposal_store.rb:451
#, fuzzy
msgid ""
"<p>\n"
@@ -2246,7 +2284,7 @@
# General part ("You can change values...") is added as the next paragraph.
#. 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
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -2257,12 +2295,12 @@
"</p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr ""
#. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -2274,7 +2312,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:482
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2293,6 +2331,11 @@
msgid "Enabling remote administration..."
msgstr "Izvršavanje auto-instalirajućih skripti u instalacionom okruženju."
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:79
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
#. Writes configuration
#.
#. It creates a snapshot when no second stage is required and
@@ -2300,20 +2343,116 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
msgid "Creating root filesystem snapshot..."
msgstr ""
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+# a popup
+# a popup
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+#, fuzzy
+#| msgid "No Linux root partition found."
+msgid "No previous Linux installation found"
+msgstr "Nije pronađena LINUX-Root-Particija"
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. 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/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. 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/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown protocol %1."
+msgstr "Nepoznato"
+
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
msgid "Failed to read information about installation images"
msgstr ""
# module method progress label
#. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
#, fuzzy
msgid "Deploying..."
msgstr "Provera verzija..."
@@ -2323,7 +2462,7 @@
#.
#. @see #all_supported_types
#. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
#, fuzzy
msgid "Storing user preferences..."
msgstr "Pokrećem servise..."
@@ -2331,17 +2470,22 @@
#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
#.
#. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
msgid "Restoring user preferences..."
msgstr ""
#. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
msgid ""
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
msgstr ""
+#, fuzzy
+#~| msgid "Update Configuration"
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "Osveži konfiguraciju"
+
#~ msgid "Dummy"
#~ msgstr "Neznalica"
@@ -2759,11 +2903,6 @@
#~ msgid "Evaluating root partition. One moment please..."
#~ msgstr "Proveravam root-particiju; Trenutak molim..."
-# a popup
-# a popup
-#~ msgid "No Linux root partition found."
-#~ msgstr "Nije pronađena LINUX-Root-Particija"
-
# Information popup: Inform user what partition
# will be booted from after user selected
# "Boot installed system"
Modified: trunk/yast/sr@Latn/po/iscsi-client.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/iscsi-client.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/iscsi-client.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -129,7 +129,6 @@
msgid "Add"
msgstr "Dodaj"
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
#: src/include/iscsi-client/dialogs.rb:160
msgid "Edit"
msgstr ""
@@ -206,45 +205,64 @@
msgid "Startup"
msgstr "Početak"
+# ComboBox item
+# ComboBox item (device start mode)
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "Ručno"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
# table cell description
#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr "&IP adresa"
# table header
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
msgid "Port"
msgstr "Port"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Key"
msgstr ""
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Value"
msgstr ""
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
msgid "Service"
msgstr "Servis"
# DIALOG TEXTS
# Connection dialog caption
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
#, fuzzy
msgid "Connected Targets"
msgstr "Parametri povezivanja"
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
msgid "Discovered Targets"
msgstr ""
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
#, fuzzy
msgid "iSCSI Initiator Overview"
msgstr "Prikaz Iskorištenosti Diska"
@@ -252,7 +270,7 @@
#. discovery new target
#. 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/dialogs.rb:407
#: 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>"
@@ -261,9 +279,9 @@
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
msgid "iSCSI Initiator Discovery"
msgstr ""
@@ -509,34 +527,32 @@
msgid "Error occurred while logging out from the selected target."
msgstr "Dogodila se greška prilikom čitanja izveštaja."
-#. toggle all 3 possible values (bnc#457252)
#: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
#, fuzzy
msgid "No record found."
msgstr "Disk nije pronađen."
# table cell description
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
#, fuzzy
#| msgid "IP Address"
msgid "No valid IP address"
msgstr "&IP adresa"
# Popup::Error text
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
#, fuzzy
msgid "Port field cannot be empty"
msgstr "IP adresa je nepravilna."
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:393
#, fuzzy
msgid "Incorrect Initiator Name"
msgstr "NIS klijent"
-#: src/include/iscsi-client/widgets.rb:429
+#: src/include/iscsi-client/widgets.rb:394
msgid ""
"\n"
"The correct syntax is\n"
@@ -549,15 +565,20 @@
"Do you want to use the name?\n"
msgstr ""
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
#, fuzzy
msgid "Insert the IP address."
msgstr "Unesi &IP adresu"
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
# error report
#. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:596
#, fuzzy
msgid "Insert the port."
msgstr "&Podesite lozinku."
@@ -567,39 +588,39 @@
#. ******************* 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:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
#, fuzzy
msgid "True"
msgstr "Atribut"
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
#, fuzzy
msgid "False"
msgstr "neuspešno"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr ""
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Continue"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
msgid "Cancel"
msgstr ""
# error message - the entered ip address is already configured for another virtual host
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:869
#, fuzzy
msgid "The target is already connected."
msgstr "IP adresa je već konfigurisana."
@@ -717,7 +738,7 @@
msgstr ""
#. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:730
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -725,14 +746,15 @@
"in the BIOS.\n"
msgstr ""
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
msgid "Target connection failed.\n"
msgstr ""
# configuration summary headline
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1208
#, fuzzy
msgid "Configuration summary..."
msgstr "Cela konfiguracija"
Modified: trunk/yast/sr@Latn/po/iscsi-lio-server.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/iscsi-lio-server.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/iscsi-lio-server.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-01-30 16:29+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@
#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#: src/modules/IscsiLioServer.rb:443
msgid "Targets"
msgstr ""
@@ -63,7 +63,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
msgid "Portal group"
msgstr ""
@@ -84,7 +84,7 @@
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
msgid "LUN"
msgstr ""
@@ -97,153 +97,159 @@
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/widgets.rb:453
msgid "Add"
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
msgid "Edit"
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
+#: src/include/iscsi-lio-server/widgets.rb:454
msgid "Delete"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Client"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "LUN Mapping"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
msgid "Auth"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
msgid "Edit LUN"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
msgid "Edit Auth"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
msgid "Copy"
msgstr ""
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:225
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/widgets.rb:229
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr ""
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:721
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
msgid "Username"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:722
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
msgid "Password"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:248
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/widgets.rb:242
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr ""
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
msgid "When &Booting"
msgstr ""
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
msgid "&Manually"
msgstr ""
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr ""
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr ""
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Key"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Value"
msgstr ""
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
msgid "iSCSI LIO Target Overview"
msgstr ""
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
msgid "<h1>iSCSI Target</h1>"
msgstr ""
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
msgid "Add iSCSI Target"
msgstr ""
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+msgid "Modify iSCSI Target Initiator Setup"
msgstr ""
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
msgid "Modify iSCSI Target Lun Setup"
msgstr ""
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
msgid "iSCSI Target Expert Settings"
msgstr ""
@@ -363,19 +369,24 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
msgstr ""
#: src/include/iscsi-lio-server/helps.rb:130
-msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+msgid ""
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
msgstr ""
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
msgid ""
"List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</b>."
@@ -383,12 +394,12 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
msgid ""
"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -397,19 +408,19 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
msgid ""
"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
"and port the service will be available. Default for port number is 3260.\n"
"Only ip addresses assigned to one of the network cards are possible."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
msgid "Create a new target. Replace template values with the correct values."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
msgid ""
"It is possible to make arbitary block devices or files available under a lun.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -418,202 +429,208 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
msgid ""
"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
msgstr ""
#. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
msgid "Problem changing authentication"
msgstr ""
#. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
msgid "Invalid Username"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
msgid "Invalid Password."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:251
-msgid "Selected Lun is already in use!"
+#: src/include/iscsi-lio-server/widgets.rb:262
+msgid "Selected LUN is already in use!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
msgid "Selected Name is already in use!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected Path must be either block device or normal file!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
msgid "Selected Path is already in use!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
msgid "Path:"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
msgid "Browse"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
msgid "Select file or device"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:436
-msgid "Client Lun"
+#: src/include/iscsi-lio-server/widgets.rb:447
+msgid "Initiator LUN"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
msgid "Target LUN"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
msgid "Change:"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
msgid "Target LUN %1 used more than once!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
msgid "Need to enable at least one Authentification!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:619
-msgid "Client name:"
+#: src/include/iscsi-lio-server/widgets.rb:630
+msgid "Initiator name:"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
msgid "Import LUNs from TPG"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
-msgid "Client name must not be empty!"
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
+msgid "Initiator name must not be empty!"
msgstr ""
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. 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:701
-msgid "Client name already exists!"
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
+msgid "Initiator name already exists!"
msgstr ""
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
-msgid "New client name:"
+#: src/include/iscsi-lio-server/widgets.rb:689
+msgid "New initiator name:"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
msgid "OK"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
msgid "Cancel"
msgstr ""
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:796
+msgid "Enabled"
+msgstr ""
+
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
+msgid "Disabled"
+msgstr ""
+
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
msgid "Really delete the selected item?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1015
msgid "Problem creating target %1 with tpg %2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1037
msgid "Problem setting network portal to %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1058
msgid "Problem removing lun %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1083
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1097
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:1198
+#: src/include/iscsi-lio-server/widgets.rb:1211
msgid "The target cannot be empty."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1215
msgid "The target portal group cannot be empty."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1226
msgid "The target already exists."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1246
msgid "Incoming"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1249
msgid "Outgoing"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1251
msgid "None"
msgstr ""
-#: 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 ""
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1463
msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator 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?"
+"Really want to continue without initiator access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1477
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1492
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1513
+msgid "Problem removing initiator %3 from %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1524
-msgid "Problem creating client %3 for %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1537
+msgid "Problem creating initiator %3 for %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1572
+msgid "Problem changing auth for initiator %3 in %1:%2"
msgstr ""
#. Initialization dialog caption
@@ -627,11 +644,11 @@
msgstr ""
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save lio setup"
msgstr ""
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
msgid "Cannot save tcm setup"
msgstr ""
Modified: trunk/yast/sr@Latn/po/kdump.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/kdump.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/kdump.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-01-30 16:30+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -363,10 +363,8 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
msgid "To apply changes a reboot is necessary."
msgstr ""
@@ -1097,148 +1095,163 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
msgid "Use &Firmware-Assisted Dump"
msgstr ""
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:511
msgid "Initializing kdump Configuration"
msgstr ""
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
msgid "Reading the config file..."
msgstr ""
#. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:522
msgid "Reading kernel boot options..."
msgstr ""
#. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:524
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:530
msgid "Reading partitions of disks..."
msgstr ""
#. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:532
msgid "Reading available memory and calibrating usage..."
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:544
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:552
msgid "Cannot read kernel boot options."
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:560
msgid "Cannot read available memory."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:586
msgid "Saving kdump Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:615
msgid "Write the settings"
msgstr ""
#. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:617
msgid "Update boot options"
msgstr ""
#. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:621
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:623
msgid "Updating boot options..."
msgstr ""
#. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:625
msgid "Finished"
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:635
msgid "Cannot write settings."
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:644
msgid "Adding crashkernel parameter to bootloader fault."
msgstr ""
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:764
msgid "Kdump status: %1"
msgstr ""
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "enabled"
msgstr ""
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "disabled"
msgstr ""
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:772
msgid "Value(s) of crashkernel option: %1"
msgstr ""
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:779
msgid "Dump format: %1"
msgstr ""
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:786
msgid "Target of dumps: %1"
msgstr ""
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:793
msgid "Number of dumps: %1"
msgstr ""
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:879
+#: src/modules/Kdump.rb:885
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:974
+#: src/modules/Kdump.rb:972
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/sr@Latn/po/live-installer.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/live-installer.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/live-installer.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-01-30 16:30+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -39,27 +39,27 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
msgid "Evaluating filesystems to copy..."
msgstr ""
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
msgid "Copying root filesystem..."
msgstr ""
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
msgid "Copying live image..."
msgstr ""
#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
msgid "Copying %1..."
msgstr ""
#. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -69,78 +69,60 @@
msgstr ""
#. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
msgid "Copying the live image to hard disk failed."
msgstr ""
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
msgid "Installation Settings"
msgstr ""
#. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
msgid "Analyzing the system..."
msgstr ""
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
msgid "Use %1%% of disk %2 for Linux"
msgstr ""
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
msgid "Do not use disk %1"
msgstr ""
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
msgid "Partitioning"
msgstr ""
#. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-msgid "System start-up"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr ""
-
-#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
msgid "Keyboard"
msgstr ""
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
msgid "Time Zone"
msgstr ""
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
msgid "Change Installation Settings"
msgstr ""
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
msgid ""
"<p>\n"
"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
msgstr ""
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
msgid ""
"<p>\n"
"To change the values, click the respective headline\n"
@@ -148,7 +130,7 @@
msgstr ""
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
msgid ""
"<p>\n"
"Your hard disk has not been modified, you can still safely abort.\n"
@@ -235,7 +217,7 @@
msgstr ""
#. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
msgid "Copying files to installed system..."
msgstr ""
Modified: trunk/yast/sr@Latn/po/mail.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/mail.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/mail.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST2 (memory)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-25 20:16+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -354,27 +354,32 @@
# Translators: dialog caption
#. Translators: dialog caption
#. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
msgid "Outgoing Mail"
msgstr "Odlazeći Mail"
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr ""
+
#. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
msgid "TLS encryption"
msgstr ""
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353 src/modules/Mail.rb:1356
-#: src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
msgid "No"
msgstr "&Ne"
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
#, fuzzy
#| msgid "User"
msgid "Use"
msgstr "Korisnik"
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
msgid "Enforce"
msgstr ""
@@ -382,7 +387,7 @@
# TODO ...
# Translators: button
# TODO ...
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
msgid "&Masquerading"
msgstr "&Lažno prikazivanje"
@@ -390,52 +395,52 @@
# TODO ...
# Translators: button
# TODO ...
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
msgid "&Authentication"
msgstr "&Autorizacija"
# Translators: dialog caption
#. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
msgid "Incoming Mail"
msgstr "Dolazeći Mail"
# pushbutton
# pushbutton
#. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
msgid "&Details..."
msgstr "&Detalji..."
# summary item
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
#, fuzzy
#| msgid "Fetchmail"
msgid "Start &fetchmail"
msgstr "Fetchmail"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
msgid "manual"
msgstr ""
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
msgid "daemon"
msgstr ""
# frame label: mail downloading (fetchmail)
#. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
msgid "&Downloading"
msgstr "Preuzi&manje"
# pushbutton
#. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
msgid "&Aliases..."
msgstr "&Alias-i..."
# pushbutton
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
msgid "&Virtual domains..."
msgstr "&Virtuelni domeni..."
@@ -447,7 +452,7 @@
#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
#. %2: file name (eg. /etc/sysconfig/postfix)
#. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
msgid ""
"To be able to deliver mail to your local MTA,\n"
"the value of %1 in %2 will be set to\n"
@@ -465,7 +470,7 @@
#. correct and complete. The login name may contain only
#. certain characters and must begin with a letter.
#. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
msgid ""
"The user login may contain only\n"
"lower case letters, digits, \"-\" and \"_\"\n"
@@ -479,46 +484,46 @@
# Translators: popup dialog heading
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
msgid "Sender address rewriting"
msgstr "Prepisivanje adrese pošiljaoca"
# Translators: text entry label
#. Translators: text entry label
#. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
#: src/include/mail/widgets.rb:269
msgid "&Local user"
msgstr "&Lokalni korisnik"
# Translators: text entry label
#. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
msgid "&Display as"
msgstr "Pri&kaži kao"
# Translators: error message
#. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
msgid "The address for this user is already defined."
msgstr "Adresa korisnika je već definisana."
# error popup
#. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
msgid "The mail address format is incorrect."
msgstr "Format adrese pošte nije ispravan."
# Translators: dialog caption
# Translators: dialog caption
#. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
msgid "Masquerading"
msgstr "Lažno prikazivanje"
# Translators: radio button label
#. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
msgid "Masquerade &local domains"
msgstr "Maskiraj &lokalne domene"
@@ -534,26 +539,26 @@
#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
#. ),
#. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
msgid "Ma&squerade other domains"
msgstr "Ma&skiraj ostale domene"
# Translators: text entry label
#. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
msgid "Do&mains to masquerade"
msgstr "Do&meni za maskiranje"
# Translators: table column headings
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
msgid "Local user"
msgstr "Lokalni korisnik"
# Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
msgid "Display as"
msgstr "Prikaži kao"
@@ -563,18 +568,18 @@
#. ["holly", "jane", "tarzan"])),
#. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly(a)red.dwarf"))
#. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
msgid "A&dd"
msgstr "&Dodaj"
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
msgid "&Edit"
msgstr "&Promjeni"
# Translators: button
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
msgid "Dele&te"
msgstr "&Obriši"
@@ -582,7 +587,7 @@
# Already in Translation Memory
#. Translators: error popup
#. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
msgid "The domain name is incorrect"
msgstr "Ime domena je neispavno."
@@ -594,121 +599,121 @@
#. list<string> lmod = [];
#. list<map> mu = Mail::masquerade_users;
#. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
msgid "Outgoing Server Authentication"
msgstr "Autorizacija odlazećeg servera"
#. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
msgid "Outgoing &Server"
msgstr "Odlazeći &server"
#. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
msgid "&User name"
msgstr "&Korisničko ime"
#. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
msgid "&Password"
msgstr "&Lozinka"
# Translators: popup dialog heading
#. Translators: popup dialog heading
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
msgid "Mail downloading"
msgstr "Preuzimanje pošte"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
msgid "Server"
msgstr "Server"
# Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
msgid "Protocol"
msgstr "Protokol"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
msgid "User"
msgstr "Korisnik"
# Translators: button
# Translators: button
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
msgid "De&lete"
msgstr "&Obriši"
# Translators: popup dialog heading
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
msgid "Incoming mail redirection"
msgstr "Preusmeravanje dolazećeg mail-a"
# Translators: text entry label
#. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
msgid "&Alias"
msgstr "&Alijas"
# Translators: text entry label
#. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
msgid "&Destinations"
msgstr "&Odredišta"
# Translators: error message
#. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
msgid "The alias format is incorrect."
msgstr "Format alijasa nije ispravan."
# Translators: error message
#. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
msgid "The destinations for this alias are already defined."
msgstr "Odredište ovog alijasa je već definisano."
# summary item
#. Translators: dialog caption
#. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
msgid "Aliases"
msgstr "Alijasi"
# Translators: table column headings
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
msgid "Alias"
msgstr "Alijas"
# Translators: table column headings
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
msgid "Destinations"
msgstr "Odredišta"
# Translators: dialog caption
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
msgid "Virtual domains"
msgstr "Virtuelni domeni"
# Translators: dialog caption
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
msgid "Mail configuration"
msgstr "Konfiguracija mail-a"
# label
#. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
msgid "Initializing..."
msgstr ""
"YaST2\n"
@@ -1020,12 +1025,12 @@
# Translators: popup message part, ends with a newline
# Translators: popup message part, ends with a newline
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr "AMaViS, virus skener će biti instaliran.\n"
#. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
msgid ""
"AMaViS needs a virus scanner such as ClamAV\n"
"to do the actual scanning, but ClamAV was not found.\n"
@@ -1034,21 +1039,21 @@
# Translators: popup message part, ends with a newline
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr "Fetchmail, program za preuzimanje pošte će biti instaliran.\n"
# Translators: popup message part, ends with a newline
# Translators: popup message part, ends with a newline
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
#, fuzzy
msgid "Dovecot IMAP server, will be installed.\n"
msgstr "AMaViS, virus skener će biti instaliran.\n"
# Translators: dialog caption
#. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
msgid "Initializing mail configuration"
msgstr "Inicijalizovanje mail podešavanja"
@@ -1056,32 +1061,32 @@
# do not translate MTA
#. Translators: progress label
#. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
msgid "Determining Mail Transport Agent (MTA)"
msgstr "Određujem agenta za transport pošte (MTA)"
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
msgid "Reading general settings"
msgstr "Čitanje osnovnih podešavanja"
# Translators: progress label
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
msgid "Reading masquerading settings"
msgstr "Čitam podešavanja"
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
msgid "Reading downloading settings"
msgstr "Čitanje podešavanja preuzimanja"
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
msgid "Reading alias tables"
msgstr "Čitam tabelu alias-a"
@@ -1089,7 +1094,7 @@
# smtp-auth
#. Translators: progress label
#. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
msgid "Reading authentication settings..."
msgstr "Čitam podešanja &za autentičnost..."
@@ -1099,7 +1104,7 @@
#. Translators: error message,
#. %1 is a file name,
#. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
#, fuzzy
#| msgid ""
#| "Error reading file %1. The file must have\n"
@@ -1116,20 +1121,20 @@
# Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
msgid "Error writing the fetchmail configuration."
msgstr "Greška prilikom snimanja fetchmail podešavanja."
# Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
msgid "Error writing file %1"
msgstr "Greška prilikom čitanja datoteke %1"
# Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
#, fuzzy
#| msgid "Error running SuSEconfig."
msgid "Error running config.postfix"
@@ -1139,26 +1144,26 @@
#. Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
msgid "Error starting service %1."
msgstr "Greška prilikom pokretanja servisa %1."
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
msgid "Writing general settings"
msgstr "Snimanje osnovnih podešavanja"
# Translators: progress label
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
msgid "Writing masquerading settings"
msgstr "Snimam podešavanja"
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
msgid "Writing alias tables"
msgstr "Snimanje tabele alijasa"
@@ -1168,25 +1173,25 @@
#. Write them unconditionally, because it is now possible to
#. enter them also in the Permanent mode. Bug #17417.
#. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
msgid "Writing downloading settings"
msgstr "Snimanje podešavanja preuzimanja"
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
msgid "Writing authentication settings..."
msgstr "Snimanje podešavanja za autentičnost..."
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
msgid "Finishing writing configuration files"
msgstr "Završavanje snimanja konfiguracionih fajlova"
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
#, fuzzy
#| msgid "Running SuSEconfig"
msgid "Running Config Postfix"
@@ -1194,120 +1199,120 @@
# Translators: progress label
#. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
msgid "Restarting services"
msgstr "Restartovanje servisa"
# Translators: dialog caption
#. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
msgid "Saving mail configuration"
msgstr "Snimanje podešavanja za mail"
#. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
msgid "Other"
msgstr "ostali"
# Translators: radio button label
#. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
#, fuzzy
msgid "Permanent"
msgstr "&Trajno"
# Translators: radio button label
#. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
#, fuzzy
msgid "Dial-up"
msgstr "&Dial-up"
#. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
msgid "None"
msgstr "Nema"
# summary header; mail transfer agent
#. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
msgid "MTA"
msgstr "MTA"
# summary header
#. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
msgid "Connection Type"
msgstr "Tip povezivanja"
# summary header
#. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
msgid "Outgoing Mail Server"
msgstr "Odlazeći server pošte"
# summary header; the "From: foo(a)bar.com" mail header
#. summary header; the "From: foo(a)bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
msgid "From Header"
msgstr "Iz zaglavlja"
# summary item
#. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
msgid "Local Domains"
msgstr "Lokalni domeni"
# summary item
#. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
msgid "Masquerade Other Domains"
msgstr "Maskiraj ostale domene"
# summary item
#. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
msgid "Masquerade Users"
msgstr "Maskiraj korisnike"
# summary header
#. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
msgid "Accept remote SMTP connections"
msgstr "Prihvati udaljene SMTP veze"
# summary item: an option is turned on
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
msgid "Yes"
msgstr "&Da"
# summary header
#. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
msgid "Use AMaViS"
msgstr "Koristi AMaViS"
#. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
msgid "Use DKIM"
msgstr ""
# summary item
#. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
msgid "Fetchmail"
msgstr "Fetchmail"
# summary item
#. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
msgid "Virtual Users"
msgstr "Virtuelni korisnici"
# summary item
# summary item
#. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
msgid "Authentication"
msgstr "Autorizacija"
Modified: trunk/yast/sr@Latn/po/network.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/network.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/network.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST2 (network)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-27 15:29+0100\n"
"Last-Translator: Rade Radenkovic <rrade(a)tesla.rcub.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -233,7 +233,7 @@
# configuration summary headline
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
#, fuzzy
msgid "Host Configuration Summary:"
msgstr "Cela konfiguracija"
@@ -379,14 +379,14 @@
# label of combobox where the log is selected
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
msgid "Opening of Connection"
msgstr "Otvaranje povezivanja"
# popup to inform user about the failure
#. popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
@@ -395,13 +395,13 @@
"izveštaje za više detalja.\n"
#. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
+#: src/clients/inst_do_net_test.rb:870
msgid "No URL for the release notes defined. Internet test cannot be performed."
msgstr ""
#. popup informing user about the failure to retrieve release notes
#. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
msgid ""
"Download of latest release notes failed due to server-side error. \n"
"This does not necessarily imply a faulty network configuration.\n"
@@ -413,7 +413,7 @@
# popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
#, fuzzy
#| msgid ""
#| "Download of latest release notes failed. View\n"
@@ -427,13 +427,13 @@
# label of combobox where the log is selected
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
msgid "Check for Patches"
msgstr "Provera zakrpa"
# popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
@@ -443,7 +443,7 @@
# label of combobox where the log is selected
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
msgid "Closing of Connection"
msgstr "Zatvaranje povezivanja"
@@ -556,7 +556,7 @@
#. 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
+#: src/clients/lan_auto.rb:108
msgid "Configuration Error: uninitialized interface."
msgstr ""
@@ -653,7 +653,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
#, fuzzy
msgid "Routing Configuration"
msgstr "Podešavanje rutiranja"
@@ -776,7 +776,7 @@
# Table header label
# Table header 3/4
#. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
msgid "Netmask"
msgstr "Mrežna maska"
@@ -799,14 +799,14 @@
#. Handler for action "list"
#. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
msgid "No entry for destination '%1' in routing table"
msgstr ""
# Summary text
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
#, fuzzy
#| msgid "IP Forwarding: on"
msgid "%s forwarding is enabled"
@@ -814,14 +814,14 @@
# Alternative state label text:
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
#, fuzzy
msgid "%s forwarding is disabled"
msgstr "SCPM je isključen."
# CheckBox label
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
#, fuzzy
#| msgid "Enable &IP Forwarding"
msgid "Enabling %s forwarding..."
@@ -829,70 +829,70 @@
# CheckBox label
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
#, fuzzy
#| msgid "Enable &IP Forwarding"
msgid "Disabling %s forwarding..."
msgstr "Uključi &IP prosleđivanje"
# Summary text
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
#, fuzzy
#| msgid "IP Forwarding: on"
msgid "IPv4 Forwarding:"
msgstr "IP prosleđivanje: uključeno"
# Summary text
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
#, fuzzy
#| msgid "IP Forwarding: on"
msgid "IPv6 Forwarding:"
msgstr "IP prosleđivanje: uključeno"
# Summary text
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
#, fuzzy
#| msgid "IP Forwarding: on"
msgid "IPv4 and IPv6 Forwarding:"
msgstr "IP prosleđivanje: uključeno"
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
msgid "At least destination and gateway IP addresses must be specified."
msgstr ""
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
msgid "Adding '%1' destination to routing table ..."
msgstr ""
# CheckBox label
# Checkbox label
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
#, fuzzy
#| msgid "&Dynamic IP address"
msgid "Destination IP address must be specified."
msgstr "&Dinamička IP adresa"
-#: src/clients/routing.rb:348
+#: src/clients/routing.rb:349
msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
msgstr ""
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
msgid "Updating '%1' destination in routing table ..."
msgstr ""
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
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:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
msgid "Warning: no encryption is used."
msgstr ""
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
#, fuzzy
msgid "Change."
msgstr "Promeni"
@@ -1022,7 +1022,7 @@
# Device type label
# Device type label
#. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
#, fuzzy
msgid "Unknown Network Device"
msgstr "Nepoznati mrežni uređaj"
@@ -1031,71 +1031,71 @@
#. Modem status (%1 is device)
#. ISDN device status (%1 is device)
#. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
msgid "Configured as %1"
msgstr "Podešeno kao %1"
# Modem status (%1 is device, %2 is provider)
#. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
msgid "Configured as %1 with provider %2"
msgstr "Podešen kao %1 sa provajderom %2"
# ISDN status (%1 is device, %2 is provider, %3 protocol)
#. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
msgid "Configured as %1 with provider %2 (protocol %3)"
msgstr "Podešen kao %1 sa provajderom %2 (protokol %3)"
# Network card status (%1 is address)
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
#, fuzzy
msgid "Configured without address (NONE)"
msgstr "Podešeno sa adresom %1"
# Network card status (%1 is address)
#. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
#, fuzzy
msgid "Configured without an address"
msgstr "Podešeno sa adresom %1"
# Network card status (%1 is address)
#. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
#, fuzzy
msgid "Configured with address %1"
msgstr "Podešeno sa adresom %1"
# Network card status (%1 is address, %2 is address)
#. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
#, fuzzy
msgid "Configured with address %1 (remote %2)"
msgstr "Podešeno sa adresom %1 (udaljeno %2)"
# Network card status (%1 is protocol)
#. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
msgid "Configured with %1"
msgstr "Podešeno sa %1"
# Network card status (%1 is device, %2 is address)
#. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
msgid "Configured as %1 with address %2"
msgstr "Podešen kao %1 sa adresom %2"
# Network card status (%1 is device, %2 is address, %3 is address)
#. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
msgid "Configured as %1 with address %2 (remote %3)"
msgstr "Podešen kao %1 sa adresom %2 (udaljeno %3)"
# Network card status (%1 is device, %2 is protocol)
#. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
msgid "Configured as %1 with %2"
msgstr "Podešen kao %1 sa %2"
@@ -1103,7 +1103,7 @@
# Combobox item
#. Abbreviation for "The interface is Managed by NetworkManager"
#. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
msgid "Managed"
msgstr "Upravljani"
@@ -1267,14 +1267,14 @@
# translators: all network addresses Listen type
#. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
#, fuzzy
msgid "Additional Addresses"
msgstr "Sve adrese"
# table cell description
#. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
#, fuzzy
#| msgid "IP Address"
msgid "IPv4 Address Label"
@@ -1283,8 +1283,8 @@
# table cell description
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "&IP adresa"
@@ -1292,8 +1292,8 @@
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/lan/address.rb:108
+#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "Do&daj"
@@ -1303,8 +1303,8 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/lan/address.rb:110
+#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1318,31 +1318,31 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/lan/address.rb:112
+#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
msgstr "&Obriši"
# tree node string
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
#, fuzzy
msgid "&Name of Interface"
msgstr "Mrežni interfejs"
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
msgid "<p>TODO kind of vague!</p>"
msgstr ""
#. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
msgid "Assign Interface to Firewall &Zone"
msgstr ""
# tree node string
#. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
#, fuzzy
msgid "&Mandatory Interface"
msgstr "Mrežni interfejs"
@@ -1350,7 +1350,7 @@
# ComboBox label
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
#: src/include/network/lan/hardware.rb:351
msgid "&Device Type"
msgstr "Tip uređaja"
@@ -1358,92 +1358,92 @@
# TextEntry label
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
#: src/include/network/lan/hardware.rb:337
msgid "&Configuration Name"
msgstr "Ime podešavanja"
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
msgid "Tunnel owner"
msgstr ""
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
msgid "Tunnel group"
msgstr ""
# Label text
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
#, fuzzy
msgid "Bridged Devices"
msgstr "Modem uređaj:"
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
msgid "Real Interface for &VLAN"
msgstr ""
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
msgid "VLAN ID"
msgstr ""
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
msgid "Bond Slaves and Order"
msgstr ""
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
msgid "Up"
msgstr ""
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
msgid "Down"
msgstr ""
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
msgid "Bond &Slaves"
msgstr ""
#. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
msgid "&Bond Driver Options"
msgstr ""
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr ""
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr ""
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
msgid "Use iBFT Values"
msgstr ""
# CheckBox label
# Checkbox label
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
#, fuzzy
msgid "Dynamic Address"
msgstr "&Dinamička IP adresa"
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
msgid "DHCP both version 4 and 6"
msgstr ""
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
msgid "DHCP version 4 only"
msgstr ""
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
msgid "DHCP version 6 only"
msgstr ""
# Checkbox label
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
#, fuzzy
#| msgid "&Automatically Retrieve DNS"
msgid "Statically Assigned IP Address"
@@ -1454,21 +1454,21 @@
# TextEntry label
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
msgid "&IP Address"
msgstr "&IP adresa"
# Text entry label for network mask
# Text entry label
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
#, fuzzy
msgid "&Subnet Mask"
msgstr "Ma&ka podmreže"
# TextEntry label
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
#, fuzzy
#| msgid "&Host name"
msgid "&Hostname"
@@ -1476,23 +1476,23 @@
# Text entry label
#. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
msgid "R&emote IP Address"
msgstr "Udalj&ena IP adresa"
# Popup text
#. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
msgid "The remote IP address is invalid."
msgstr "Udaljena IP adresa je nepravilna."
#. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
msgid "&S/390"
msgstr ""
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1030
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1502,14 +1502,14 @@
# dialog caption
# Popup text
#. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1050
#, fuzzy
msgid "Configuration %1 already present."
msgstr "Konfiguracija %1 već postoji"
#. 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:1062
+#: src/include/network/lan/address.rb:1074
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1521,22 +1521,22 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1094
#, fuzzy
#| msgid "Device IP address"
msgid "No valid IP address."
msgstr "IP adresa uređaja"
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1101
msgid "No valid netmask or prefix length."
msgstr ""
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1109
msgid "Invalid hostname."
msgstr ""
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1116
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1546,7 +1546,7 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1134
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1554,26 +1554,26 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1187
#, fuzzy
msgid "&General"
msgstr "SAD/Central"
# ComboBox label
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1198
#, fuzzy
#| msgid "&Device Activation"
msgid "Device Activation"
msgstr "&Aktiviranje uređaja"
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1202
#, fuzzy
msgid "Firewall Zone"
msgstr "Brzi tip zaštitnog zi&da"
# TextEntry label
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1207
#, fuzzy
#| msgid "M&aximum Transfer Unit (MTU)"
msgid "Maximum Transfer Unit (MTU)"
@@ -1583,48 +1583,48 @@
# Details dialog help 1/8
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1217
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>Podesite detalje o mrežnoj kartici ovde.</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1284
#, fuzzy
msgid "&Address"
msgstr "Adresa"
# Address dialog help 1/8
#. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1287
msgid "<p>Configure your IP address.</p>"
msgstr "<p>Podesite vašu IP adresu.</p>"
# Table header 4/4
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1293
#, fuzzy
#| msgid "Hardware"
msgid "&Hardware"
msgstr "Hardver"
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1300
msgid "&Bond Slaves"
msgstr ""
# Device type label
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1314
#, fuzzy
msgid "&Wireless"
msgstr "Bežično"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1398
msgid "Ifplugd Priority"
msgstr ""
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1404
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"
@@ -1635,13 +1635,24 @@
# Confirmation: label text (detecting hardware: xxx)
#. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1486
#, fuzzy
msgid "Network Card Setup"
msgstr "Mrežne kartice"
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
msgid ""
"At least one selected device is already configured.\n"
"Adapt the configuration for bridge?\n"
@@ -1875,23 +1886,23 @@
#. @param [Hash{String => String}] options action options
#. Handler for action "edit"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
msgid "Impossible value for bootproto."
msgstr ""
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
msgid "Impossible value for startmode."
msgstr ""
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
msgid "For static configuration, the \"ip\" option is needed."
msgstr ""
#. Handler for action "delete"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
msgid "The device was deleted."
msgstr ""
@@ -1954,7 +1965,7 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
msgid ""
"Firmware is needed. Install it from \n"
"the add-on CD.\n"
@@ -1962,7 +1973,7 @@
"to this configuration dialog.\n"
msgstr ""
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
msgid ""
"The device needs a firmware to function properly. Usually, it can be\n"
"downloaded from your driver vendor's Web page. \n"
@@ -1975,23 +1986,23 @@
#. - kernel modules (InstallKernel): before loaded
#. - wlan firmware: here, just because it is copied from modems
#. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
msgid "Installing firmware"
msgstr ""
-#: src/include/network/lan/complex.rb:233
+#: src/include/network/lan/complex.rb:232
msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
msgstr ""
# error report
# error report
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
#, fuzzy
msgid "An error occurred during firmware installation."
msgstr "Greška se dogodila prilikom pravljenja initrd podešavanja!"
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -2001,13 +2012,13 @@
msgstr ""
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:453
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr ""
# table item / label
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
#, fuzzy
msgid "Network Setup Method"
msgstr "Metoda snimanja"
@@ -2018,7 +2029,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:519
+#: src/include/network/lan/complex.rb:515
#, fuzzy
msgid "Network Settings"
msgstr "&Mrežni servisi"
@@ -2229,7 +2240,7 @@
#. Selection box label
#. Selection box title
#: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
#, fuzzy
msgid "&Network Card"
msgstr "Mrežne kartice"
@@ -2242,7 +2253,7 @@
# Popup text
#. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
#, fuzzy
msgid ""
"Configuration name %1 already exists.\n"
@@ -2253,7 +2264,7 @@
# S/390 dialog caption
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
msgid "S/390 Network Card Configuration"
msgstr "S/390 podešavanje mrežne kartice"
@@ -2262,108 +2273,108 @@
#. Frame label
#. Frame label
#. Frame label
-#: 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
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
msgid "S/390 Device Settings"
msgstr "S/390 podešavanje uređaja"
# TextEntry label
#. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
msgid "&Port Name"
msgstr "&Ime porta"
# TextEntry label
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
#, fuzzy
msgid "Port Number"
msgstr "&Ime porta"
# CheckBox entry label
#. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
#, fuzzy
msgid "&Enable IPA Takeover"
msgstr "&Uključi proksi"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
msgid "Enable &Layer 2 Support"
msgstr ""
# test entry, MAC better not to be translated,
# translation would decrease the understandability
#. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
#, fuzzy
msgid "Layer2 &MAC Address"
msgstr "&MAC Adresa"
# TextEntry label
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
#, fuzzy
#| msgid "R&ead Channel"
msgid "Read Channel"
msgstr "Kanal za čitanj&e"
# TextEntry label
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
#, fuzzy
#| msgid "&Write Channel"
msgid "Write Channel"
msgstr "Kana&l za pisanje"
# TextEntry label
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
#, fuzzy
#| msgid "&Data Channel"
msgid "Control Channel"
msgstr "Kanal za po&datke"
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr ""
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:950
msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
msgstr ""
-#: src/include/network/lan/hardware.rb:954
+#: src/include/network/lan/hardware.rb:953
msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
msgstr ""
-#: src/include/network/lan/hardware.rb:957
+#: src/include/network/lan/hardware.rb:956
msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
msgstr ""
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:959
msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
msgstr ""
# TextEntry label
#. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
#, fuzzy
msgid "&Port Number"
msgstr "&Ime porta"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
msgid "&LANCMD Time-Out"
msgstr ""
# different help text when called after installation
# in an installed system
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
#, fuzzy
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr ""
@@ -2373,7 +2384,7 @@
# different help text when called after installation
# in an installed system
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
#, fuzzy
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr ""
@@ -2382,37 +2393,37 @@
"</p>\n"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
msgid "Compatibility Mode"
msgstr ""
# button text
# button text
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
#, fuzzy
msgid "Extended Mode"
msgstr "&Extended particija"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr ""
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr ""
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
msgid "&Protocol"
msgstr "P&rotokol"
# different help text when called after installation
# in an installed system
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
#, fuzzy
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr ""
@@ -2421,20 +2432,19 @@
"</p>\n"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
#, fuzzy
msgid "&Peer Name"
msgstr "Ime &Servera"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
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"
msgstr ""
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
msgid ""
"An error occurred while creating device.\n"
"See YaST log for details."
@@ -2443,7 +2453,7 @@
# Push button label
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
#, fuzzy
#| msgid "H&ardware Details"
msgid "Hardware Dialog"
@@ -3025,7 +3035,7 @@
# table cell description
#. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
#, fuzzy
#| msgid "IP Address"
msgid "IPv4 &Address Label"
@@ -3033,27 +3043,27 @@
# TextEntry label
#. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
msgid "Net&mask"
msgstr "Net&mask"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
msgid "Label is too long."
msgstr ""
# Popup::Error text
#. Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
msgid "The IP address is invalid."
msgstr "IP adresa je nepravilna."
# Popup text
# Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
#, fuzzy
msgid "The subnet mask is invalid."
msgstr "Maska podmreže je netačna"
@@ -3239,76 +3249,76 @@
# Text entry label
#. Wireless authentication modes:
#. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
#, fuzzy
#| msgid "&Encryption Key"
msgid "No Encryption"
msgstr "Ključ &enkripcije"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
msgid "WEP - Open"
msgstr ""
# radio button
# radio button
#. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
#, fuzzy
msgid "WEP - Shared Key"
msgstr "&Deljena mreža"
#. ComboBox item
#. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
msgid "WPA-PSK (WPA version 1 or 2)"
msgstr ""
#. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
msgid "WPA-EAP (WPA version 1 or 2)"
msgstr ""
# Wireless dialog caption
#. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
msgid "Wireless Network Card Configuration"
msgstr "Podešavanje bežične mrežne kartice"
# Frame label
#. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
msgid "Wireless Device Settings"
msgstr "Podešavanje bežičnih uređaja"
# ComboBox label
#. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
msgid "O&perating Mode"
msgstr "Način rada"
# ComboBox item
# Combobox item
#. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
#, fuzzy
msgid "Ad-Hoc"
msgstr "Ad-hoc"
# To translators: part of the label in the dialog
#. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
msgid "Master"
msgstr "Primarni"
# Text entry label
#. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
msgid "Ne&twork Name (ESSID)"
msgstr "Ime m&reže (ESSID)"
# Device type label
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
#, fuzzy
#| msgid "XP Network"
msgid "Scan Network"
@@ -3319,75 +3329,75 @@
# Translators: button
# TODO ...
#. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
#, fuzzy
msgid "&Authentication Mode"
msgstr "&Autorizacija"
# Text entry label
#. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
msgid "&Encryption Key"
msgstr "Ključ &enkripcije"
# PushButton label
#. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
msgid "E&xpert Settings"
msgstr "&Napredna podešavanja"
#. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
#, fuzzy
msgid "&WEP Keys"
msgstr "&Tasteri"
#. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:558
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr ""
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:569
#, fuzzy
msgid "Specify the network name for this mode."
msgstr "Odštampaj pomoć za ovaj modul"
# Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:576
msgid "The network name must be shorter than 32 characters."
msgstr "Ime mreže mora biti manje od 32 slova."
#. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:596
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr ""
#. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:607
msgid "The key must have %1 hexadecimal digits."
msgstr ""
# Popup text
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:619
+#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "Šifrovani ključ je neispravan."
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:627
msgid "The encryption key must be specified for this authentication mode."
msgstr ""
# Popup text
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:634
#, fuzzy
msgid ""
"Using no encryption is a security risk.\n"
@@ -3503,33 +3513,33 @@
# Text entry label
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
#, fuzzy
msgid "Enter Encryption Key"
msgstr "Ključ &enkripcije"
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
#, fuzzy
msgid "&Key"
msgstr "&Tasteri"
# popup heading
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
msgid "Help"
msgstr "Pomoć"
# Device type label
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
#, fuzzy
msgid "Wireless Keys"
msgstr "Bežično"
# Wireless keys dialog help 1/3
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
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"
@@ -3545,7 +3555,7 @@
# Wireless keys dialog help 2/3
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
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"
@@ -3560,37 +3570,37 @@
"na 64.</p>"
#. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
#, fuzzy
msgid "WEP Keys"
msgstr "&Tasteri"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
msgid "&Key Length"
msgstr ""
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
#, fuzzy
msgid "No."
msgstr "&Ne"
# table header
#. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
msgid "Key"
msgstr "Ključ"
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
msgid "Default"
msgstr "Podrazumevano"
# pushbutton
#. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
#, fuzzy
msgid "&Set as Default"
msgstr "Pode&si kao podrazumevani"
@@ -3598,71 +3608,71 @@
# frame label, around checkbuttons
# frame label, around checkbuttons
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1214
#, fuzzy
msgid "Choose a Certificate"
msgstr "Izaberi kategoriju"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1257
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:1283
+#: src/include/network/lan/wireless.rb:1285
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
msgstr ""
#. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1331
msgid "WPA-EAP"
msgstr ""
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1353
msgid "Any"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1357
msgid "MD5"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1359
#, fuzzy
msgid "GTC"
msgstr "RTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1361
#, fuzzy
msgid "CHAP"
msgstr "HA"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1363
#, fuzzy
msgid "PAP"
msgstr "PPP "
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv1"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1369
msgid "MSCHAPv2"
msgstr ""
# Push button label
#. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1392
#, fuzzy
msgid "WPA-EAP Details"
msgstr "I&P detalji"
@@ -3683,26 +3693,39 @@
# RadioButton label
#. RadioButton label
#: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
msgstr "Dozvoli ud&aljenu administraciju"
# RadioButton label
#. RadioButton label
#: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "Dozvoli ud&aljenu administraciju"
+
+# RadioButton label
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
msgid "&Do Not Allow Remote Administration"
msgstr "&Nije dozvoljena udaljena administracija"
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
#, fuzzy
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
"administer this machine remotely from another machine. Use a VNC\n"
"client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
msgstr ""
"<p>Ako je ova mogućnost uključena moći ćete da\n"
"administrirate mašinu sa neke druge udaljene mašine. Možete da koristite VNC\n"
@@ -3713,20 +3736,20 @@
# Ramote Administration dialog caption
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
#, fuzzy
msgid "Remote Administration Settings"
msgstr "Udaljena administracija"
# Popup text
#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
msgid "These packages need to be installed:"
msgstr "Ovi paketi moraju da se instaliraju:"
# Popup text
#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3740,91 +3763,28 @@
# Table field (Unknown device)
# Table field (Unknown device)
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
msgid "Unknown"
msgstr "nepoznato"
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:279
-#, fuzzy
-msgid "Configuration Successfully Saved"
-msgstr "DSL podešavanja uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "DNS podešavanja uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "DSL podešavanja uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "Podešavanje host računara je uspešno snimljeno"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "ISDN podešavanja uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "Podešavanja mrežne kartice uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "Podešavanja modema uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "Podešavanje Proxy servera uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "Podešavanje provajdera uspešno snimljena"
-
-# Popup headline
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "Podešavanje rutiranja uspešno snimljena"
-
-# Popup text
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "Podesiti mail sada?"
-
-# Popup text
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "Pokrenuti podešavanje %1"
-
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:829
msgid ""
"Network is currently handled by NetworkManager\n"
"or completely disabled. YaST is unable to configure some options."
@@ -3832,7 +3792,7 @@
# Confirmation: label text (detecting hardware: xxx)
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1064
+#: src/include/network/routines.rb:889
msgid "Network Cards"
msgstr "Mrežne kartice"
@@ -3840,24 +3800,24 @@
# Table label
# Confirmation: label text (detecting hardware: xxx)
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:893
msgid "Modems"
msgstr "Modemi"
# Confirmation: label text (detecting hardware: xxx)
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:897
msgid "ISDN Cards"
msgstr "ISDN kartice"
# Table label
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:901
msgid "DSL Devices"
msgstr "DSL uređaji"
# Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:906
msgid "All Network Devices"
msgstr "Svi mrežni uređaji"
@@ -3865,7 +3825,7 @@
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:387
#, fuzzy
msgid "The hostname is invalid."
msgstr "Ime host računara je nepravilno."
@@ -3964,8 +3924,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
#, fuzzy
msgid "Hostname and Domain Name"
msgstr "Ime računara i ime domena"
@@ -3996,23 +3956,23 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
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:520
+#: src/include/network/services/dns.rb:513
msgid "The search list can have at most %1 domains."
msgstr ""
#. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
msgid "The search list can have at most %1 characters."
msgstr ""
# Popup::Error text
#. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
#, fuzzy
msgid "The search domain '%1' is invalid."
msgstr "Domen primarne pretrage je netačan"
@@ -4020,7 +3980,7 @@
# DNS dialog caption
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
#, fuzzy
msgid "Hostname and Name Server Configuration"
msgstr "Podešavanje imena host računara i servera imena"
@@ -4062,32 +4022,32 @@
# Frame label
#. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
msgid "Current Hosts"
msgstr "Trenutni host računari"
# Table header label
#. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
#, fuzzy
msgid "Hostnames"
msgstr "Imena servera"
# Table header label
#. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
msgid "Host Aliases"
msgstr "Alias-i servera"
# TextEntry label
#. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:340
msgid "Hos&t Aliases"
msgstr "&Alias-i servera"
# Popup::Error text
#. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:403
msgid "Alias name \"%1\" is invalid."
msgstr "Ime alijasa \"%1\" je nepravilno."
@@ -4143,46 +4103,46 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
msgid "&Destination"
msgstr "&Odredište"
# TextEntry label
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:171
#, fuzzy
#| msgid "Net&mask"
msgid "Ge&nmask"
msgstr "Net&mask"
# TextEntry label
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:180
msgid "&Gateway"
msgstr "&Gejtvej"
# Table header
# _("No."),
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:188
#, fuzzy
#| msgid "Device"
msgid "De&vice"
msgstr "Uređaj"
#. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:247
#, fuzzy
msgid "Destination is invalid."
msgstr "StationID je pogrešan."
# Popup::Error text
#. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:255
#, fuzzy
msgid "Gateway IP address is invalid."
msgstr "IP adresa je nepravilna."
# Popup::Error text
#. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:263
#, fuzzy
msgid "Subnetmask is invalid."
msgstr "Maska podmreže je netačna"
@@ -4190,7 +4150,7 @@
# Popup::Error text
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:422
#, fuzzy
msgid "The default gateway is invalid."
msgstr "Podrazumevani gejtvej je netačan"
@@ -4445,34 +4405,34 @@
msgstr ""
# Details dialog caption
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
#, fuzzy
msgid "General Network Settings"
msgstr "Detaljano podešavanje mrežne kartice"
# Frame label
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
#, fuzzy
#| msgid "Proxy Settings"
msgid "IPv6 Protocol Settings"
msgstr "Podešavanja proxy-a"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
#, fuzzy
msgid "Enable IPv6"
msgstr "Uključeno"
# Label text (Network device: unknown device)
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
#, fuzzy
msgid "Unknown device"
msgstr "Nepoznati uređaj"
# table cell description
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
#, fuzzy
#| msgid "IP Address"
msgid "DHCP address"
@@ -4483,26 +4443,26 @@
# IP details dialog caption
# Frame label
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
#, fuzzy
msgid "No IP address assigned"
msgstr "Podešavanje IP adrese"
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
msgid ""
"%1 \n"
"%2 - %3"
msgstr ""
#. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
#, fuzzy
msgid "&Change Device"
msgstr "Pregled Promena"
# Label text
#. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
#, fuzzy
msgid "Network Device Select"
msgstr "&Mrežni uređaj"
@@ -4513,7 +4473,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
#, fuzzy
#| msgid "Configured"
msgid "configured"
@@ -4581,7 +4541,7 @@
# Proxy dialog caption
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
#, fuzzy
#| msgid "Proxy Configuration"
msgid "Update configuration"
@@ -4613,7 +4573,7 @@
# Progress step 1/7
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
#, fuzzy
#| msgid "Writing configuration..."
msgid "Updating configuration..."
@@ -4631,129 +4591,129 @@
# Summary text
#. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
#, fuzzy
msgid "Hostname: Set by DHCP"
msgstr "Ime računara: podešeno preko DHCP"
# Summary text
#. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
#, fuzzy
msgid "Hostname: %1"
msgstr "Ime host-a: %1"
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
msgid "Hostname will not be written to /etc/hosts"
msgstr ""
# Summary text
#. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
msgid "Name Servers: %1"
msgstr "Serveri naziva: %1"
# Summary text
#. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
msgid "Search List: %1"
msgstr "Lista pretrage: %1"
#. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
msgid "Update /etc/hosts"
msgstr ""
# Write dialog caption
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
#, fuzzy
msgid "Saving Hostname Configuration"
msgstr "Snimanje podešavanja o modemu"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
msgid "Updating /etc/hosts ..."
msgstr ""
# Read dialog caption
#. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:276
#, fuzzy
msgid "Initializing Network Configuration"
msgstr "Pokretanje podešavanja mreže"
# Progress stage 1/9
#. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:289
msgid "Detect network devices"
msgstr "Pronalaženje mrežnih uređaja"
# Progress stage 2/9
#. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:291
msgid "Read driver information"
msgstr "Čitanje informacija u upravljačkim programima"
# Progress stage 3/9 - multiple devices may be present, really plural
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:293
msgid "Read device configuration"
msgstr "Čitanje informacija o uređaju"
# Progress stage 4/9
#. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:295
msgid "Read network configuration"
msgstr "Čitanje podešavanja mreža"
# step 4/5
#. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:297
msgid "Read firewall settings"
msgstr "Čitanje podešavanja zaštitnog zida"
# Progress stage 6/9
#. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:299
#, fuzzy
msgid "Read hostname and DNS configuration"
msgstr "Čitanje imena servera i DNS podešavanja"
# Progress stage 7/9
#. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:301
msgid "Read installation information"
msgstr "Čitanje instalacionih informacija"
# Progress stage 5/9
#. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:303
msgid "Read routing configuration"
msgstr "Čitanje podešavanja rutiranja"
# Progress stage 9/9
#. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:305
msgid "Detect current status"
msgstr "Prepoznavanje trenutnog statusa"
# Popup text
#. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:319
#, fuzzy
#| msgid "Detecting modems..."
msgid "Detecting ndiswrapper..."
msgstr "Pronalaženje modema..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:338
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
"Do you want to modprobe ndiswrapper?\n"
msgstr ""
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:346
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
@@ -4761,247 +4721,240 @@
# Progress step 1/9
#. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:360
msgid "Detecting network devices..."
msgstr "Pronalaženje mrežnih uređaja..."
# Progress step 3/9 - multiple devices may be present, really plural
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:368
msgid "Reading device configuration..."
msgstr "Čitanje podešavanja uređaja..."
# Progress step 4/9
#. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:374
msgid "Reading network configuration..."
msgstr "Čitanje mrežnog podešavanja..."
# Progress step 8/9
#. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:383
msgid "Reading firewall settings..."
msgstr "Čitanje podešavanja zaštitnog zida..."
# Progress step 6/9
#. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:391
#, fuzzy
msgid "Reading hostname and DNS configuration..."
msgstr "Čitanje imena servera i DNS podešavanja..."
# Progress step 7/9
#. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:398
msgid "Reading installation information..."
msgstr "Čitanje informacija o instalaciji"
# Progress step 5/9
#. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:404
msgid "Reading routing configuration..."
msgstr "Čitanje podešavanja rutiranja..."
# Progress step 9/9
#. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:410
msgid "Detecting current status..."
msgstr "Prepoznajem trenutni status..."
# Final progress step
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
msgid "Finished"
msgstr "&Završeno"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:441
msgid "To apply this change, a reboot is needed."
msgstr ""
# Write dialog caption
#. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:509
#, fuzzy
msgid "Saving Network Configuration"
msgstr "Snimanje podešavanja mreže"
# Progress stage 2/10
#. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:516
msgid "Write drivers information"
msgstr "Snimanje informacija o upravljačkim programima"
# Progress stage 3/10 - multiple devices may be present,really plural
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:518
msgid "Write device configuration"
msgstr "Snimanje podešavanja uređaja"
# Progress stage 4/10
#. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:520
msgid "Write network configuration"
msgstr "Snimanje podešavanja mreže"
# Progress stage 5/10
#. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:522
msgid "Write routing configuration"
msgstr "Snimanje podešavanja rutiranja"
# Progress stage 6/10
#. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:524
#, fuzzy
msgid "Write hostname and DNS configuration"
msgstr "Snimanje imena servera i DNS podešavanja"
# Progress stage 5/7
#. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:526
msgid "Set up network services"
msgstr "&Podešavanje mrežnih servisa"
# Progress stage 3/7
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr "Snimanje podešavanja zaštitnog zida"
# Progress stage 9/10
#. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:534
msgid "Activate network services"
msgstr "Aktiviranje mrežnih servisa"
# Progress step 2/10
#. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:550
msgid "Writing /etc/modprobe.conf..."
msgstr "Snimanje fajla /etc/modprobe.conf..."
# Progress step 3/10 - multiple devices may be present, really plural
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:555
msgid "Writing device configuration..."
msgstr "Snimanje podešavanja uređaja..."
# Progress step 4/10
# Progress step 4/10
#. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:561
msgid "Writing network configuration..."
msgstr "Snimanje podešavanja mreže"
# Progress step 5/10
#. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:567
msgid "Writing routing configuration..."
msgstr "Snimanje podešavanja rutiranja..."
# Progress step 6/10
#. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:575
#, fuzzy
msgid "Writing hostname and DNS configuration..."
msgstr "Snimanje imena servera i DNS podešavanja..."
# Progress step 5/7
#. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:588
msgid "Setting up network services..."
msgstr "Podešavanje mrežnih servisa..."
# Progress step 3/7
#. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr "Snimanje podešavanja zaštitnog zida..."
# Progress step 9/10
#. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:606
msgid "Activating network services..."
msgstr "Aktiviranje mrežnih servisa..."
# steps for the ISDN writing current setup progress screen with start
# step 1/13
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:642
#, fuzzy
#| msgid "Stop ISDN networking"
msgid "No network running"
msgstr "Zaustavljanje ISDN umrežavanja"
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: src/modules/Lan.rb:698
-msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
-msgstr ""
-
# Label text
#. Create a textual summary for the general network settings
#. proposal (NetworkManager + ipv6)
#. @return [rich text, links]
-#: src/modules/Lan.rb:782
+#: src/modules/Lan.rb:759
#, fuzzy
msgid "Network Mode"
msgstr "&Mrežni uređaj"
# tree node
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:764
#, fuzzy
msgid "Interfaces controlled by NetworkManager"
msgstr "USB kontroler"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:766
#, fuzzy
msgid "Disable NetworkManager"
msgstr "Umrežavanje"
#. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:770
msgid "Traditional network setup with NetControl - ifup"
msgstr ""
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:773
#, fuzzy
msgid "Enable NetworkManager"
msgstr "Umrežavanje"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:779
msgid "Support for IPv6 protocol is enabled"
msgstr ""
# translators: service status radio button label
#. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:781
#, fuzzy
msgid "Disable IPv6"
msgstr "&Isključen"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:785
msgid "Support for IPv6 protocol is disabled"
msgstr ""
# this string is usually used as headline of a popup
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:198
#, fuzzy
msgid "connected"
msgstr "Još nije podešeno."
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:199
msgid "datagram"
msgstr ""
@@ -5009,31 +4962,31 @@
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
#, fuzzy
msgid "Started automatically at boot"
msgstr "P&okreni pravljenje rezervne kopije automatski"
# check box label
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1280
#, fuzzy
msgid "Started automatically on cable connection"
msgstr "P&okreni pravljenje rezervne kopije automatski"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1284
msgid "Managed by NetworkManager"
msgstr ""
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1288
msgid "Will not be started at all"
msgstr ""
# Progress stage 3/3
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1294
#, fuzzy
msgid "Started manually"
msgstr "Startuj zaštitni zid"
@@ -5043,13 +4996,13 @@
# IP details dialog caption
# Frame label
#. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1306
#, fuzzy
msgid "IP address assigned using"
msgstr "Podešavanje IP adrese"
# text entry label
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1310
#, fuzzy
msgid "IP address: %s/%s"
msgstr "MAC Adresa"
@@ -5058,7 +5011,7 @@
# DIALOG TEXTS and DIALOG CONTENTS
# IP details dialog caption
# Frame label
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1313
#, fuzzy
msgid "IP address: %s, subnet mask %s"
msgstr "Podešavanje IP adrese"
@@ -5066,57 +5019,57 @@
# this string is usually used as headline of a popup
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1337
#, fuzzy
msgid "Not configured"
msgstr "Još nije podešeno."
# label. %1 is name of file (eg. /etc/lilo.conf
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
#, fuzzy
msgid "Device Name: %s"
msgstr "Ime datoteke: %1"
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1380
msgid "Bonding slaves"
msgstr ""
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1394
msgid "enslaved in %s"
msgstr ""
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1395
msgid "Bonding master"
msgstr ""
# this string is usually used as headline of a popup
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1409
#, fuzzy
msgid "Not connected"
msgstr "Još nije podešeno."
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1410
msgid "No hwinfo"
msgstr ""
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1427
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 ""
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1433
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
msgstr ""
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "Needed firmware"
msgstr ""
# Table field (Unknown device)
# Table field (Unknown device)
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
#, fuzzy
#| msgid "Unknown"
msgid "unknown"
@@ -5124,7 +5077,7 @@
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:158
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
@@ -5132,7 +5085,7 @@
# Popup text
#. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:203
#, fuzzy
#| msgid "Configure mail now?"
msgid "Configure display manager"
@@ -5140,37 +5093,40 @@
# Progress stage 9/10
#. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:208
#, fuzzy
#| msgid "Activate network services"
msgid "Restart the services"
msgstr "Aktiviranje mrežnih servisa"
# Write dialog caption
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:211
#, fuzzy
msgid "Saving Remote Administration Configuration"
msgstr "Snimanje podešavanja o modemu"
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:220
msgid "Configuring display manager..."
msgstr ""
# Progress step 5/7
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:224
#, fuzzy
#| msgid "Setting up network services..."
msgid "Restarting the service..."
msgstr "Podešavanje mrežnih servisa..."
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#. Install required packages
+#: src/modules/Remote.rb:261
msgid "Enabling service %{service} has failed"
msgstr ""
+#: src/modules/Remote.rb:267
+msgid "Disabling service %{service} has failed"
+msgstr ""
+
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:295
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -5179,18 +5135,18 @@
# label in proposal text
#. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is enabled."
msgstr "Udaljena administracija je uključena."
# label in proposal text
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is disabled."
msgstr "Udaljena administracija je isključena."
# Progress stage 3/7
#. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
#, fuzzy
#| msgid "Write firewall settings"
msgid "Write IP forwarding settings"
@@ -5198,21 +5154,21 @@
# Progress stage 3/7
#. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
#, fuzzy
#| msgid "Write firewall settings"
msgid "Write routing settings"
msgstr "Snimanje podešavanja zaštitnog zida"
# Routing dialog caption
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
#, fuzzy
msgid "Saving Routing Configuration"
msgstr "Podešavanje rutiranja"
# Progress step 3/7
#. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
#, fuzzy
#| msgid "Writing firewall settings..."
msgid "Writing IP forwarding settings..."
@@ -5224,7 +5180,7 @@
#. 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:281
+#: src/modules/Routing.rb:284
#, fuzzy
#| msgid "Writing firewall settings..."
msgid "Writing routing settings..."
@@ -5232,14 +5188,14 @@
# Table header 2/4
#. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
#, fuzzy
msgid "Gateway: %s"
msgstr "Gejtvej"
# Summary text
#. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
#, fuzzy
#| msgid "IP Forwarding: on"
msgid "IP Forwarding for IPv4: %s"
@@ -5247,7 +5203,7 @@
# Summary text
#. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
#, fuzzy
#| msgid "IP Forwarding: on"
msgid "IP Forwarding for IPv6: %s"
@@ -5274,6 +5230,55 @@
msgid "(Unprotected)"
msgstr "Zaštićen"
+# Popup headline
+#, fuzzy
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "DSL podešavanja uspešno snimljena"
+
+# Popup headline
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "DNS podešavanja uspešno snimljena"
+
+# Popup headline
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "DSL podešavanja uspešno snimljena"
+
+# Popup headline
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "Podešavanje host računara je uspešno snimljeno"
+
+# Popup headline
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "ISDN podešavanja uspešno snimljena"
+
+# Popup headline
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "Podešavanja mrežne kartice uspešno snimljena"
+
+# Popup headline
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "Podešavanja modema uspešno snimljena"
+
+# Popup headline
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "Podešavanje Proxy servera uspešno snimljena"
+
+# Popup headline
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "Podešavanje provajdera uspešno snimljena"
+
+# Popup headline
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "Podešavanje rutiranja uspešno snimljena"
+
+# Popup text
+#~ msgid "Configure mail now?"
+#~ msgstr "Podesiti mail sada?"
+
+# Popup text
+#~ msgid "Run configuration of %1?"
+#~ msgstr "Pokrenuti podešavanje %1"
+
# Details dialog caption
#, fuzzy
#~ msgid "General &Network Settings"
Modified: trunk/yast/sr@Latn/po/nfs.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/nfs.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/nfs.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: nfs.sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-26 19:50+0200\n"
"Last-Translator: Mladen Kostrešević <zevs(a)sendmail.ru>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -148,7 +148,7 @@
# error popup message
#. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
#, fuzzy
msgid ""
"fstab already contains an entry\n"
@@ -159,7 +159,7 @@
# error popup message (spaces are now allowed)
#. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
#, fuzzy
msgid ""
"The path entered is invalid.\n"
@@ -408,13 +408,13 @@
# error popup message
#. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
msgid "Unable to create directory '%1'."
msgstr "Ne mogu da kreiram direktorijum: %1"
# error popup message
#. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
#, fuzzy
msgid ""
"Unable to write to /etc/fstab.\n"
@@ -426,63 +426,63 @@
# dialog label
#. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
#, fuzzy
msgid "Writing NFS Configuration"
msgstr "Snimanje NFS konfiguracije..."
# progress stage label
#. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
msgid "Stop services"
msgstr "Zaustavi servise"
# progress stage label
#. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
msgid "Start services"
msgstr "Startuj servise"
# progress step label
#. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
msgid "Stopping services..."
msgstr "Zaustavljam servise..."
# progress step label
#. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
msgid "Starting services..."
msgstr "Pokrećem servise..."
# final progress step label
#. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
msgid "Finished"
msgstr "Završi"
# help text
#. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
#, fuzzy
msgid "Writing NFS client settings. Please wait..."
msgstr "Zapisujem podešavanja NFS klijenta"
# error popup message
#. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr "Ne mogu da mountujem stavke iz /etc/fstab"
# summary header
#. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
#, fuzzy
msgid "NFS Entries"
msgstr "NFS stavke"
#. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
#, fuzzy
msgid "%1 entries configured"
msgstr "NIS server %1 je konfigurisan."
Modified: trunk/yast/sr@Latn/po/nis.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/nis.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/nis.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: nis.sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-26 20:41+0200\n"
"Last-Translator: Mladen Kostrešević <zevs(a)sendmail.ru>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -274,9 +274,10 @@
msgstr "&Adrese NIS servera"
#. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "Br&oadcast"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "&Broadcast"
# pushbutton label, find nis servers
# Shortcut must not conflict with Finish and Next (#29960)
@@ -405,11 +406,6 @@
msgstr "&Serveri (razmak pomoću blanko znakova ili zareza)"
#. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "&Broadcast"
-
-#. checkbox label
#: src/include/nis/ui.rb:859
msgid "&SLP"
msgstr "&SLP"
@@ -631,6 +627,9 @@
msgid "NIS server not found."
msgstr "NIS server nije pronađen"
+#~ msgid "Br&oadcast"
+#~ msgstr "Br&oadcast"
+
#~ msgid "Error while running portmapper."
#~ msgstr "Greška prilikom pokretanja portmaper-a"
Modified: trunk/yast/sr@Latn/po/ntp-client.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/ntp-client.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/ntp-client.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ntp-client.sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-04-27 23:05+0200\n"
"Last-Translator: Mladen Kostrešević <zevs(a)sendmail.ru>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -27,7 +27,7 @@
msgstr "&NTP Podešavanja..."
#. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
msgstr ""
@@ -36,29 +36,29 @@
msgstr ""
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
msgstr ""
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
msgstr ""
#. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
msgid "Invalid NTP server hostname %1"
msgstr ""
#. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
#, fuzzy
#| msgid "&NTP Server"
msgid "&NTP Server Address"
msgstr "&NTP Server"
#. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
#, fuzzy
#| msgid "Restart NTP daemon"
msgid "&Run NTP as daemon"
@@ -66,25 +66,25 @@
# button label (run YaST client for NTP)
#. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
#, fuzzy
msgid "&Save NTP Configuration"
msgstr "&NTP Podešavanja..."
#. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
#, fuzzy
msgid "S&ynchronize now"
msgstr "Tip Peer-a za sinhronizaciju"
#. push button label
#. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
msgid "&Configure..."
msgstr ""
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
@@ -92,19 +92,19 @@
# progress step
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
#, fuzzy
msgid "Synchronizing with NTP server..."
msgstr "Prilagođavanje DNS servisa..."
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
msgid "Connection to selected NTP server failed."
msgstr ""
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
msgid ""
"Test query to server '%1' failed.\n"
"If server is not yet accessible or network is not configured\n"
@@ -310,170 +310,169 @@
# translators: command line help text for Ldap client module
#. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
#, fuzzy
msgid "NTP client configuration module."
msgstr "LDAP klijent konfiguracioni modul."
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
#, fuzzy
msgid "Print the status of the NTP daemon"
msgstr "Ne mogu da restartujem NTP servis."
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
msgid "Print all configured synchronization relationships"
msgstr ""
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
#, fuzzy
msgid "Enable the NTP daemon"
msgstr "Ne mogu da restartujem NTP servis."
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
#, fuzzy
msgid "Disable the NTP daemon"
msgstr "Restartuj NTP servis"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
msgid "Add new synchronization relationship"
msgstr ""
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
msgid "Edit existing synchronization relationship"
msgstr ""
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
#, fuzzy
msgid "Delete a synchronization relationship"
msgstr "Izaberite tip sinhronizacijskog peer-a"
# error popup label
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
#, fuzzy
msgid "The address of the server"
msgstr "Unesite &IP adresu ili ime KDC servera."
# error popup label
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
#, fuzzy
msgid "The address of the peer"
msgstr "Unesite &IP adresu ili ime KDC servera."
# Popup text
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
#, fuzzy
msgid "The address to which to broadcast"
msgstr "IP adresa je netačna"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
msgid "The address from which to accept broadcasts"
msgstr ""
# command line help text for an option
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
#, fuzzy
msgid "The options of the relationship"
msgstr "&Ime sekcije"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
#, fuzzy
msgid "Options for clock driver calibration"
msgstr "Kalibracija Clock drajvera"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
#, fuzzy
msgid "Use the server for initial synchronization"
msgstr "Koristi za &Inicijalnu Sinhronizaciju"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
#, fuzzy
msgid "Do not use the server for initial synchronization"
msgstr "Koristi za &Inicijalnu Sinhronizaciju"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
#, fuzzy
msgid "The synchronization peer not specified."
msgstr "Tip Peer-a za sinhronizaciju"
# command line error report
#. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
#, fuzzy
msgid "Specified synchronization peer not found."
msgstr "Definisana opcija ne postoji."
# Summary text
#. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
#, fuzzy
msgid "NTP daemon is enabled."
msgstr "Proksi je uključen."
# Summary text
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
#, fuzzy
msgid "NTP daemon is disabled."
msgstr "Proksi je isključen."
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
msgid "Server"
msgstr "Server"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
msgid "Peer"
msgstr "Peer"
# summary header
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
msgid "Broadcast"
msgstr "Emitovanje"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
msgid "Accepting Broadcasts"
msgstr "Prihvatam Emitovanja"
#. table cell, %1 is integer 0-3
#. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
msgid "Unit Number: %1"
msgstr "Broj uređaja: %1"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
msgid "Local Radio Clock"
msgstr "Lokalni Radio Clock"
# progress step
#. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
#, fuzzy
msgid "Reading the settings failed."
msgstr "Čitam podešavanja..."
@@ -481,32 +480,27 @@
# dialog caption
# dialog caption
#. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
#, fuzzy
msgid "NTP Server Configuration"
msgstr "Podešavanje HTTP servera"
# button label (run YaST client for NTP)
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
#, fuzzy
msgid "NTP Configuration"
msgstr "&NTP Podešavanja..."
# check box
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
#, fuzzy
-msgid "Firewall Settings"
-msgstr "Prilagoditi podešavanja &zaštitnog zida"
-
-# check box
-#: src/include/ntp-client/dialogs.rb:189
-#, fuzzy
msgid "General Settings"
msgstr "Prilagoditi podešavanja &zaštitnog zida"
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
#, fuzzy
#| msgid "Write NTP settings"
msgid "Security Settings"
@@ -514,13 +508,13 @@
# dialog label
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
#, fuzzy
msgid "Advanced NTP Configuration"
msgstr "Napredna podešavanja"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
#, fuzzy
msgid "New Synchronization"
msgstr "Tip Peer-a za sinhronizaciju"
@@ -528,102 +522,102 @@
# check box
#. Server editing dialog
#. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
#, fuzzy
msgid "Server Settings"
msgstr "Prilagoditi podešavanja &zaštitnog zida"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
#, fuzzy
msgid "NTP Server"
msgstr "&NTP Server"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331 src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
#, fuzzy
msgid "Local NTP Server"
msgstr "&NTP Server"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377 src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
#, fuzzy
msgid "Public NTP Server"
msgstr "&NTP Server"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
#, fuzzy
msgid "NTP Peer"
msgstr "&NTP Server"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
#, fuzzy
msgid "Local Reference Clock"
msgstr "Konfigurisanje clock-a za lokalno upoređivanje"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
#, fuzzy
msgid "Outgoing Broadcast"
msgstr "Prihvatam Emitovanja"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
#, fuzzy
msgid "Incoming Broadcast"
msgstr "Prihvatam Emitovanja"
#. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
msgid "&Reference ID"
msgstr "ID za upo&ređivanje"
#. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
msgid "&Stratum"
msgstr "&Stratum"
#. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
msgid "Calibration Offset 1"
msgstr "Offset za kalibraciju 1"
#. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
msgid "Calibration Offset 2"
msgstr "Offset za kalibraciju 2"
#. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
msgid "Flag &1"
msgstr "Flag &1"
#. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
msgid "Flag &2"
msgstr "Flag &2"
#. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
msgid "Flag &3"
msgstr "Flag &3"
#. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
msgid "Flag &4"
msgstr "Flag &4"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
msgid "Clock Driver Calibration"
msgstr "Kalibracija Clock drajvera"
#. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
msgid ""
"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -632,7 +626,7 @@
"Sačekajte...<br></p>"
#. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
msgid ""
"<p><b><big>Aborting Initialization:</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -641,7 +635,7 @@
"Bezbedno prekinite configuraciju pritiskom na <b>Prekini</b>.</p>"
#. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
msgid ""
"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -650,7 +644,7 @@
"Sačekajte...<br></p>"
#. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -660,17 +654,15 @@
"Prekinite ovu proceduru klikom na <b>Prekini</b>.\n"
" Dodatni dijalog će vas obavestiti da li je ovo bezbedno.</p>"
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
#, fuzzy
msgid ""
"<p><b><big>Start NTP Daemon</big></b><br>\n"
"Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
msgstr ""
"<p><b><big>Automatski Startuj NTP Servis</big></b><br>\n"
"Izaberite da li da se NTP servis startuje pri učitavanju sistema\n"
@@ -699,7 +691,7 @@
msgstr ""
#. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
msgid ""
"<p><b><big>Configuring via DHCP</big></b><br>\n"
"To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -709,7 +701,7 @@
msgstr ""
#. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
msgid ""
"<p><b><big>Configured Servers</big></b><br>\n"
"To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -724,7 +716,7 @@
"je i kliknite <b>Izbriši</b>.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
#, fuzzy
#| msgid ""
#| "<p><b><big>Driver Calibration</big></b><br>\n"
@@ -737,7 +729,7 @@
"Da bi ste kalibrisali clock drajver kliknite <b>Kalibracija Drajvera</b>.</p>"
#. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
#, fuzzy
msgid ""
"<p><b><big>Advanced configuration</big></b><br>\n"
@@ -749,7 +741,7 @@
"host-ova ili sa lokalno povezanim clock-om, koristite <b>Kompleksnu Konfiguraciju</b>."
#. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
msgid ""
"<p><b><big>Clock Type</big></b><br>\n"
"Select the driver for the clock to configure.</p>"
@@ -758,7 +750,7 @@
"Izaberite drajver za clock koji želite da konfigurišete.<p>"
#. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
msgid ""
"<p><b><big>Unit Number</big></b><br>\n"
"If you have multiple clocks of the same type, you must set\n"
@@ -769,7 +761,7 @@
"<b>Broj unit-a</b>.</p>"
#. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
#, fuzzy
msgid ""
"<p><b><big>Device</big></b><br>\n"
@@ -788,7 +780,7 @@
"mora napraviti ručno.</p>"
#. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
msgid ""
"<p><b><big>Driver Calibration</big></b><br>\n"
"To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -797,7 +789,7 @@
"Da bi ste kalibrisali clock drajver kliknite <b>Kalibracija Drajvera</b>.</p>"
#. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
#, fuzzy
msgid ""
"<p><b><big>Address of the NTP Server</big></b><br>\n"
@@ -811,7 +803,7 @@
"pogledajte na <i>http://www.eecis.udel.edu/~mills/ntp/servers.html</i>.</p>"
#. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
#, fuzzy
msgid ""
"<p><b><big>Selecting a Server</big></b><br>\n"
@@ -823,7 +815,7 @@
"Da bi ste pronašli NTP servere na lokalnoj mreži pomoću SLP-a (Service Location Protocol) kliknite <b>Pronađi</b>.</p>"
#. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
#, fuzzy
msgid ""
"<p><b><big>Testing Server Accessibility</big></b><br>\n"
@@ -834,7 +826,7 @@
"Izaberite servis koji želite da obrišete i pritisnite <b>Obriši</b>.</p>\n"
#. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address of the host with which to synchronize mutually,\n"
@@ -845,7 +837,7 @@
"koristite <b>Adresa</b>.</p>"
#. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -856,7 +848,7 @@
"polje <b>Adresa</b>.</p>"
#. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address from which to accept broadcast packets, use \n"
@@ -868,7 +860,7 @@
#. help text 2/4, was removed
#. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
#, fuzzy
#| msgid ""
#| "<p><b><big>Options</big></b><br>\n"
@@ -886,7 +878,7 @@
"<b>Opcije</b>. Za detalje vidite\n"
"<i>/usr/share/doc/packages/xntp-doc/html/confopt.htm</i>.</p>"
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
msgid ""
"<p><b><big>Access Control Options</big></b><br>\n"
"Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -898,7 +890,7 @@
msgstr ""
#. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
msgid ""
"<p><b><big>Synchronization Peer Type</big></b><br>\n"
"Select the kind of synchronization peer to add here.</p>"
@@ -907,7 +899,7 @@
"Ovde izaberite vrstu peer-a za sinhronizaciju koju želite da dodate.</p>"
#. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
msgid ""
"<p>To add an NTP server to which to synchronize,\n"
"select <b>Server</b>.</p>"
@@ -916,7 +908,7 @@
"izaberite <b>Server</b>.</p>"
#. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
msgid ""
"<p>To add an NTP peer to synchronize mutually, select\n"
"<b>Peer</b>.</p>"
@@ -925,7 +917,7 @@
"izaberite <b>Peer</b>.</p>"
#. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
msgid ""
"<p>To configure a local clock connected directly to your computer,\n"
"select <b>Radio Clock</b>.</p>"
@@ -934,7 +926,7 @@
"izaberite <b>Radio Clock</b>.</p>"
#. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
#, fuzzy
msgid ""
"<p>To broadcast time information through your network, select\n"
@@ -944,7 +936,7 @@
"<b>Emitovanje</b>.</p>"
#. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
#, fuzzy
msgid ""
"<p>To accept NTP packets broadcasted by other hosts on the network\n"
@@ -954,7 +946,7 @@
"i da bi ste ih koristili za podešavanje lokalnog vremena, izaberite <b>Prihvatanje Emitovanih Paketa</b>.</p>"
#. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
#, fuzzy
msgid ""
"<p><big><b>Server Location</b></big>\n"
@@ -965,7 +957,7 @@
"Da bi ste pronašli NTP servere na lokalnoj mreži pomoću SLP-a (Service Location Protocol) kliknite <b>Pronađi</b>.</p>"
#. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
#, fuzzy
msgid ""
"<p><big><b>Finding Server in the Local\n"
@@ -978,7 +970,7 @@
"Da bi ste pronašli NTP servere na lokalnoj mreži pomoću SLP-a (Service Location Protocol) kliknite <b>Pronađi</b>.</p>"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
msgid ""
"<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
"Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -986,7 +978,7 @@
msgstr ""
#. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
msgid ""
"<p><big><b>Note</b></big><br>\n"
"The listed NTP servers may not be available from any country, but only\n"
@@ -999,7 +991,7 @@
msgstr ""
#. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
#, fuzzy
msgid ""
"<p><big><b>Testing Server Accessibility</b></big><br>\n"
@@ -1010,7 +1002,7 @@
#. help text connected with checkbox: "Use Random Server from pool.ntp.org"
#. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
msgid ""
"<p><big><b>Use Random Servers</b></big><br>\n"
"This service is offered by pool.ntp.org. If you select this option,\n"
@@ -1020,7 +1012,7 @@
msgstr ""
#. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
msgid ""
"<p><big><b>Clock Driver Calibration</b></big><br>\n"
"The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -1033,7 +1025,7 @@
"odgovarajućeg drajvera. Neki drajveri ne koriste sve opcije.</p>"
#. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
#, fuzzy
#| msgid ""
#| "For information about the meaning of the options, install package\n"
@@ -1057,20 +1049,20 @@
"Sve promene će biti izgubljene."
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
#, fuzzy
msgid "Restart NTP Daemon"
msgstr "Restartuj NTP servis"
# menubutton entry, try to keep short
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
#, fuzzy
msgid "Save Settings and Restart NTP Daemon"
msgstr "Snimi podešavanja i ponovo učitaj HTTP server"
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
msgid ""
"Warning!\n"
"\n"
@@ -1085,14 +1077,14 @@
"možda neće raditi kako treba."
#. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
msgid ""
"NTP server '%1' is not a valid hostname,\n"
"fully qualified hostname, IPv4 address, or IPv6 address."
msgstr ""
#. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
msgid ""
"Enabling Random Servers from pool.ntp.org would\n"
"replace the current NTP server.\n"
@@ -1101,29 +1093,29 @@
msgstr ""
#. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
msgid "Select the Device"
msgstr "Izaberite Uređaj"
#. selection box header
#. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
#, fuzzy
msgid "Public NTP &Servers"
msgstr "&NTP Server"
#. message report (no server selected)
#. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
#, fuzzy
msgid "Select an NTP server."
msgstr "Selektuj štampač."
# title label
#. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
#, fuzzy
msgid "All Countries"
msgstr "&Sve stavke"
@@ -1131,21 +1123,21 @@
# ComboBoxlabel for country list
#. combo box header
#. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
msgid "&Country"
msgstr "&Zemlja"
# Label text
#. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
#, fuzzy
msgid "Scanning for NTP servers on your network..."
msgstr "Tražim računare na lokalnoj mreži..."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
#. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
msgid ""
"No NTP server has been found on your network.\n"
"This could be caused by a running SuSEfirewall2,\n"
@@ -1153,122 +1145,122 @@
msgstr ""
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
msgid "No NTP server has been found on your network."
msgstr ""
#. combo box label
#. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
msgid "Address"
msgstr "Adresa"
# popup message
#. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
#, fuzzy
msgid "No server is selected."
msgstr "Nije selektovan server."
#. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
msgid "A&ddress"
msgstr "A&ddresa"
# dialog label
#. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
#, fuzzy
msgid "Ad&vanced Configuration"
msgstr "Napredna podešavanja"
#. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
msgid "&Driver Calibration"
msgstr "Kalibracija &Drajvera"
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
#, fuzzy
#| msgid "Select the Synchronization Peer Type"
msgid "&Interval of the Synchronization in Minutes"
msgstr "Izaberite tip sinhronizacijskog peer-a"
#. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
#, fuzzy
msgid "Start NTP Daemon"
msgstr "Restartuj NTP servis"
#. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
msgid "Only &Manually"
msgstr ""
#. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
msgid "&Synchronize without Daemon"
msgstr ""
#. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
msgid "Now and on &Boot"
msgstr ""
#. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
msgid "Run NTP Daemon in Chroot &Jail"
msgstr "Pokreni NTP Servis u Chroot &Jail-u"
#. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
msgid "&Restrict NTP Service to Configured Servers Only "
msgstr ""
#. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
msgid "Manual"
msgstr ""
#. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
msgid "Auto"
msgstr ""
#. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
msgid "Custom"
msgstr ""
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
#, fuzzy
#| msgid "Co&mplex Configuration"
msgid "&Runtime Configuration Policy"
msgstr "Ko&mpleksna Konfiguracija"
#. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
msgid "&Custom Policy"
msgstr ""
#. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
msgid "&Use Random Servers from pool.ntp.org"
msgstr ""
#. text entry label
#. text entry
#. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
#, fuzzy
msgid "&Address"
msgstr "Adresa"
# Pushbutton label
#. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
msgid "&Select..."
msgstr "&Izaberi"
@@ -1276,91 +1268,91 @@
#. push button
#. push button
#. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
msgid "&Test"
msgstr "&Testiraj"
#. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
#, fuzzy
msgid "Synchronization Type"
msgstr "Tip Peer-a za sinhronizaciju"
# item of a menu button
#. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
#, fuzzy
msgid "Display &Log..."
msgstr "Prikaži iz&veštaj"
#. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
msgid "Clock &Type"
msgstr "&Tip Clock-a"
#. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
msgid "Unit &Number"
msgstr "Broj &uređaja"
#. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
msgid "Create &Symlink"
msgstr "Napravi &Symlink"
#. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
msgid "&Device"
msgstr "&Uređaj"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
msgid "Access Control Options"
msgstr ""
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
msgid "&Server"
msgstr "&Server"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
msgid "&Peer"
msgstr "&Peer"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
msgid "&Radio Clock"
msgstr "&Radio Clock"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
#, fuzzy
msgid "&Outgoing Broadcast"
msgstr "Prihvatam Emitovanja"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
#, fuzzy
msgid "&Incoming Broadcast"
msgstr "Prihvatam Emitovanja"
#. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
msgid "Type"
msgstr "Tip"
# this is a menu entry
#. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
#, fuzzy
msgid "Loc&al Network"
msgstr "&Mreža"
#. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
#, fuzzy
msgid "&Public NTP Server"
msgstr "&NTP Server"
@@ -1368,13 +1360,13 @@
# dialog caption
# dialog caption
#. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
#, fuzzy
msgid "NTP Server Location"
msgstr "Podešavanje HTTP servera"
#. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
msgid "&Lookup"
msgstr "&Pronađi"
@@ -1388,119 +1380,58 @@
msgid "Initializing ..."
msgstr "Inicijalizujem..."
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "Inicijalizujem Konfiguraciju NTP Klijenta"
-
-# translators: progress stage
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "Pročitaj mrežna podešavanja"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "Pročitaj NTP podešavanja"
-
-# Progress step 4/9
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "Čitanje mrežnog podešavanja..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "Čitam NTP podešavanja..."
-
-#. progress step
#. While calling "yast clone_system" it is possible that
#. the ntp server has not already been installed at that time.
#. (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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
#. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
msgid "Finished"
msgstr "Gotovo"
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "Snimam Konfiguraciju NTP Klijenta"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "Snimi podešavanja za NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "Restartuj NTP servis"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "Zapisujem podešavanja..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "Restartujem NTP servis..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-msgid "Cannot update the dynamic configuration policy."
-msgstr ""
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "Ne mogu da restartujem NTP servis."
-
#. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
msgid "The NTP daemon starts when starting the system."
msgstr "NTP servis se startuje pri učitavanju sistema."
#. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
msgid "The NTP daemon does not start automatically."
msgstr "NTP servis se ne startuje automatski."
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
msgid "Servers: %1"
msgstr "Serveri: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
msgid "Radio Clocks: %1"
msgstr "Radio Clock-ovi: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
msgid "Peers: %1"
msgstr "Peer-ovi: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
#, fuzzy
msgid "Broadcast time information to: %1"
msgstr "Emituj vreme na"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
#, fuzzy
msgid "Accept broadcasted time information from: %1"
msgstr "Prihvati emitovano vreme od"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
#, fuzzy
#| msgid "Complex NTP Client Configuration"
msgid "Combine static and DHCP configuration."
@@ -1508,43 +1439,117 @@
# translators: command line help text for Ldap client module
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
#, fuzzy
msgid "Static configuration only."
msgstr "LDAP klijent konfiguracioni modul."
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
#, fuzzy
#| msgid "Co&mplex Configuration"
msgid "Custom configuration policy."
msgstr "Ko&mpleksna Konfiguracija"
# progress step
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
#, fuzzy
msgid "Testing the NTP server..."
msgstr "Prilagođavanje DNS servisa..."
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
msgid "Server is reachable and responds properly."
msgstr ""
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
msgid "Server is unreachable or does not respond properly."
msgstr ""
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
msgstr ""
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "Inicijalizujem Konfiguraciju NTP Klijenta"
+
+# translators: progress stage
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "Pročitaj mrežna podešavanja"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "Pročitaj NTP podešavanja"
+
+# Progress step 4/9
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "Čitanje mrežnog podešavanja..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "Čitam NTP podešavanja..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "Snimam Konfiguraciju NTP Klijenta"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "Snimi podešavanja za NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "Restartuj NTP servis"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "Zapisujem podešavanja..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "Restartujem NTP servis..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+msgid "Cannot update the dynamic configuration policy."
+msgstr ""
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "Ne mogu da restartujem NTP servis."
+
+# check box
+#, fuzzy
+#~ msgid "Firewall Settings"
+#~ msgstr "Prilagoditi podešavanja &zaštitnog zida"
+
#~ msgid "Cannot write sysconfig variables."
#~ msgstr "Ne mogu da zapišem sysconfig promenjive."
Modified: trunk/yast/sr@Latn/po/packager.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/packager.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/packager.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: packager.sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-03-27 18:30+0100\n"
"Last-Translator: Mladen Kostrešević <zevs(a)sendmail.ru>\n"
"Language-Team: \n"
@@ -405,7 +405,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:95
#, fuzzy
#| msgid "<p>Please wait while the system is being configured.</p>"
msgid "<p>The repository manager is downloading repository details...</p>"
@@ -523,7 +523,7 @@
#. dialog caption
#. dialog caption
#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/modules/AddOnProduct.rb:688
msgid "Initializing..."
msgstr ""
"YaST2\n"
@@ -554,13 +554,6 @@
msgid "&Media"
msgstr "Makedonija"
-# profile-manager Write dialog caption:
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-#, fuzzy
-msgid "Saving the software manager configuration..."
-msgstr "Zapisivanje podešavanja menadžera profila"
-
#. default (minimal) priority of a repository
#: src/clients/repositories.rb:58
msgid "&Priority"
@@ -600,7 +593,7 @@
#. 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/modules/AddOnProduct.rb:1351
#, fuzzy
msgid "URL: %1"
msgstr "ID %1, "
@@ -892,7 +885,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:1040 src/modules/Packages.rb:1328
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Detalji:"
@@ -900,7 +893,7 @@
#. 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:1042 src/modules/Packages.rb:1336
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
#, fuzzy
msgid "Try again?"
@@ -1452,43 +1445,43 @@
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:81
msgid "Adding a New Repository"
msgstr ""
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
msgid "Check Repository Type"
msgstr ""
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:86
msgid "Add Repository"
msgstr ""
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:87
msgid "Read Repository License"
msgstr ""
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
#, fuzzy
msgid "Checking Repository Type"
msgstr "Provjeravam particiju "
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:91
msgid "Adding Repository"
msgstr ""
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:92
msgid "Reading Repository License"
msgstr ""
#. 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:156
msgid "Repository"
msgstr ""
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:228
#: src/modules/SourceManager.rb:330
msgid ""
"There is no product information available at the given location.\n"
@@ -1500,8 +1493,8 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
#, fuzzy
msgid ""
"Unable to create repository\n"
@@ -1511,24 +1504,31 @@
"sa URL '%1'."
#. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:335
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:345
msgid "Change the URL and try again?"
msgstr ""
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:422
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
msgstr ""
+# profile-manager Write dialog caption:
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+#, fuzzy
+msgid "Saving the software manager configuration..."
+msgstr "Zapisivanje podešavanja menadžera profila"
+
#. New add-on product might add also new agents.
#. Functions Rereads all available agents.
#.
@@ -1536,14 +1536,14 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
#, fuzzy
msgid "An error occurred while preparing the installation system."
msgstr "Greška se dogodila prilikom snimanja datoteke."
#. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:659
#, fuzzy
#| msgid "Package %1 was not found on the medium."
msgid "Control file %1 not found on media."
@@ -1551,75 +1551,84 @@
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:900
msgid ""
"Package '%s' is not installed.\n"
"The add-on product cannot be registered."
msgstr ""
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown Product"
+msgstr "Nepoznato"
+
+# this string is usually used as headline of a popup
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+#| msgid "Please wait..."
+msgid "Re&lease Notes..."
+msgstr "Molimo pričekajte..."
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
msgid "Unable to use additional products."
msgstr ""
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
msgid "%1, URL: %2"
msgstr ""
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1345
msgid "URL: %1, Path: %2"
msgstr ""
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1376
#, fuzzy
msgid "Additional Products"
msgstr "Nije raspoloživo za instalaciju"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1382
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:1393
msgid "Additional Products to Select"
msgstr ""
#. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1400
msgid "Add Selected &Products"
msgstr ""
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1532
#, fuzzy
msgid "Insert the addon %1 medium"
msgstr "Ne mogu da čitam paket sa izvornog medijuma. Greška na medijumu?"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1537
#, fuzzy
msgid "Insert the %1 %2 medium"
msgstr "Ne mogu da čitam paket sa izvornog medijuma. Greška na medijumu?"
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1589
msgid "Unable to add product %1."
msgstr ""
-#. 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/Packages.rb:471
-#, fuzzy
-#| msgid "Unknown"
-msgid "Unknown Product"
-msgstr "Nepoznato"
-
#. update the trusted flag
#: src/modules/KeyManager.rb:214
msgid ""
@@ -1644,31 +1653,31 @@
msgstr "Dogodila se greška prilikom čitanja izveštaja."
#. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
#, fuzzy
msgid "&Show Failed Packages List"
msgstr "Učitaj Listu Paketa"
#. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
#, fuzzy
msgid "&Show Full Log"
msgstr "Prikaži zapise"
#. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
#, fuzzy
msgid "Installation of some Packages Failed"
msgstr "Instalacija paketa %1 nije uspela."
#. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
#, fuzzy
msgid "Installation aborted by user."
msgstr "&Izvor za instalaciju"
#. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
#, fuzzy
msgid "Medium %1"
msgstr "&Medium"
@@ -1683,7 +1692,7 @@
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
#, fuzzy
msgid ">%1"
msgstr "%1 "
@@ -1691,7 +1700,7 @@
# The final LogView line to be displayed after SuSEconfig etc. is done.
#. Nothing more to install from this CD (very concise - little space!!)
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
msgid "Done."
msgstr "Završeno."
@@ -1700,7 +1709,7 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
#, fuzzy
msgid "Next: %1 -- %2"
msgstr "Napravi %3 %1 %2"
@@ -1709,7 +1718,7 @@
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
#, fuzzy
msgid "Next: %1"
msgstr "Korisničko ime: %1"
@@ -1717,7 +1726,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:918
+#: src/modules/PackageSlideShow.rb:922
msgid "Total"
msgstr "Ukupno"
@@ -1726,13 +1735,13 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
#, fuzzy
msgid "Downloading %1 (download size %2)"
msgstr "Snimam: %1"
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
#, fuzzy
#| msgid "Removing %1 packages"
msgid " (Remaining: %1%2 packages)"
@@ -1741,33 +1750,33 @@
# label in a popup informing about currently processed action
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
#, fuzzy
msgid "Downloading Packages..."
msgstr "Skidanje slike sa interneta..."
# label in a popup informing about currently processed action
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
#, fuzzy
msgid " (Downloaded %1 of %2 packages)"
msgstr "Skidanje slike sa interneta..."
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
msgid "Deleting %1"
msgstr "Brišem %1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
msgid "Installing %1 (installed size %2)"
msgstr ""
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
msgid "Applying delta RPM: %1"
msgstr ""
@@ -1895,7 +1904,7 @@
msgstr ""
#: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
msgstr ""
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
@@ -1911,13 +1920,13 @@
msgstr ""
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
#, fuzzy
msgid "No repository found at '%1'."
msgstr "fstab nije pronađen !!"
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
msgid ""
"<p><b>The release notes for the initial release are part of the installation\n"
"media. If an Internet connection is available during configuration, you can\n"
@@ -1925,18 +1934,18 @@
msgstr ""
#. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
msgid "Integrating booted media..."
msgstr ""
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
#, fuzzy
msgid "Failed to integrate the service pack repository."
msgstr "Instalacija paketa nije uspela."
#. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
#, fuzzy
msgid "Initializing repositories..."
msgstr ""
@@ -1944,19 +1953,19 @@
"Inicijalizacija ..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
#, fuzzy
msgid "Insert %1 CD 1"
msgstr ""
"Ubaci\n"
"'%1' %2"
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
msgid "%1 CD 1 not found"
msgstr ""
#. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
#, fuzzy
msgid ""
"Error while initializing package descriptions.\n"
@@ -1966,19 +1975,19 @@
"Pogledajte log fajl /var/log/YaST2/y2log za više detalja."
#. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
msgstr ""
#. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
msgid "Evaluating package selection..."
msgstr "Proveravam izbor paketa..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1988,35 +1997,43 @@
#. Sets that the license (file) has been already accepted
#.
#. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
#, fuzzy
msgid "Cannot read license file %1"
msgstr "Ne mogu da kreiram datoteku '%1'."
-#: src/modules/ProductLicense.rb:151
+#: src/modules/ProductLicense.rb:153
msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
msgstr ""
#. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
msgid "&Language"
msgstr ""
#. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
msgid "I &Agree to the License Terms."
msgstr ""
#. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+msgid ""
"If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
msgstr ""
#. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
@@ -2027,44 +2044,45 @@
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
msgid "License Agreement"
msgstr ""
# Confirm user request to abort installation
#. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
#, fuzzy
msgid "Really abort the add-on product installation?"
msgstr "Zaista prekinuti instalaciju?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
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:1048
+#: src/modules/ProductLicense.rb:1044
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:1058
+#: src/modules/ProductLicense.rb:1054
msgid "The system is shutting down..."
msgstr ""
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
#: src/modules/ProductLicense.rb:1153
msgid "%s License Agreement"
msgstr ""
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
@@ -2174,7 +2192,7 @@
# tree node string (System Management BIOS)
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
#, fuzzy
msgid "S&MB/CIFS"
msgstr "SMBIOS"
@@ -2225,45 +2243,45 @@
msgstr "pogledaj u &opis"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
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:121
+#: src/modules/SourceDialogs.rb:122
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:135
+#: src/modules/SourceDialogs.rb:136
msgid "&Server Name"
msgstr "Ime &Servera"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
#, fuzzy
msgid "&Path to Directory or ISO Image"
msgstr "Direktorijum:"
#. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
#, fuzzy
msgid "&ISO Image"
msgstr "Vratiti datoteku sa slikom"
#. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
#, fuzzy
#| msgid "P&rotocol"
msgid "N&FS v4 Protocol"
msgstr "P&rotokol"
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
#, fuzzy
#| msgid "Options"
msgid "Mount Options"
@@ -2271,62 +2289,62 @@
#. 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:163
+#: src/modules/SourceDialogs.rb:164
msgid "(default)"
msgstr ""
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
msgid "URL of the Repository"
msgstr ""
#. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
msgid "P&rotocol"
msgstr "P&rotokol"
#. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
msgid "&URL of the Repository"
msgstr ""
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
msgid "Repository URL"
msgstr ""
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
#, fuzzy
msgid "NFS Server"
msgstr "&NFS serveri"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
msgid "CD or DVD Media"
msgstr ""
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
#, fuzzy
msgid "Hard Disk"
msgstr "&Hard disk"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
msgid "USB Stick or Disk"
msgstr ""
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
msgid "Local Directory"
msgstr "Direktorijum:"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
#, fuzzy
msgid "Local ISO Image"
msgstr "Vratiti datoteku sa slikom"
@@ -2336,58 +2354,58 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: 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
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
msgid "Server and Directory"
msgstr "Server i Direktorijum"
#. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:469
msgid "The name of the repository cannot be empty."
msgstr ""
# TextEntry label
#. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:482
#, fuzzy
#| msgid "&User Name"
msgid "&Repository Name"
msgstr "&Korisničko ime"
#. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:497
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:511
#, fuzzy
#| msgid "&Server Name"
msgid "&Service Name"
msgstr "Ime &Servera"
#. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:519
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
msgstr ""
#. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:554
msgid "URL cannot be empty."
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:568
msgid "&URL"
msgstr "&URL"
#. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:582
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2397,23 +2415,23 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
msgid "Edit Parts of the URL"
msgstr ""
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
msgid "Edit Complete URL"
msgstr ""
#. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:774
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
"to specify the NFS server host name and path on the server.</p>"
msgstr ""
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:781
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2422,45 +2440,45 @@
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:836
#, fuzzy
msgid "&CD-ROM"
msgstr "CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:838
#, fuzzy
msgid "&DVD-ROM"
msgstr "CD-ROM"
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:843
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:943
#, fuzzy
msgid "ISO Image File"
msgstr "Vratiti datoteku sa slikom"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:966
msgid ""
"The entered path is not a directory\n"
"or the directory does not exist.\n"
msgstr ""
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:996
msgid ""
"The entered path is not a file\n"
"or the file does not exist.\n"
msgstr ""
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1020
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2468,21 +2486,21 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1041
#, fuzzy
#| msgid "&Image Directory:"
msgid "&Path to Directory"
msgstr "&Image Direktorij:"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
#, fuzzy
#| msgid "&Image Directory:"
msgid "&Plain RPM Directory"
msgstr "&Image Direktorij:"
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1064
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2492,24 +2510,24 @@
msgstr ""
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1300
msgid "&USB Mass Storage Device"
msgstr ""
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
#, fuzzy
#| msgid "&Filter"
msgid "&File System"
msgstr "&Filter"
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
#, fuzzy
#| msgid "D&irectory"
msgid "Dire&ctory"
msgstr "&Direktorijum:"
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1311
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2522,7 +2540,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:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
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"
@@ -2530,11 +2548,11 @@
msgstr ""
#. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1371
msgid "&Disk Device"
msgstr ""
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1378
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2546,12 +2564,12 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1404
msgid "&Path to ISO Image"
msgstr ""
#. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1424
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2559,76 +2577,76 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1605
msgid "Server &Name"
msgstr "Naziv &Servera"
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1609
msgid "&Port"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1614
#, fuzzy
msgid "&Share"
msgstr "&Snimi"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1627
#, fuzzy
msgid "ISO &Image"
msgstr "Vratiti datoteku sa slikom"
#. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1630
msgid "&Directory on Server"
msgstr "&Direktorij na serveru"
#. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1635
msgid "Au&thentication"
msgstr "Au&tentifikacija"
#. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1642
msgid "&Anonymous"
msgstr "&Anonimno"
#. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1651
#, fuzzy
msgid "&Workgroup or Domain"
msgstr "&Radna grupa"
# TextEntry label
#. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1660
msgid "&User Name"
msgstr "&Korisničko ime"
#. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1667
msgid "&Password"
msgstr "&Lozinka"
#. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1742
msgid "&FTP"
msgstr "&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1745
msgid "H&TTP"
msgstr "H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1752
#, fuzzy
msgid "HTT&PS"
msgstr "HTTP"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1926
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"
@@ -2643,7 +2661,7 @@
msgstr ""
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1939
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"
@@ -2652,12 +2670,18 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+msgid "I would li&ke to install an additional Add On Product"
msgstr ""
+# Write dialog caption
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+msgid "Net&work Configuration..."
+msgstr "Snimanje DSL podešavanja"
+
#. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2136
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2665,7 +2689,7 @@
msgstr ""
#. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2145
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2683,7 +2707,7 @@
"</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2155
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2711,7 +2735,7 @@
"</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2167
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2720,27 +2744,27 @@
msgstr ""
#. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2182
#, fuzzy
#| msgid "Select the desired kernel:"
msgid "Select the media type"
msgstr "Izaberite željeni kernel:"
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2188
msgid "Insert the add-on product CD"
msgstr ""
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2189
msgid "Insert the add-on product DVD"
msgstr ""
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2207
msgid "No USB disk was detected."
msgstr ""
#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#: src/modules/SourceDialogs.rb:2415
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2750,13 +2774,13 @@
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2635
#, fuzzy
msgid "Media Type"
msgstr "Provera modula"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2659
#, fuzzy
msgid "Add On Product"
msgstr "Nije raspoloživo za instalaciju"
@@ -2764,7 +2788,7 @@
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2690
msgid "URL scheme '%s' is not valid."
msgstr ""
@@ -2992,19 +3016,19 @@
msgstr "Nije pronađena Linux particija"
#. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
msgid "Partition \"%1\" needs %2 more disk space."
msgstr "Particija \"%1\" treba %2 više prostora."
#. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
msgid ""
"Deselect packages or delete data or temporary files\n"
"before updating the system.\n"
msgstr ""
#. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
#, fuzzy
#| msgid "Please deselect some packages."
msgid "Deselect some packages."
@@ -3035,12 +3059,7 @@
#~ msgid "Initialize Software Manager"
#~ msgstr "&Instaliraj pakete"
-# Write dialog caption
#, fuzzy
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "Snimanje DSL podešavanja"
-
-#, fuzzy
#~ msgid "Initializing Software Manager ... "
#~ msgstr ""
#~ "YaST2\n"
Modified: trunk/yast/sr@Latn/po/pkg-bindings.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/pkg-bindings.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/pkg-bindings.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -46,12 +46,12 @@
msgstr ""
#. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
msgid "The package cannot be selected to install."
msgstr ""
#. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
msgid "The package is not available."
msgstr ""
Modified: trunk/yast/sr@Latn/po/printer.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/printer.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/printer.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: printer.sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-08-07 15:14+0200\n"
"Last-Translator: Mladen Kostrešević <zevs(a)sendmail.ru>\n"
"Language-Team: \n"
@@ -206,7 +206,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:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -224,8 +224,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:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -367,7 +367,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
#, fuzzy
msgid "Description"
msgstr "Opis klase"
@@ -476,8 +476,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:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
msgid "Nothing Selected"
msgstr ""
@@ -2687,60 +2687,60 @@
#. Authors: Johannes Meixner <jsmeix(a)suse.de>
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
msgid "Show"
msgstr ""
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
msgid "&Local"
msgstr ""
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
#, fuzzy
msgid "&Remote"
msgstr "&Testiraj LPD pistup"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
msgid "Configuration"
msgstr "Konfigurisanje"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
msgid "Name"
msgstr "Ime"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
#, fuzzy
msgid "Location"
msgstr "Podešavanje klasa"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
msgid "Default"
msgstr "Podrazumevano"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
#, fuzzy
#| msgid "State"
msgid "Status"
msgstr "Stanje"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
msgid "Re&fresh List"
msgstr ""
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
#, fuzzy
#| msgid "Print test page"
msgid "Print &Test Page"
@@ -2752,7 +2752,7 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
msgid ""
"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
@@ -2765,7 +2765,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -2780,39 +2780,39 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
msgstr ""
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
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:207
+#: src/include/printer/overview.rb:210
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:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
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:253
+#: src/include/printer/overview.rb:256
#, fuzzy
msgid "CUPS Server %1"
msgstr "CUPS server"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
#, fuzzy
msgid "Testing if CUPS server is accessible..."
msgstr "Print server je dostupan."
@@ -2820,43 +2820,43 @@
#. 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:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
#, fuzzy
#| msgid "Select a printer."
msgid "Select an entry."
msgstr "Selektuj štampač."
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
#, fuzzy
#| msgid "Cannot write %1."
msgid "Cannot Delete"
msgstr "Ne mogu da pišem %1."
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr ""
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
#, fuzzy
#| msgid "Configuration"
msgid "Confirm Deletion"
msgstr "Konfigurisanje"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
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:620
+#: src/include/printer/overview.rb:623
#, fuzzy
msgid "Delete configuration %1"
msgstr "podrazumevana konfiguracija"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
msgid "Do not delete it"
msgstr ""
@@ -2867,35 +2867,35 @@
#. 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:637
+#: src/include/printer/overview.rb:640
msgid "Confirm Deletion of a Class"
msgstr ""
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
msgid "A deleted class cannot be re-created with this tool."
msgstr ""
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
#, fuzzy
msgid "Rejecting Print Jobs"
msgstr "Autodetekcija štampača..."
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
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:697
+#: src/include/printer/overview.rb:700
#, fuzzy
msgid "Printout Disabled"
msgstr "Štampanje &završeno"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
msgid "The testpage cannot be printed because printout is disabled."
msgstr ""
@@ -2904,27 +2904,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:728
+#: src/include/printer/overview.rb:731
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:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
msgid "Delete Pending Print Jobs For %1"
msgstr ""
# label of a frame with radiobuttons
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
#, fuzzy
msgid "Delete them before printing testpage"
msgstr "Izaberite tip skenera:"
#. 'No' 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:762
msgid "Print testpage after the other jobs"
msgstr ""
@@ -2932,7 +2932,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:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
msgid "Failed to delete all pending jobs for %1."
msgstr ""
@@ -2951,25 +2951,25 @@
#. + (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:799
+#: src/include/printer/overview.rb:802
#, fuzzy
msgid "Test printout"
msgstr "&Testiraj štampanje"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
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:803
+#: src/include/printer/overview.rb:806
#, fuzzy
#| msgid "Print test page"
msgid "Single test page"
msgstr "Štampaj probnu stranu"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
#, fuzzy
#| msgid "Print test page"
msgid "Two test pages"
@@ -2977,7 +2977,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:835
+#: src/include/printer/overview.rb:838
#, fuzzy
#| msgid ""
#| "Unable to print the test page.\n"
@@ -2993,25 +2993,25 @@
#. 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:852
+#: src/include/printer/overview.rb:855
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:856
+#: src/include/printer/overview.rb:859
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:861
+#: src/include/printer/overview.rb:864
msgid "Testpage printout was successful"
msgstr ""
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
#, fuzzy
msgid "Testpage printing failed"
msgstr "&Testiraj štampanje"
@@ -3032,53 +3032,53 @@
#. 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:897
+#: src/include/printer/overview.rb:900
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:925
+#: src/include/printer/overview.rb:928
msgid "Delete all pending jobs"
msgstr ""
#. 'No' 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:931
msgid "Do not delete them"
msgstr ""
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr ""
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
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:1065
+#: src/include/printer/overview.rb:1068
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:1075
+#: src/include/printer/overview.rb:1078
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:1102
+#: src/include/printer/overview.rb:1105
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr ""
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
msgid "Cannot Modify"
msgstr ""
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr ""
Modified: trunk/yast/sr@Latn/po/rdp.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/rdp.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/rdp.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-01-30 16:32+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -95,52 +95,52 @@
msgstr ""
#. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
msgid "Write firewall settings"
msgstr ""
#. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
msgid "Configure xrdp"
msgstr ""
#. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
msgid "Restart the services"
msgstr ""
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
msgid "Stop the services"
msgstr ""
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
msgid "Saving Remote Administration Configuration"
msgstr ""
#. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
msgid "Writing firewall settings..."
msgstr ""
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
msgid "Configuring xrdp..."
msgstr ""
#. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
msgid "Restarting the service..."
msgstr ""
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
msgid "Stopping the service..."
msgstr ""
#. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
msgid "Remote administration is enabled."
msgstr ""
#. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
msgid "Remote administration is disabled."
msgstr ""
Modified: trunk/yast/sr@Latn/po/rear.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/rear.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/rear.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-03-24 10:57+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -231,11 +231,11 @@
msgstr ""
#: src/include/rear/ui.rb:698
-msgid "Analyzing system"
+msgid "Reading rear settings"
msgstr ""
#: src/include/rear/ui.rb:698
-msgid "Reading rear settings"
+msgid "Analyzing system"
msgstr ""
#: src/include/rear/ui.rb:699
Modified: trunk/yast/sr@Latn/po/registration.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/registration.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/registration.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
"PO-Revision-Date: 2013-01-30 16:25+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,27 +18,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-msgid "Local Registration Servers"
-msgstr ""
-
-#: 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:68
-msgid "No registration server selected."
-msgstr ""
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-msgid "SUSE Customer Center (%s)"
-msgstr ""
-
#. popup message
#. popup message
#. popup message
@@ -55,9 +34,9 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -71,30 +50,30 @@
msgstr ""
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
msgid "Registration was successfull."
msgstr ""
#. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
msgid "SLP discovery failed, no server found"
msgstr ""
#. download and install the specified SSL certificate to the system
#. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
msgid "Downloading SSL Certificate"
msgstr ""
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
msgid "Importing SSL Certificate"
msgstr ""
#. %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:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
msgid "Registering %s ..."
msgstr ""
@@ -231,29 +210,25 @@
msgid "SHA256 Fingerprint: "
msgstr ""
-#. Error popup
-#: 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 ""
-
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
#: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
+msgid "Connection time out."
msgstr ""
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
-msgid "Connection time out."
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:91
msgid "Check that this system is known to the registration server."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:97
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -269,39 +244,39 @@
#. 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: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
-msgid "Registration failed."
+#: 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:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
+msgid "Connection to registration server failed."
msgstr ""
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:121
msgid "Registration client error."
msgstr ""
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:123
msgid ""
"Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:165
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:197
+#: src/lib/registration/connect_helpers.rb:198
msgid "Details: %s"
msgstr ""
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:227
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -311,23 +286,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:240
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:260
+#: src/lib/registration/connect_helpers.rb:261
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:279
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -335,26 +310,44 @@
"protocol is installed at the server."
msgstr ""
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+msgid "Invalid URL."
+msgstr ""
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:296
+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:303
+msgid "Network error, check the network configuration."
+msgstr ""
+
#. progress step title
#: src/lib/registration/finish_dialog.rb:35
msgid "Storing Registration Configuration..."
msgstr ""
#. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
msgid ""
"The base product was not found,\n"
"check your system."
msgstr ""
#. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
msgid ""
"The installation medium or the installer itself is seriously broken.\n"
"Report a bug at %s."
msgstr ""
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
msgid ""
"Make sure a product is installed and /etc/products.d/baseproduct\n"
"is a symlink pointing to the base product .prod file."
@@ -363,7 +356,7 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:272
msgid "Registering the System..."
msgstr ""
@@ -372,14 +365,14 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
#: src/lib/registration/ui/migration_repos_workflow.rb:304
msgid "Updating to %s ..."
msgstr ""
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:166
msgid "Synchronizing Products..."
msgstr ""
@@ -389,34 +382,34 @@
#. @return [Array<Registration::Addon>] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:180
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
msgid "Loading Available Extensions and Modules..."
msgstr ""
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:195
msgid "Loading Migration Products..."
msgstr ""
#. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:213
msgid "Register Extensions and Modules"
msgstr ""
#. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:217
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:242
msgid ""
"The registration server offers update repositories.\n"
"\n"
msgstr ""
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:246
msgid ""
"Would you like to enable these repositories during installation\n"
"in order to receive the latest updates?"
@@ -424,7 +417,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:250
msgid ""
"Would you like to enable these repositories during upgrade\n"
"in order to receive the latest updates?"
@@ -438,7 +431,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -449,39 +442,39 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
msgid "Unknown product"
msgstr ""
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
msgid "Saving repository configuration failed."
msgstr ""
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:474
msgid ""
"Cannot find remote product %s.\n"
"The product cannot be registered."
@@ -552,34 +545,38 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
msgid "Details"
msgstr ""
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
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
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
msgid "%s (not available)"
msgstr ""
#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
msgid "YaST allows to select at most %s extensions or modules."
msgstr ""
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
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_base_dialog.rb:260
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
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 ""
@@ -594,7 +591,7 @@
msgstr ""
#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
msgid "Available Extensions and Modules"
msgstr ""
@@ -650,32 +647,32 @@
msgstr ""
#. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
msgid "Really delete '%s'?"
msgstr ""
#. dialog definition for adding/editing an addon
#. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
msgid "Extension or Module &Identifier"
msgstr ""
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "&Version"
msgstr ""
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
msgid "&Architecture"
msgstr ""
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
msgid "&Release Type"
msgstr ""
#. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
msgid "Registration &Code"
msgstr ""
@@ -699,10 +696,8 @@
msgid "Register the Product"
msgstr ""
-#. 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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
msgid "&E-mail Address"
msgstr ""
@@ -711,56 +706,64 @@
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
msgid "Server Settings"
msgstr ""
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
msgid "Find Registration Server Using SLP Discovery"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
msgid "Use Specific Server URL Instead of the Default"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
msgid "Optional SSL Server Certificate URL"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
msgid "Optional SSL Server Certificate Fingerprint"
msgstr ""
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
msgid "none"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
msgid "SSL Certificate Fingerprint"
msgstr ""
#. the UI defition for the main dialog
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
msgid "Register Extensions or Modules..."
msgstr ""
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
-msgid "&Local Registration Server..."
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
+msgid "Register System via %s"
msgstr ""
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+msgid "Register System via local SMT Server"
+msgstr ""
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+msgid "&Local Registration Server URL"
+msgstr ""
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
msgid "&Skip Registration"
msgstr ""
#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
msgid "&Register Extensions or Modules Again"
msgstr ""
@@ -768,51 +771,34 @@
#. @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/base_system_registration_dialog.rb:342
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr ""
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
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?"
+"Customer Center for online registration."
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
-msgid "Network Configuration..."
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
+msgid "Net&work Configuration..."
msgstr ""
#. SSL error message
@@ -837,22 +823,22 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: 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>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (2/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (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:131
-msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (4/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (5/5)
@@ -860,16 +846,6 @@
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:67
-msgid "Invalid URL."
-msgstr ""
-
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-msgid "&Local Registration Server URL"
-msgstr ""
-
#. TRANSLATORS: error message, %s are details
#. TRANSLATORS: error message, %s are details
#: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -900,17 +876,17 @@
msgstr ""
#. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
msgid "Manage Repositories..."
msgstr ""
#. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
msgid "URL: %s"
msgstr ""
#. TRANSLATORS: summary text, %s is a repository priority (1-99)
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
msgid "Priority: %s"
msgstr ""
@@ -969,17 +945,17 @@
msgstr ""
#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
msgid "Manually Adjust the Repositories for Migration"
msgstr ""
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
msgid "Possible Migration Targets"
msgstr ""
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
msgid "Migration Summary"
msgstr ""
@@ -989,38 +965,38 @@
#. 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:214
+#: 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:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
msgid "%s <b>will be installed.</b>"
msgstr ""
#. 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:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
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:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
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:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
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:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1067,11 +1043,62 @@
"You can manually register the system from scratch."
msgstr ""
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service] List of services to show.
+#. @param heading [String] Text to be shown as dialog heading. A default text
+#. will be used if it's not specified.
+#. @param description [String] Text to be shown as description. A default text
+#. will be used if it's not specified.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:64
+msgid "Local Registration Servers"
+msgstr ""
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:65
+msgid ""
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
+msgstr ""
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:67
+msgid "No registration server selected"
+msgstr ""
+
+#. Default registration server
+#.
+#. return [String] Returns a string representing the default SCC service.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:102
+msgid "SUSE Customer Center (%s)"
+msgstr ""
+
+#. @return [Array<Yast::SlpServiceClass::Service>]
+#: src/lib/registration/url_helpers.rb:220
msgid "Searching..."
msgstr ""
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:220
msgid "Looking up local registration servers..."
msgstr ""
+
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service>] list of services to show
+#. @param heading [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
+msgid "Service selection"
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+msgid "No service was selected."
+msgstr ""
Modified: trunk/yast/sr@Latn/po/reipl.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/reipl.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/reipl.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-01-30 16:32+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -26,11 +26,11 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
msgid ""
"\n"
"After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
msgstr ""
#. TRANSLATORS: part of a shutdown message
@@ -38,7 +38,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -47,7 +47,7 @@
"and LUN '%3'.\n"
msgstr ""
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: trunk/yast/sr@Latn/po/samba-client.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/samba-client.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/samba-client.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (Samba client)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-28 16:34+0100\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -890,54 +890,54 @@
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
msgid "PAM Login"
msgstr ""
#. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
msgid "Use Kerberos"
msgstr ""
#. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
msgid "Do Not Use Kerberos"
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
msgid "Default Realm"
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
#, fuzzy
msgid "Default Domain"
msgstr "&Domen"
#. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
msgid "KDC Server Address"
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
msgid "Clock Skew"
msgstr ""
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
msgid "<b>KDC Server</b>: %1<br>"
msgstr ""
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
#, fuzzy
msgid "<b>Default Domain</b>: %1<br>"
msgstr "A -- Prevođenje imena domena"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
msgid "<b>Default Realm</b>: %1<br>"
msgstr ""
@@ -946,7 +946,7 @@
# Translators: button
# TODO ...
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
#, fuzzy
msgid "<b>Kerberos Authentication Enabled</b>: %1"
msgstr "&Autorizacija"
@@ -954,7 +954,7 @@
# translators: winbind status in summary
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
#, fuzzy
msgid "Yes"
msgstr "&Da"
@@ -962,25 +962,25 @@
# translators: winbind status in summary
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
#, fuzzy
msgid "No"
msgstr "&Ne"
#. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
msgid "Configuration Acquired via DNS"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: trunk/yast/sr@Latn/po/samba-server.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/samba-server.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/samba-server.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-28 16:34+0100\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -279,7 +279,7 @@
"Because users are currently connected to this Samba server,\n"
"the server configuration has been reloaded instead of restarted.\n"
"To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
msgstr ""
#. table entry description for smbpasswd-based SAM
Modified: trunk/yast/sr@Latn/po/security.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/security.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/security.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-30 10:19+0100\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -134,216 +134,216 @@
#. Authors: Michal Svec <msvec(a)suse.cz>
#.
#. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
msgid "Unknown"
msgstr ""
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
msgid "Use magic SysRq keys"
msgstr ""
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
#, fuzzy
msgid "Use secure file permissions"
msgstr "Koristi nasleđene dozvole"
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
msgid "Remote access to the display manager"
msgstr ""
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
msgid "Write back system time to the hardware clock"
msgstr ""
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
msgid "Always generate syslog message for cron scripts"
msgstr ""
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
msgid "Run the DHCP daemon in a chroot"
msgstr ""
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
msgid "Run the DHCP daemon as dhcp user"
msgstr ""
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
msgid "Remote root login in the display manager"
msgstr ""
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
msgid "Remote access to the X server"
msgstr ""
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
msgid "Remote access to the email delivery subsystem"
msgstr ""
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
msgid "Restart services on update"
msgstr ""
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
msgid "Stop services on removal"
msgstr ""
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
msgid "Enable TCP syncookies"
msgstr ""
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
msgid "IPv4 forwarding"
msgstr ""
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
msgid "IPv6 forwarding"
msgstr ""
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
msgid "Enable basic system services"
msgstr ""
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
msgid "Disable extra services"
msgstr ""
#. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
msgid "Configure"
msgstr ""
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
msgid "Enabled"
msgstr ""
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
msgid "Disabled"
msgstr ""
# Frame caption
#. table header
#. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
#, fuzzy
msgid "Security Setting"
msgstr "Tekuća Sigurnosna setovanja"
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
msgid "Status"
msgstr ""
# Frame caption
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
#, fuzzy
msgid "Security Status"
msgstr "Tekuća Sigurnosna setovanja"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
msgid "Help"
msgstr ""
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
msgid " or "
msgstr ""
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
msgstr ""
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
msgid "<P>All basic services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
msgstr ""
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
msgid "<P>Only basic system services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
msgid "Description"
msgstr ""
# Frame caption
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
#, fuzzy
msgid "Security Overview"
msgstr "Tekuća Sigurnosna setovanja"
#. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
msgid "Change &Status"
msgstr ""
#. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
msgid "&Description"
msgstr ""
#. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
msgid "Analyzing system"
msgstr ""
# Boot dialog caption
#. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr "Boot setovanja"
# Frame label
#. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
msgid "Boot Permissions"
msgstr "Boot prava"
# Misc dialog caption
# Misc dialog caption
#. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
#, fuzzy
msgid "Miscellaneous Settings"
msgstr "Ostale opcije"
# Password dialog caption
#. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
msgid "Password Settings"
msgstr "Setovanja Lozinke"
# Frame label
#. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
msgid "Checks"
msgstr ""
#. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
#, fuzzy
msgid "Password Age"
msgstr "Lozinka"
#. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
msgstr ""
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
@@ -351,18 +351,18 @@
# Login dialog caption
#. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr "Login Setovanja"
# Frame label
#. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
msgid "Login"
msgstr "Login"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
#, fuzzy
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
@@ -372,7 +372,7 @@
"</BIG></B><BR>Molim sačekajte...<BR></P>"
#. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
#, fuzzy
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
@@ -382,7 +382,7 @@
"Bezbedno možete napustiti podešavanje pritiskom na dugme <b>Napusti</b>.</p>"
#. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
#, fuzzy
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
@@ -392,7 +392,7 @@
"<br>Molim sačekajte...</p>"
#. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
#, fuzzy
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
@@ -401,42 +401,9 @@
"<p><b><big>Prekid Snimanja:</big></b><br>\n"
"Prekinite proceduru snimanja stisnuvši <b>Prekini</b>.</p>"
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
#: src/include/security/helps.rb:59
msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>\n"
-msgstr ""
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-msgid ""
"<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
"<p>Using predefined defaults, change the local security settings, which include\n"
" booting, login, password, user creation, and file permissions. The default\n"
@@ -445,33 +412,33 @@
msgstr ""
#. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
msgid ""
"<p><b>Workstation</b>: For a computer connected\n"
"to any type of network including the Internet.</p>"
msgstr ""
#. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
msgid ""
"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
"that connects to different networks.</p>"
msgstr ""
#. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
msgstr ""
#. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr ""
#. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -479,7 +446,7 @@
msgstr ""
#. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
msgid ""
"<p><b>Delay after Incorrect Login Attempt:</b>\n"
"It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -488,7 +455,7 @@
msgstr ""
#. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
msgid ""
"<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
"attempts is useful. It can warn you of unauthorized access to the\n"
@@ -497,7 +464,7 @@
msgstr ""
#. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
msgid ""
"<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
"to a graphical login screen for this machine over the network. Remote access\n"
@@ -505,14 +472,14 @@
msgstr ""
#. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
msgstr ""
#. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
msgid ""
"<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
"cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -520,7 +487,7 @@
msgstr ""
#. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
"The minimum acceptable size for the new password reduced by the number\n"
@@ -530,7 +497,7 @@
msgstr ""
#. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -538,13 +505,13 @@
msgstr ""
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
#, fuzzy
msgid "<p><b>Password Encryption Method:</b></p>"
msgstr "Izabeirte metod podešavanja"
#. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
msgid ""
"<p><b>DES</b>, the Linux default method, works in all network environments,\n"
"but it restricts you to passwords no longer than eight characters. If you need\n"
@@ -552,26 +519,26 @@
msgstr ""
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
msgid ""
"<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
"distributions, but not by other systems or old software.</p>"
msgstr ""
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
msgstr ""
#. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
msgstr ""
#. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
msgid ""
"<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
"number of days users are warned before their passwords expire. The longer the\n"
@@ -579,35 +546,35 @@
msgstr ""
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
msgstr ""
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
msgstr ""
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
msgstr ""
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
msgstr ""
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
msgid ""
"<p><b>File Permissions</b>: Settings for the permissions\n"
"of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -625,7 +592,7 @@
msgstr ""
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
msgid ""
"<p><b>User Launching updatedb</b>: The program updatedb runs \n"
"once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -635,7 +602,7 @@
msgstr ""
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
msgid ""
"<p><b>Current Directory in root's Path</b> On a DOS system,\n"
"the system first searches for executable files (programs) in the current\n"
@@ -644,7 +611,7 @@
msgstr ""
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
msgid ""
"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
"system first searches for executable files (programs) in the current directory\n"
@@ -653,7 +620,7 @@
msgstr ""
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
msgid ""
"<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
"search path, enabling files in the current path to be found and executed.\n"
@@ -664,21 +631,21 @@
msgstr ""
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
msgid ""
"<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
"path of root, making it the last to be searched.</p>"
msgstr ""
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
msgstr ""
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
msgid ""
"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
"will have some control over the system even if it crashes (for example, during kernel\n"
@@ -686,26 +653,26 @@
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
msgid "<P>To change the current value, click the link associated to the option.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr ""
#. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
msgstr ""
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
msgid ""
"<P>A display manager provides a graphical login screen and can be accessed\n"
"across the network by an X server running on another system if so\n"
@@ -717,7 +684,7 @@
"logins, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
msgid ""
"<P>Upon startup, the system time is being set from the hardware clock of the\n"
"computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -725,23 +692,23 @@
"correct log messages.</P>"
msgstr ""
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
msgstr ""
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
msgstr ""
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
msgstr ""
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
msgstr ""
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
msgid ""
"<P>X Window clients, e.g. programs that open a window on your display, connect\n"
"to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -753,13 +720,13 @@
"Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>"
msgstr ""
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
msgid ""
"<P>The email delivery subsystem is always started. However, it does not expose\n"
"itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"updated, the service is restarted after the files in the package have been\n"
@@ -771,7 +738,7 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"uninstalled, the service is stopped before the files of the package are\n"
@@ -783,38 +750,86 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
msgstr ""
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
msgstr ""
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
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:330
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:352
+#: src/include/security/helps.rb:333
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 ""
+#: src/include/security/helps.rb:341
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+
#. level name
#: src/include/security/levels.rb:54
#, fuzzy
@@ -882,179 +897,252 @@
"maximum."
msgstr ""
-#. ComboBox label
-#: src/include/security/widgets.rb:100
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr ""
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
+#. 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: include/security/widgets.ycp
+#. * Module: Security configuration
+#. * Summary: Security widgets definitions
+#. * Authors: Michal Svec <msvec(a)suse.cz>
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
msgid "Ignore"
msgstr "Ignoriši"
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
#, fuzzy
msgid "Reboot"
msgstr "Restartovanje računara posle instalacije"
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
#, fuzzy
msgid "Halt"
msgstr "Greška Halt"
+#: src/include/security/widgets.rb:93
+#, fuzzy
+msgid "Only root"
+msgstr "Root Lozinka"
+
+#: src/include/security/widgets.rb:94
+#, fuzzy
+msgid "All Users"
+msgstr "Maskiraj korisnike"
+
+#: src/include/security/widgets.rb:95
+msgid "Nobody"
+msgstr ""
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr ""
+
#. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
#, fuzzy
msgid "Allow Remote &Graphical Login"
msgstr "Dozvoli izmene u login &shell-u"
#. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
msgid "&Magic SysRq Keys"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
msgid "Disable"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
msgid "Enable All Functions"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
msgid "&Delay after Incorrect Login Attempt"
msgstr ""
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
msgid "Maxim&um"
msgstr ""
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
msgid "M&inimum"
msgstr ""
#. ComboBox label
-#: src/include/security/widgets.rb:154
-#, fuzzy
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "KDM Login Setovanja"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-#, fuzzy
-msgid "Only root"
-msgstr "Root Lozinka"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-#, fuzzy
-msgid "All Users"
-msgstr "Maskiraj korisnike"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-msgid "Nobody"
-msgstr ""
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
+#: src/include/security/widgets.rb:164
msgid "System Hybernation"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
msgid "User on the active console"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
msgid "Anyone can hibernate"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
msgid "Authentication always required"
msgstr ""
#. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
#, fuzzy
msgid "P&assword Encryption Method"
msgstr "Izabeirte metod podešavanja"
#. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
#, fuzzy
msgid "&Check New Passwords"
msgstr "&Učitajte nov sadržaj"
#. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
msgid "Numb&er of Passwords to Remember"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
msgid "&Minimum Acceptable Password Length"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
msgid "&Days before Password Expires Warning"
msgstr ""
#. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
#, fuzzy
msgid "&File Permissions"
msgstr "&Prava pristupa"
# ComboBox value
#. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
msgid "Easy"
msgstr "Lako"
# ComboBox value
#. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
#, fuzzy
msgid "Secure"
msgstr "&Bezbedna ljuska (ssh)"
#. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
msgid "Paranoid"
msgstr ""
# ComboBox label
#. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
#, fuzzy
msgid "&User Launching updatedb"
msgstr "Upravljanje korisničkim skriptama"
# IntField label
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
msgid "Ma&ximum"
msgstr "Ma&ksimum"
# IntField label
#. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
msgid "&Minimum"
msgstr "&Minimum "
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "KDM Login Setovanja"
+
# Security read dialog caption
#: src/include/security/wizards.rb:53
#, fuzzy
@@ -1079,31 +1167,31 @@
# Security read dialog caption
#. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
msgid "Saving Security Configuration"
msgstr "Snimanje Konfiguracije Sigurnosti"
# Progress stage 1/4
#. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
msgid "Write security settings"
msgstr "Upiši sigurnosna setovanja"
# Progress stage 2/4
#. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
msgid "Write inittab settings"
msgstr "Upiši inittab setovanja"
# Progress stage 3/4
#. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
msgid "Write PAM settings"
msgstr "Upiši PAM setovanja"
# Progress stage 1/4
#. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
#, fuzzy
#| msgid "Write security settings"
msgid "Update system settings"
@@ -1111,25 +1199,25 @@
# Progress step 1/5
#. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
msgid "Writing security settings..."
msgstr "Upisivanje sigurnosnog setovanja..."
#. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
#, fuzzy
msgid "Writing inittab settings..."
msgstr "Čitaj inittab setovanja"
#. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
#, fuzzy
msgid "Writing PAM settings..."
msgstr "Snimanje PAM podešavanja..."
# Progress step 1/5
#. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
#, fuzzy
#| msgid "Writing security settings..."
msgid "Updating system settings..."
@@ -1137,19 +1225,19 @@
# Progress step 4/4
#. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
#, fuzzy
msgid "Finished"
msgstr "Završeno"
# Summary text
#. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
msgid "Current Security Level: Custom settings"
msgstr "Tekući nivo Sigurnosti: Vaše setovanje"
#. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
#, fuzzy
msgid "Current Security Level: %1"
msgstr "Tekući nivo Sigurnosti: Vaše setovanje"
Modified: trunk/yast/sr@Latn/po/services-manager.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/services-manager.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/services-manager.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -268,11 +268,11 @@
#. 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
+#: src/modules/services_manager_service.rb:415
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr ""
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
msgid "Could not %{change} %{service}. "
msgstr ""
Modified: trunk/yast/sr@Latn/po/snapper.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/snapper.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/snapper.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-01-30 16:33+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -49,263 +49,263 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
msgid "Description"
msgstr ""
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
msgid "User data"
msgstr ""
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
msgid "Cleanup algorithm"
msgstr ""
#. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
+#: src/include/snapper/dialogs.rb:161
msgid "Modify Snapshot %{num}"
msgstr ""
#. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
+#: src/include/snapper/dialogs.rb:167
msgid "Modify Snapshot %{pre} and %{post}"
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:161
+#: src/include/snapper/dialogs.rb:169
msgid "Pre (%{pre})"
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:165
+#: src/include/snapper/dialogs.rb:173
msgid "Post (%{post})"
msgstr ""
#. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:250
msgid "Create New Snapshot"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:263
msgid "Single snapshot"
msgstr ""
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
msgid "Pre"
msgstr ""
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:282
msgid "Post, paired with:"
msgstr ""
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:358
msgid "Really delete snapshot %{num}?"
msgstr ""
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
+#: src/include/snapper/dialogs.rb:365
msgid "Really delete snapshots %{pre} and %{post}?"
msgstr ""
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:380
msgid "Snapshots"
msgstr ""
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:409
msgid "Single"
msgstr ""
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:434
msgid "Pre & Post"
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:469
msgid "Reading list of snapshots..."
msgstr ""
#. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:485
msgid "Current Configuration"
msgstr ""
#. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:496
msgid "ID"
msgstr ""
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:497
msgid "Type"
msgstr ""
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:498
msgid "Start Date"
msgstr ""
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:499
msgid "End Date"
msgstr ""
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:501
msgid "User Data"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:507
msgid "Show Changes"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:510
msgid "Modify"
msgstr ""
#. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:553
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:634
+#: src/include/snapper/dialogs.rb:638
msgid "Selected Snapshot Overview"
msgstr ""
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:670
msgid "%1: %2"
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:689
msgid "Calculating changed files..."
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:699
msgid "Calculating file modifications..."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:707
msgid "New file was created."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:711
msgid "File was removed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:716
msgid "File content was not changed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:722
msgid "File does not exist in either snapshot."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:728
msgid "File content was modified."
msgstr ""
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:738
msgid "File mode was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:753
msgid "File user ownership was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:769
msgid "File group ownership was changed from '%1' to '%2'."
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:786
msgid "R&estore from First"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:788
msgid "Restore"
msgstr ""
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:811
msgid "Res&tore from Second"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:848
msgid "Show the difference between snapshot and current system"
msgstr ""
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:860
msgid "Show the difference between current and selected snapshot:"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:907
msgid "Show the difference between first and second snapshot"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:918
msgid "Show the difference between first snapshot and current system"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:929
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:954
+#: src/include/snapper/dialogs.rb:958
msgid "Time of taking the snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:966
msgid "Time of taking the first snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:971
msgid "Time of taking the second snapshot:"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:994
msgid "&Open"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1040
msgid "Restore Selected"
msgstr ""
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1125
msgid ""
"Do you want to delete the file\n"
"\n"
@@ -316,7 +316,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:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -326,17 +326,17 @@
msgstr ""
#. popup message
-#: src/include/snapper/dialogs.rb:1187
+#: src/include/snapper/dialogs.rb:1191
msgid "No file was selected for restoring."
msgstr ""
#. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1201
msgid "Restoring files"
msgstr ""
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1204
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
Modified: trunk/yast/sr@Latn/po/storage.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/storage.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/storage.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST2 (partitioning)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-30 10:18+0100\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -174,7 +174,11 @@
msgid "Not enough space available to propose separate /home."
msgstr ""
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr ""
+
+#: src/clients/inst_disk_proposal.rb:304
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -1085,7 +1089,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6272
#, fuzzy
msgid "Propose Separate &Home Partition"
msgstr "Kreiranje nove particije"
@@ -1107,7 +1111,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
#, fuzzy
msgid ""
"You have not assigned a root partition for\n"
@@ -1121,7 +1125,7 @@
"Molimo napravite zahtevanu tačku montiranja."
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -1131,7 +1135,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1141,7 +1145,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1152,7 +1156,7 @@
#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1163,7 +1167,7 @@
# popup text %1 is a number
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
#, fuzzy
msgid ""
"Warning:\n"
@@ -1183,7 +1187,7 @@
"Da li želite promjeniti navedeno?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
@@ -1193,7 +1197,7 @@
msgstr ""
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1208,7 +1212,7 @@
#. 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:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
#, fuzzy
msgid ""
"Warning: There is no partition mounted as /boot.\n"
@@ -1226,7 +1230,7 @@
# popup text
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
#, fuzzy
msgid ""
"Warning: According to your setup, you intend to\n"
@@ -1245,11 +1249,11 @@
"\n"
"Da li želite promjeniti navedeno?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
"Really use this setup?\n"
msgstr ""
@@ -1409,53 +1413,53 @@
"Da li se želite vratiti i promjeniti vaš izbor?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
msgstr ""
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
msgstr ""
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
msgid "It cannot be deleted while mounted."
msgstr ""
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
@@ -1464,7 +1468,7 @@
msgstr ""
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1474,7 +1478,7 @@
msgstr ""
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1484,7 +1488,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1504,15 +1508,15 @@
# label text
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6400
#, fuzzy
#| msgid "Don't forget what you enter here!"
msgid "Do not forget what you enter here!"
msgstr "Nemojte zaboraviti što ste uneli ovde!"
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
msgid "Empty password allowed."
msgstr ""
@@ -1549,7 +1553,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
#, fuzzy
msgid "&Enter a Password for your File System:"
msgstr "Unesite vašu lozinku za šifrovanje sistema datoteka"
@@ -1565,7 +1569,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:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
#, fuzzy
#| msgid "Reenter the password for &verification:"
msgid "Reenter the Password for &Verification:"
@@ -1598,7 +1602,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1610,7 +1614,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
#, fuzzy
msgid ""
"The password must have at least %1 characters.\n"
@@ -1954,7 +1958,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6253
msgid "Enable Snapshots"
msgstr ""
@@ -1969,17 +1973,17 @@
msgid "Empty subvolume name not allowed."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
msgid "Subvolume name %1 already exists."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -2013,7 +2017,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -2026,7 +2030,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -2039,7 +2043,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2062,7 +2066,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2249,7 +2253,7 @@
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
msgid ""
"\n"
"WARNING:\n"
@@ -2264,12 +2268,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2277,19 +2281,19 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
#, fuzzy
msgid "Unmount"
msgstr "&Mount Lokacija:"
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
#, fuzzy
msgid "It is not possible to shrink the file system while it is mounted."
msgstr ""
@@ -2297,7 +2301,7 @@
"\n"
"%2\n"
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
#, fuzzy
msgid "It is not possible to extend the file system while it is mounted."
msgstr ""
@@ -2305,7 +2309,7 @@
"\n"
"%2\n"
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
#, fuzzy
msgid "It is not possible to resize the file system while it is mounted."
msgstr ""
@@ -2736,35 +2740,44 @@
"Izaberite novu veličinu za vašu Windows particiju.\n"
"</p>"
+# button text
+# button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
#, fuzzy
+#| msgid "&Primary partition"
+msgid "EFI Boot Partition"
+msgstr "&Primarna particija"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
+#, fuzzy
msgid "Operating System"
msgstr " Sistem datoteka "
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
msgid "Data and ISV Applications"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
msgid "Swap"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
msgid "Raw Volume (unformatted)"
msgstr ""
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
msgid "Role"
msgstr ""
# helptext for popup create partition line 1 of 6
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
#, fuzzy
msgid ""
"<p>First, choose whether the partition should be\n"
@@ -2772,7 +2785,7 @@
msgstr "<p>Prvo, izaberite tip nove particije i da li ta particija treba biti formatirana ili ne.</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2780,7 +2793,7 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
#, fuzzy
msgid ""
"<p>Then, choose whether the partition should\n"
@@ -2790,7 +2803,7 @@
# label text, example: "Formatting /dev/hda1 for /usr"
# label text, example: "Formatting /dev/hda1 for /usr"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
#, fuzzy
#| msgid "Formatting %1 as %2"
msgid "Formatting Options"
@@ -2798,53 +2811,53 @@
# button text
# button text
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
#, fuzzy
#| msgid "&Primary partition"
msgid "Format partition"
msgstr "&Primarna particija"
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
#, fuzzy
#| msgid "Do ¬ format"
msgid "Do not format partition"
msgstr "&Nemoj formatirati"
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
#, fuzzy
msgid "Do not mount partition"
msgstr "particija"
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
#, fuzzy
msgid "Mounting Options"
msgstr "Protokol tuneliranja od tačke do tačke"
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
#, fuzzy
#| msgid "partition"
msgid "Mount partition"
msgstr "particija"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "Točka montiranja"
# button text
#. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
#, fuzzy
msgid "Fs&tab Options..."
msgstr "Opcije datoteke arhive"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
msgid "Crypt files must be encrypted."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2853,19 +2866,19 @@
msgstr ""
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
#, fuzzy
msgid "Crypt files require a mount point."
msgstr "Odaberite mount lokaciju"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
#, fuzzy
msgid "Tmpfs requires a mount point."
msgstr "Odaberite mount lokaciju"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2875,7 +2888,7 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2884,28 +2897,28 @@
"</p>\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
msgid "All data stored on the volume will be lost!"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
msgid "Password"
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
msgid "Resize not supported by underlying device."
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
"on this partition does not support resizing.\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
#, fuzzy
msgid ""
"It is not possible to check whether a NTFS\n"
@@ -2916,30 +2929,30 @@
"%2\n"
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
msgstr ""
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
#, fuzzy
msgid "Resize Partition %1"
msgstr "Izmena particije"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
#, fuzzy
msgid "Resize Logical Volume %1"
msgstr "Čitanje setovanja jačine"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
msgid "Current size: %1"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
#, fuzzy
msgid "Currently used: %1"
msgstr "Trenutno dostupni servisi"
@@ -2950,8 +2963,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2963,7 +2976,7 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
#, fuzzy
@@ -2971,14 +2984,14 @@
msgstr "&Fiksirana veličina"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
#, fuzzy
msgid "Minimum Size (%1)"
msgstr "&Fiksirana veličina"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
#, fuzzy
@@ -2987,7 +3000,7 @@
msgstr "Veličina"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
#, fuzzy
msgid "<p>Choose new size.</p>"
msgstr ""
@@ -2997,7 +3010,7 @@
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
#, fuzzy
@@ -3008,7 +3021,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -3017,12 +3030,12 @@
msgstr ""
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
msgid "Output of %1"
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
msgid "Rescanning disks..."
msgstr ""
@@ -3275,13 +3288,13 @@
msgstr "Početni cilindar nije ispravan. Molimo pokušajte ponovno"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
#, fuzzy
msgid "Add Partition on %1"
msgstr "Izmena particije"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
#, fuzzy
msgid "Edit Partition %1"
msgstr "Izmena particije"
@@ -3291,52 +3304,52 @@
# label text
# example "No extended partition: No space left
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
#, fuzzy
#| msgid "No extended partition: "
msgid "No space to moved partition %1."
msgstr "Nema extended particije: "
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
#, fuzzy
msgid "Move partition %1 forward?"
msgstr "Aktiviranje swap particije %1"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
msgid "Move partition %1 backward?"
msgstr ""
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
#, fuzzy
msgid "Move partition %1?"
msgstr "Particija"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
msgid "Forward"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
msgid "Backward"
msgstr ""
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
#, fuzzy
msgid "Confirm Deleting of All Partitions"
msgstr "Provjeravam particiju %1"
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
msgid ""
"The disk \"%1\" contains at least one partition.\n"
"If you proceed, the following partitions will be deleted:"
msgstr ""
# popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
#, fuzzy
msgid "Really delete all partitions on \"%1\"?"
msgstr "Da li želite da obrišete sve particije na %1 ?"
@@ -3344,33 +3357,38 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
msgid "No hard disk selected."
msgstr ""
#. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
msgid "The disk is in use and cannot be modified."
msgstr ""
# button text
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
#, fuzzy
#| msgid "&Yes, delete the partition table now."
msgid "Select new partition table type for %1."
msgstr "&Da, obrisati &tabelu particija sada."
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
#, fuzzy
msgid "No disk selected."
msgstr ""
@@ -3380,28 +3398,28 @@
# Warning popup text 2/2
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
#, fuzzy
msgid "Really delete BIOS RAID %1?"
msgstr "Zaista ga obrisati?"
# popup text %1 is replaced by a disk name e.g. /dev/hda
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
#, fuzzy
msgid "Really delete Partitioned RAID %1?"
msgstr "Da li želite da obrišete sve particije na %1 ?"
# menu entry text
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
#, fuzzy
msgid "There are no partitions to delete on this disk."
msgstr "Obrisati &tabelu particija i disk labelu"
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
#, fuzzy
msgid "It is not possible to create a partition on %1."
msgstr ""
@@ -3415,56 +3433,56 @@
#. error popup
#. error popup
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
#, fuzzy
#| msgid "No extended partition exists."
msgid "No partition selected."
msgstr "Nema postojeće extended particije."
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
msgid ""
"The partition %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
#, fuzzy
msgid "An extended partition cannot be edited."
msgstr "Nema postojeće extended particije."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
msgid ""
"The partition %1 is already created on disk\n"
"and cannot be moved."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
#, fuzzy
msgid "An extended partition cannot be moved."
msgstr "Nema postojeće extended particije."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
msgid ""
"The partition %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
#, fuzzy
msgid "An extended partition cannot be resized."
msgstr "Nema postojeće extended particije."
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -3474,56 +3492,56 @@
"partitions will be deleted.</p>\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
msgstr ""
# popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
#, fuzzy
msgid "Really delete these partitions?"
msgstr "Da li želite da obrišete sve particije na %1 ?"
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
msgid ""
"There are no partitions on this disk, but a clonable\n"
"disk must have at least one partition.\n"
"Create partitions before cloning the disk.\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
msgid ""
"This disk cannot be cloned. There are no suitable\n"
"disks that could have the same partitioning layout."
msgstr ""
# to translators: * Create swap partition 1.2 GB on hda1
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
#, fuzzy
#| msgid "Create %1 partition %2 on %3"
msgid "Clone partition layout of %1"
msgstr "%1 Pravljenje primarne particije na %2 %3"
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
#, fuzzy
msgid "Available target disks:"
msgstr "Raspoložive datoteke"
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
msgid "Select a target disk for creating a clone"
msgstr ""
#. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
msgstr ""
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3804,28 +3822,28 @@
msgstr ""
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
#, fuzzy
msgid "Confirm Deleting Partition Used by LVM"
msgstr "Provjeravam particiju %1"
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
msgid ""
"The selected partition is used by volume group \"%1\".\n"
"To keep the system in a consistent state, the following volume group\n"
"and its logical volumes will be deleted:\n"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
#, fuzzy
msgid "Confirm Deleting Partition Used by RAID"
msgstr "Provjeravam particiju %1"
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
"To keep the system in a consistent state, the following\n"
@@ -3833,14 +3851,14 @@
msgstr ""
# to translators: * Create extended partition 1.2 GB (hda1)
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
#, fuzzy
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "Pravljenje extended particije na %2 (%3)"
# popup text %1 is replaced by a disk name e.g. /dev/hda
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
#, fuzzy
msgid "Really delete all partitions on %1?"
msgstr "Da li želite da obrišete sve particije na %1 ?"
@@ -3849,13 +3867,13 @@
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
#, fuzzy
msgid "Really delete %1?"
msgstr "Zaista ga obrisati?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -3865,7 +3883,7 @@
#. Guarantee some minimal share (1%) of total graph width to the segment.
#. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
#, fuzzy
#| msgid "partition"
msgid "Unpartitioned"
@@ -3875,11 +3893,11 @@
#. or the end of the disk if
#. 1. end +1th cyl is not the next one
#. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
msgid "Unallocated"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
#, fuzzy
msgid "<p>No changes to partitioning.</p>"
msgstr ""
@@ -3887,25 +3905,25 @@
"Izaberite novu veličinu za vašu Windows particiju.\n"
"</p>"
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "Čitanje Particija"
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
msgid "<p>No changes to storage settings.</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
msgid "<p>Storage settings:</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
#, fuzzy
msgid "<p>Packages to install:</p>"
msgstr "Čitanje Particija"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
msgid "<p>No packages need to be installed.</p>"
msgstr ""
@@ -4007,13 +4025,13 @@
msgstr ""
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
#, fuzzy
msgid "Add Crypt File"
msgstr "Šifrirana Loop Datoteka"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
#, fuzzy
msgid "Edit Crypt File %1"
msgstr "Šifrirana Loop Datoteka"
@@ -4337,13 +4355,13 @@
msgstr "by DHCP"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
#, fuzzy
msgid "Add Logical Volume on %1"
msgstr "Čitanje setovanja jačine"
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
#, fuzzy
msgid "Edit Logical Volume %1 on %2"
msgstr "Čitanje setovanja jačine"
@@ -4381,9 +4399,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
#, fuzzy
msgid "No logical volume selected."
msgstr "&Veličina dela arhive:"
@@ -4398,14 +4416,14 @@
"Sve trenutne promene biće izgubljene!"
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
msgid ""
"The volume %1 is a thin pool.\n"
"It cannot be edited."
msgstr ""
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
msgid ""
"The volume %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
@@ -4794,19 +4812,19 @@
msgstr ""
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
#, fuzzy
msgid "Add RAID %1"
msgstr "Dodaj &particiju"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
#, fuzzy
msgid "Resize RAID %1"
msgstr "RAID bus kontroler"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
#, fuzzy
msgid "Edit RAID %1"
msgstr "Izmena particije"
@@ -5101,7 +5119,7 @@
msgstr "Sada možete unijeti mjesto nove particije na vašem hard disku. "
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
msgid "Add tmpfs Mount"
msgstr ""
@@ -5895,38 +5913,51 @@
msgstr ""
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:937
+msgid "Operation not permitted on disk %{device}.\n"
msgstr ""
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:942
msgid ""
"\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:954
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
"supported by the partitioning tool parted used to change the\n"
"partition table.\n"
"\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
"format them and assign mount points, but you cannot add, edit, \n"
"resize, or remove partitions from that disk here.\n"
msgstr ""
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:966
msgid ""
"\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
"compatibility the kernel has automatically generated a\n"
"partition spanning almost the entire disk.\n"
"\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
"format it and assign a mount point, but you cannot resize\n"
"or remove the partition from that disk here.\n"
msgstr ""
#. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:982
msgid ""
"\n"
"\n"
@@ -5936,7 +5967,7 @@
msgstr ""
#. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:992
msgid ""
"\n"
"\n"
@@ -5950,7 +5981,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
msgid "Resize Not Possible:"
msgstr ""
@@ -5963,7 +5994,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:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5973,7 +6004,7 @@
# popup text
#. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
#, fuzzy
#| msgid ""
#| "The first and the second version\n"
@@ -5991,7 +6022,7 @@
# error popup
# error popup
#. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -6004,24 +6035,24 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
msgid "&Enter Encryption Password:"
msgstr ""
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
msgid "Provide Password"
msgstr ""
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
msgid "Encrypted Volume Activation"
msgstr ""
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6029,12 +6060,12 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
msgid "Do you want to provide encryption passwords?"
msgstr ""
#. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6042,58 +6073,58 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
msgid "Enter Encryption Password"
msgstr ""
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
msgid "Provide password for any of the following devices:"
msgstr ""
#. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
#, fuzzy
msgid "Provide password for the following device:"
msgstr "Unesite vašu lozinku za šifrovanje sistema datoteka"
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
msgid "Password did not unlock any volume."
msgstr ""
# tree node string
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
#, fuzzy
#| msgid "Disk"
msgid "IDE Disk"
msgstr "Disk"
# tree node string
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
#, fuzzy
#| msgid "Disk"
msgid "SCSI Disk"
msgstr "Disk"
# tree node string
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
msgid "Disk"
msgstr "Disk"
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
#, fuzzy
msgid "DM RAID"
msgstr "Dodaj &particiju"
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
#, fuzzy
msgid "MD RAID"
msgstr "Dodaj &particiju"
@@ -6101,51 +6132,51 @@
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
msgid "Installing required packages failed."
msgstr ""
# Popup text
# %1 is either replaced by "logical volume" or by "partition"
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
#, fuzzy
msgid "Continue despite the error?"
msgstr "&Nastavak Instalacije"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6153,7 +6184,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6161,7 +6192,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6169,18 +6200,18 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
msgid "Nothing assigned as root filesystem!"
msgstr ""
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
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:6032
+#: src/modules/Storage.rb:6042
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -6851,56 +6882,44 @@
"You must quit that application before you can continue."
msgstr ""
-#. enable snapshots for root volume if desired
+#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr ""
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-#, fuzzy
-msgid "Create &LVM-based Proposal"
-msgstr "Pravljenje planova particionisanja"
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-#, fuzzy
-#| msgid " Volume Group "
-msgid "Encr&ypt Volume Group"
-msgstr "Grupa Volumena"
-
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6239
#, fuzzy
msgid "File System for Root Partition"
msgstr "Opcije datoteke arhive"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6286
#, fuzzy
msgid "File System for Home Partition"
msgstr "Kreiranje nove particije"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6304
msgid "Enlarge &Swap for Suspend"
msgstr ""
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6314
#, fuzzy
msgid "Proposal Settings"
msgstr "Ostale opcije"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
+#: src/modules/StorageProposal.rb:6329
msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6337
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"
@@ -6909,21 +6928,21 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6346
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:6325
+#: src/modules/StorageProposal.rb:6353
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 ""
# heading text
-#: src/modules/StorageProposal.rb:6350
+#: src/modules/StorageProposal.rb:6378
#, fuzzy
#| msgid "Enter your password for the encrypted file system"
msgid "Enter your password for the proposal encryption."
@@ -6931,7 +6950,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6385
msgid "Password:"
msgstr ""
@@ -6941,12 +6960,30 @@
# Please use newline if label is longer than 40 characters
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6396
#, fuzzy
#| msgid "Reenter the password for &verification:"
msgid "Reenter the password for verification:"
msgstr "Ponovno unesite lozinku za &proveru:"
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6594
+#, fuzzy
+msgid "&Partition-based Proposal"
+msgstr ""
+"Spajanje neuspešno:\n"
+" %1"
+
+#: src/modules/StorageProposal.rb:6596
+#, fuzzy
+msgid "&LVM-based Proposal"
+msgstr "Pravljenje planova particionisanja"
+
+#: src/modules/StorageProposal.rb:6598
+#, fuzzy
+msgid "&Encrypted LVM-based Proposal"
+msgstr "Pravljenje planova particionisanja"
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -6995,6 +7032,11 @@
msgstr ""
#, fuzzy
+#~| msgid " Volume Group "
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr "Grupa Volumena"
+
+#, fuzzy
#~ msgid "&Edit Partition Setup..."
#~ msgstr "Izmena particije"
@@ -7106,12 +7148,6 @@
#~ msgstr " Sistem datoteka "
#, fuzzy
-#~ msgid "&Partition Based"
-#~ msgstr ""
-#~ "Spajanje neuspešno:\n"
-#~ " %1"
-
-#, fuzzy
#~ msgid "&Module to Use"
#~ msgstr "&Modul za startovanje:"
Modified: trunk/yast/sr@Latn/po/update.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/update.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/update.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST2 (update)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-30 04:18+0100\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -520,7 +520,7 @@
msgstr ""
#. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -962,20 +962,20 @@
#. -----------------------------------------------------------------------
#. GLOBAL FUNCTIONS
#. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
#, fuzzy
msgid "Unknown Product"
msgstr "Nepoznato"
#. If the current default desktop is not installed, it's a valid use case
#. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
msgid ""
"Cannot select these patterns required for installation:\n"
"%{patterns}"
msgstr ""
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
msgid ""
"Cannot select these packages required for installation:\n"
"%{packages}"
Modified: trunk/yast/sr@Latn/po/users.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/users.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/users.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST2 (user)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-04-30 02:42+0100\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -154,694 +154,6 @@
msgid "Do not ask for missing data; return error instead."
msgstr ""
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-#, fuzzy
-msgid "User Authentication Method"
-msgstr "Korisnička autorizacija korišćenjem MD5 zbirke autorizacija"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: 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 ""
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr ""
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-#, fuzzy
-msgid "&LDAP"
-msgstr "&Koristi LDAP"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-#, fuzzy
-msgid "N&IS"
-msgstr "Vrednost %1 je nepravilna."
-
-# just the name (do not translate)
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "&Samba"
-
-# text entry
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-#, fuzzy
-msgid "&Windows Domain"
-msgstr "&Domen"
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-#, fuzzy
-msgid "L&ocal (/etc/passwd)"
-msgstr "Nepostojeća putanja rezervne kopije"
-
-# type of item (displayed in the table)
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-#, fuzzy
-msgid "eDirectory LDAP"
-msgstr "&Direktorijum:"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr ""
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-msgid "&Read User Data from a Previous Installation"
-msgstr ""
-
-# pushbutton label
-# choose a host from a list
-# appears in help text too
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-#, fuzzy
-msgid "&Choose"
-msgstr "&Izaberi"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-#, fuzzy
-msgid "Authentication Method"
-msgstr "Korisnička autorizacija korišćenjem MD5 zbirke autorizacija"
-
-# translators: command line help text for pam action
-#. check box label
-#: src/clients/inst_auth.rb:303
-#, fuzzy
-msgid "Set Up &Kerberos Authentication"
-msgstr "Uključi ili isključi Kerberos autorizaciju"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-#, fuzzy
-msgid "&Select Users to Read"
-msgstr "Promena Postojećeg Sistemskog korisnika"
-
-# push button label
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-#, fuzzy
-msgid "Select or Deselect &All"
-msgstr "Selektuj ili deselektuj &datoteku"
-
-# Title for root-password dialogue
-# Title for root-password dialogue
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-#, fuzzy
-msgid "Password for the System Administrator \"root\""
-msgstr "Lozinka za \"root\", administratora sistema"
-
-# advise user to remember his new password
-# advise user to remember his new password
-#. advise user to remember his new password
-#. advise users to remember their new password
-#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
-msgid "Do not forget what you enter here."
-msgstr "Nemojte zaboraviti što ste uneli ovdje!"
-
-# translators: command line help text for add option
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-#, fuzzy
-msgid "&Password for root User"
-msgstr "Setovanje password-a za korisnika %1:"
-
-# text entry label
-# text entry label
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-#, fuzzy
-msgid "Con&firm Password"
-msgstr "&Lozinka:"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-msgid "&Test Keyboard Layout"
-msgstr ""
-
-#. push button
-#: src/clients/inst_root.rb:119
-#, fuzzy
-msgid "E&xpert Options..."
-msgstr "<p><b>Napredne opcije</b></p>"
-
-# help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-#, fuzzy
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Za razliku od normalnih korisnika sistema, koji za primer pišu tekstove, prave\n"
-"grafiku ili koriste Internet, korisnik \"root\" postoji na\n"
-"svakom sistemu i pozivan je za akciju kad god su\n"
-"potrebni da se obave administrativni poslovi. Drugim rečima, prijavljujte\n"
-"se kao root kada trebate, ili želite, biti sistemskii administrator, i samo tada.\n"
-"</p>"
-
-# help text, continued 2/5
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-#, fuzzy
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Zato što je root korisnik opremljen sa svim dozvolama, lozinka\n"
-"za \"root\" treba biti pažljivo odabrana. Kombinacija slova i brojeva\n"
-"je preporučena. Kako bi osigurali da je lozinka unešena ispravno, pitani\n"
-"ste da ponovite proces u sledećem polju.\n"
-"</p>"
-
-# help text, continued 3/5
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-#, fuzzy
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Sva pravila lozinke korisnika za primer može biti primjenjena i na \"root\" lozinku:\n"
-"morate razlikovati velika i mala slova; lozinka treba biti najmanje\n"
-"5 karaktera dugačka, i kao pravilo, ne sme sadržavati nikakve specijalne karaktere\n"
-"(npr. naglašena slova).\n"
-"</p>"
-
-# help text, continued
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-#, fuzzy
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ne zaboravite ovu lozinku!\n"
-"</p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr ""
-
-# error popup
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. 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:688 src/include/users/dialogs.rb:146
-#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364
-#, fuzzy
-msgid ""
-"The passwords do not match.\n"
-"Try again."
-msgstr "Lozinka ne sme da bude prazna."
-
-#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-#, fuzzy
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr "Potrebna je lozinka"
-
-# yes/no popup text
-# yes/no popup text
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-#, fuzzy
-#| msgid ""
-#| "The password should have at least five characters.\n"
-#| "Are you sure?"
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"Lozinka mora imati najmanje 5 karaktera.\n"
-"Molimo pokušajte ponovo."
-
-# / yes-no popup contents
-#. last part of message popup
-#. last part of message popup
-#. 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:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-#, fuzzy
-msgid "Really use this password?"
-msgstr "Da li zaista želite obrisati ovu grupu?"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-msgid "Initialization of module for configuration of authentication..."
-msgstr ""
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-#, fuzzy
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"Paket %1 nije instaliran.\n"
-"Instalirati sada?"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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 ""
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55
-#: src/include/users/helps.rb:56
-msgid "MD5"
-msgstr ""
-
-#. encryption type
-#. encryption type
-#: 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:95 src/clients/users_proposal.rb:59
-msgid "SHA-512"
-msgstr ""
-
-#. frame label
-#: src/clients/inst_user_first.rb:143
-#, fuzzy
-msgid "Password Encryption Type"
-msgstr "Ključ &enkripcije"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: 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:151 src/include/users/widgets.rb:515
-msgid "&MD5"
-msgstr ""
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha256 crypt
-#: 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:155 src/include/users/widgets.rb:528
-msgid "SHA-&512"
-msgstr ""
-
-# congratulation text 1/4
-# congratulation text 1/4
-#. help text for dialog "User Authentication Method" 1/2
-#: src/clients/inst_user_first.rb:162
-#, fuzzy
-msgid "<p><b>Authentication</b><br></p>"
-msgstr "<p><b>Čestitamo!</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-#, fuzzy
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Potrebna je lozinka"
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: 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:223 src/include/users/dialogs.rb:403
-#, fuzzy
-msgid "User's &Full Name"
-msgstr "Korisničko ime"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-#, fuzzy
-msgid "&Username"
-msgstr "&Korisničko ime:"
-
-# Title for root-password dialogue
-# Title for root-password dialogue
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-#, fuzzy
-msgid "U&se this password for system administrator"
-msgstr "Lozinka za \"root\", administratora sistema"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-#, fuzzy
-msgid "Receive S&ystem Mail"
-msgstr "MX -- Prenosnik pošte"
-
-# checkbox label
-# checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-#, fuzzy
-msgid "&Automatic Login"
-msgstr "Auto &Korisnički login:"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-#, fuzzy
-msgid "Create New User"
-msgstr "Korisnički definisano"
-
-# 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
-# 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
-#. yes-no popup headline
-#. 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:342 src/include/users/dialogs.rb:1112
-#, fuzzy
-msgid "Empty User Login"
-msgstr "Prazan &Korisnički login:"
-
-# yes-no popup contents
-# yes-no popup contents
-#. yes-no popup contents
-#. yes-no popup contents
-#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114
-#, fuzzy
-msgid ""
-"Leaving the user name empty only makes sense\n"
-"in a network environment with an authentication server.\n"
-"Leave it empty?"
-msgstr "Ostavljanje korisničkog imena praznog je razumo samo u mrežnom okruženju sa serverom za autentifikaciju."
-
-# Provider dialog help 4/5 (general)
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212
-#, fuzzy
-msgid ""
-"<p>\n"
-"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>Ukucajte <b>Korisničko ime</b> i\n"
-"<b>Lozinku</b> za korišćenje prilikom logovanja (pitajte provajdera ako niste sigurni).</p>"
-
-# help text 1/4
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-#, fuzzy
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Sva pravila lozinke korisnika za primer može biti primenjena i na \"root\" lozinku:\n"
-"morate razlikovati velika mala slova; lozinka treba biti najmanje\n"
-"5 karaktera dugačka, i kao pravilo, ne smije sadržavati nikakve specijalne karaktere\n"
-"(npr. naglašena slova).\n"
-"</p>"
-
-#. 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:457 src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-
-# yes/no popup text
-# yes/no popup text
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-#, fuzzy
-#| msgid ""
-#| "The password should have at least five characters.\n"
-#| "Are you sure?"
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"Lozinka mora imati najmanje 5 karaktera.\n"
-"Molimo pokušajte ponovo."
-
-# help text 4/4
-# help text 4/4
-#. help text for main add user dialog
-#. help text 4/4
-#: 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"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Mogući karakteri su\n"
-"<tt>#*,.;:._-+!$</tt><tt>%&/|?{[()]}</tt> i prazna mesta i brojevi\n"
-"<tt>0</tt> do <tt>9</tt>.\n"
-"Nije dovoljno koristiti lozinku sa prosječnom dužinom 8 alfa-numeričkih\n"
-"karaktera. Kako bi se osigurali da je lozinka unešena ispravno, pitani ste da\n"
-"je ponovite tačno u drugom polju. Budite sigurni da ne zaboravite vašu lozinku!\n"
-"</p>\n"
-
-# help text 2/7
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:476
-#, fuzzy
-msgid ""
-"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Takozvano korisničko ime je napravljeno od delova punog imena i\n"
-"predloženo je vama u jednom od sledećih dijaloga. Ako ste nesigurni, pustite da\n"
-"YaST2 <tt>predloži</tt> korisničko ime. Možete ga promeniti, ali koristite samo\n"
-"<em>mala</em> slova (bez naglašenih karaktera!), brojeve i <tt>._-</tt>\n"
-"- da, korisnička imena imaju veća ograničenja nego lozinke!\n"
-"</p>"
-
-#. help text for main add user dialog
-#: 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 ""
-
-#. 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: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"
-msgstr ""
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: 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"
-msgstr ""
-
-#. 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:573
-#, fuzzy
-msgid "Expert Settings"
-msgstr "<p><b>Napredne opcije</b></p>"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-msgid "The authentication method is local /etc/passwd."
-msgstr ""
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-#, fuzzy
-msgid "The password encryption method is %s."
-msgstr "Potrebna je lozinka"
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] ""
-msgstr[1] ""
-
-# button label
-# button label
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-#, fuzzy
-#| msgid "&Configure..."
-msgid "&Change..."
-msgstr "&Promeni..."
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-msgid "Summary"
-msgstr ""
-
-# yes/no popup text
-# yes/no popup text
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-#, fuzzy
-#| msgid ""
-#| "The password should have at least five characters.\n"
-#| "Are you sure?"
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Lozinka mora imati najmanje 5 karaktera.\n"
-"Molimo pokušajte ponovo."
-
# translators: command line help text for Users module
# translators: command line help text for Users module
#. translators: command line help text for Users module
@@ -995,12 +307,6 @@
msgid "New UID of the user"
msgstr "Korisnički definisano"
-#. progress step title
-#: src/clients/users_finish.rb:63
-#, fuzzy
-msgid "Writing Users Configuration..."
-msgstr "Snimanje imena servera i DNS podešavanja..."
-
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -1253,107 +559,6 @@
msgid "Seconds"
msgstr ""
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "&LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-#, fuzzy
-msgid "NIS"
-msgstr "NIS Domen"
-
-# text entry
-#. authentication type
-#: src/clients/users_proposal.rb:46
-#, fuzzy
-msgid "Samba (Windows Domain)"
-msgstr "&Domen"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-msgid "<%1>Root Password<%2> set"
-msgstr ""
-
-#: src/clients/users_proposal.rb:74
-msgid "<%1>Root Password<%2> not set"
-msgstr ""
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-msgid "No <%1>user<%2> configured"
-msgstr ""
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "Korisnička autorizacija korišćenjem MD5 zbirke autorizacija"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr ""
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr ""
-
-#. summary line, <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-msgid "<%1>User<%2> %3 will be imported."
-msgstr ""
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-msgid "<%1>User<%2> %3 configured"
-msgstr ""
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr ""
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-#, fuzzy
-msgid "Password Encryption Method: %1"
-msgstr "Ključ &enkripcije"
-
-# Password dialog caption
-#. rich text label
-#: src/clients/users_proposal.rb:170
-#, fuzzy
-msgid "User Settings"
-msgstr "Setovanja Lozinke"
-
-# radiobutton
-#. menu button label
-#: src/clients/users_proposal.rb:173
-#, fuzzy
-#| msgid "&Users"
-msgid "&User"
-msgstr "&Korisnici"
-
-# User account information, first version of group password
-# User account information, first version of group password
-#. menu button label
-#: src/clients/users_proposal.rb:175
-#, fuzzy
-#| msgid "&Enter a Password"
-msgid "&Root Password"
-msgstr "&Unesite lozinku:"
-
#. password entering label
#: src/include/users/cmdline.rb:55
#, fuzzy
@@ -1539,6 +744,24 @@
"enter the user's current password."
msgstr ""
+# error popup
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:471
+#, fuzzy
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr "Lozinka ne sme da bude prazna."
+
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -1563,6 +786,14 @@
msgid "&Change directory owner"
msgstr "Home direktorijum: %1"
+#. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:583
+#, fuzzy
+msgid "User's &Full Name"
+msgstr "Korisničko ime"
+
# text entry
#. text entry
#: src/include/users/dialogs.rb:411
@@ -1583,6 +814,20 @@
msgid "For remote users, only additional group memberships can be changed."
msgstr ""
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:590
+#, fuzzy
+msgid "&Username"
+msgstr "&Korisničko ime:"
+
+#. checkbox label
+#: src/include/users/dialogs.rb:446
+#, fuzzy
+msgid "Receive S&ystem Mail"
+msgstr "MX -- Prenosnik pošte"
+
# checkbox label
# checkbox label
#. checkbox label
@@ -1591,6 +836,16 @@
msgid "A&utomatic Login"
msgstr "Auto &Korisnički login:"
+# Title for root-password dialogue
+# Title for root-password dialogue
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:614
+#, fuzzy
+msgid "U&se this password for system administrator"
+msgstr "Lozinka za \"root\", administratora sistema"
+
# check box label
# check box label
#. check box label
@@ -1804,6 +1059,42 @@
msgid "Plu&g-Ins"
msgstr ""
+# 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
+# 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
+#. 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/include/users/dialogs.rb:1112
+#, fuzzy
+msgid "Empty User Login"
+msgstr "Prazan &Korisnički login:"
+
+# yes-no popup contents
+# yes-no popup contents
+#. yes-no popup contents
+#: src/include/users/dialogs.rb:1114
+#, fuzzy
+msgid ""
+"Leaving the user name empty only makes sense\n"
+"in a network environment with an authentication server.\n"
+"Leave it empty?"
+msgstr "Ostavljanje korisničkog imena praznog je razumo samo u mrežnom okruženju sa serverom za autentifikaciju."
+
+# / yes-no popup contents
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:483
+#, fuzzy
+msgid "Really use this password?"
+msgstr "Da li zaista želite obrisati ovu grupu?"
+
# Proposal for home directory of uml user
#. popup question
#: src/include/users/dialogs.rb:1308
@@ -1917,6 +1208,20 @@
msgid "Group &Data"
msgstr "ID Grupe"
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+msgid "DES"
+msgstr ""
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+msgid "MD5"
+msgstr ""
+
# help text 1/4
#. help text 1/4
#: src/include/users/helps.rb:62
@@ -1934,6 +1239,34 @@
"(npr. naglašena slova).\n"
"</p>"
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+
+# help text 4/4
+# help text 4/4
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Mogući karakteri su\n"
+"<tt>#*,.;:._-+!$</tt><tt>%&/|?{[()]}</tt> i prazna mesta i brojevi\n"
+"<tt>0</tt> do <tt>9</tt>.\n"
+"Nije dovoljno koristiti lozinku sa prosječnom dužinom 8 alfa-numeričkih\n"
+"karaktera. Kako bi se osigurali da je lozinka unešena ispravno, pitani ste da\n"
+"je ponovite tačno u drugom polju. Budite sigurni da ne zaboravite vašu lozinku!\n"
+"</p>\n"
+
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -2074,6 +1407,19 @@
"<p>Ukucajte <b>Korisničko ime</b> i\n"
"<b>Lozinku</b> za korišćenje prilikom logovanja (pitajte provajdera ako niste sigurni).</p>"
+# Provider dialog help 4/5 (general)
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
+#, fuzzy
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>Ukucajte <b>Korisničko ime</b> i\n"
+"<b>Lozinku</b> za korišćenje prilikom logovanja (pitajte provajdera ako niste sigurni).</p>"
+
# help text 2/7
#. help text 2/7
#: src/include/users/helps.rb:226
@@ -2117,6 +1463,21 @@
"- da, korisnička imena imaju veća ograničenja nego lozinke!\n"
"</p>"
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
+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"
+msgstr ""
+
+#. help text 5/7 (only during installation)
+#: 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"
+msgstr ""
+
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2772,7 +2133,8 @@
msgstr "Maskiraj korisnike"
#. the type of user set
-#: src/include/users/widgets.rb:79
+#. New user is the default option
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
#, fuzzy
msgid "Local Users"
msgstr "Lista svih korinsika"
@@ -2867,6 +2229,12 @@
msgstr "<p><b>Korisnici i grupe</b></p>"
#. richtext label
+#: src/include/users/widgets.rb:136
+#, fuzzy
+msgid "NIS"
+msgstr "NIS Domen"
+
+#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr ""
@@ -2890,6 +2258,12 @@
msgid "&SSSD"
msgstr ""
+# just the name (do not translate)
+#. menubutton label
+#: src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "&Samba"
+
# radiobutton
#. tab header
#: src/include/users/widgets.rb:168
@@ -3023,6 +2397,11 @@
"</p>"
msgstr ""
+#. Help text for password expert dialog 4/5
+#: 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 ""
+
#. Label
#: src/include/users/widgets.rb:499
#, fuzzy
@@ -3035,6 +2414,26 @@
msgid "Encryption Type"
msgstr "Tip arhiva"
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr ""
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr ""
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr ""
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr ""
+
#. help text 1/3
#: src/include/users/widgets.rb:582
msgid ""
@@ -3351,6 +2750,12 @@
#. type of user/group
#. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "&LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
msgid "System"
msgstr "Sistem"
@@ -3705,6 +3110,16 @@
"Paket %1 nije instaliran.\n"
"Instalirati sada?"
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+#, fuzzy
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"Paket %1 nije instaliran.\n"
+"Instalirati sada?"
+
# dialog caption
# dialog caption
#. dialog caption
@@ -3727,6 +3142,450 @@
"YaST2\n"
"Inicijalizovanje..."
+# yes/no popup text
+# yes/no popup text
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+#, fuzzy
+#| msgid ""
+#| "The password should have at least five characters.\n"
+#| "Are you sure?"
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Lozinka mora imati najmanje 5 karaktera.\n"
+"Molimo pokušajte ponovo."
+
+# yes/no popup text
+# yes/no popup text
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+#, fuzzy
+#| msgid ""
+#| "The password should have at least five characters.\n"
+#| "Are you sure?"
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"Lozinka mora imati najmanje 5 karaktera.\n"
+"Molimo pokušajte ponovo."
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+#, fuzzy
+msgid "Writing Users Configuration..."
+msgstr "Snimanje imena servera i DNS podešavanja..."
+
+#. Copyright (c) 2016 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+#, fuzzy
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Potrebna je lozinka"
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr ""
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+#, fuzzy
+msgid "Password Encryption Type"
+msgstr "Ključ &enkripcije"
+
+# advise user to remember his new password
+# advise user to remember his new password
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+msgid "Do not forget what you enter here."
+msgstr "Nemojte zaboraviti što ste uneli ovdje!"
+
+# translators: command line help text for add option
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+#, fuzzy
+msgid "&Password for root User"
+msgstr "Setovanje password-a za korisnika %1:"
+
+# text entry label
+# text entry label
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+#, fuzzy
+msgid "Con&firm Password"
+msgstr "&Lozinka:"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+msgid "&Test Keyboard Layout"
+msgstr ""
+
+# help text ( explain what the user "root" is and does ) 1/5
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+#, fuzzy
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Za razliku od normalnih korisnika sistema, koji za primer pišu tekstove, prave\n"
+"grafiku ili koriste Internet, korisnik \"root\" postoji na\n"
+"svakom sistemu i pozivan je za akciju kad god su\n"
+"potrebni da se obave administrativni poslovi. Drugim rečima, prijavljujte\n"
+"se kao root kada trebate, ili želite, biti sistemskii administrator, i samo tada.\n"
+"</p>"
+
+# help text, continued 2/5
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+#, fuzzy
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Zato što je root korisnik opremljen sa svim dozvolama, lozinka\n"
+"za \"root\" treba biti pažljivo odabrana. Kombinacija slova i brojeva\n"
+"je preporučena. Kako bi osigurali da je lozinka unešena ispravno, pitani\n"
+"ste da ponovite proces u sledećem polju.\n"
+"</p>"
+
+# help text, continued 3/5
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+#, fuzzy
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Sva pravila lozinke korisnika za primer može biti primjenjena i na \"root\" lozinku:\n"
+"morate razlikovati velika i mala slova; lozinka treba biti najmanje\n"
+"5 karaktera dugačka, i kao pravilo, ne sme sadržavati nikakve specijalne karaktere\n"
+"(npr. naglašena slova).\n"
+"</p>"
+
+# help text, continued
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+#, fuzzy
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ne zaboravite ovu lozinku!\n"
+"</p>"
+
+# Title for root-password dialogue
+# Title for root-password dialogue
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+#, fuzzy
+msgid "Password for the System Administrator \"root\""
+msgstr "Lozinka za \"root\", administratora sistema"
+
+#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+#, fuzzy
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr "Potrebna je lozinka"
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:134
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+msgid "Create new user"
+msgstr "Korisnički definisano"
+
+# help text 1/4
+#: src/lib/users/dialogs/inst_user_first.rb:142
+#, fuzzy
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Sva pravila lozinke korisnika za primer može biti primenjena i na \"root\" lozinku:\n"
+"morate razlikovati velika mala slova; lozinka treba biti najmanje\n"
+"5 karaktera dugačka, i kao pravilo, ne smije sadržavati nikakve specijalne karaktere\n"
+"(npr. naglašena slova).\n"
+"</p>"
+
+# error popup
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:149
+#, fuzzy
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"Lozinka mora biti između %i i %i karaktera po dužini.\n"
+"Molimo pokušajte ponovo.\n"
+
+# help text 2/7
+#: src/lib/users/dialogs/inst_user_first.rb:165
+#, fuzzy
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Takozvano korisničko ime je napravljeno od delova punog imena i\n"
+"predloženo je vama u jednom od sledećih dijaloga. Ako ste nesigurni, pustite da\n"
+"YaST2 <tt>predloži</tt> korisničko ime. Možete ga promeniti, ali koristite samo\n"
+"<em>mala</em> slova (bez naglašenih karaktera!), brojeve i <tt>._-</tt>\n"
+"- da, korisnička imena imaju veća ograničenja nego lozinke!\n"
+"</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:172
+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 ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+msgid "Import User Data from a Previous Installation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:184
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:193
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:275
+#, fuzzy
+msgid "Local User"
+msgstr "Lista svih korinsika"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:330
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:387
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:514
+#, fuzzy
+msgid "&Create New User"
+msgstr "Korisnički definisano"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:537
+msgid "&Import User Data from a Previous Installation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:547
+#, fuzzy
+msgid "Choose Users"
+msgstr "Maskiraj korisnike"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:563
+msgid "&Skip User Creation"
+msgstr ""
+
+# checkbox label
+# checkbox label
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:619
+#, fuzzy
+msgid "&Automatic Login"
+msgstr "Auto &Korisnički login:"
+
+#: src/lib/users/dialogs/inst_user_first.rb:626
+#, fuzzy
+msgid "No users selected"
+msgstr "Nije naveden menadžer štampanja."
+
+#: src/lib/users/dialogs/inst_user_first.rb:628
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+#, fuzzy
+msgid "&Select Users to Read"
+msgstr "Promena Postojećeg Sistemskog korisnika"
+
+# push button label
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+#, fuzzy
+msgid "Select or Deselect &All"
+msgstr "Selektuj ili deselektuj &datoteku"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+msgid "SHA-256"
+msgstr ""
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+msgid "SHA-512"
+msgstr ""
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "Ključ &enkripcije"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+msgid "Password &Encryption Type"
+msgstr "Ključ &enkripcije"
+
+# Password dialog caption
+#. rich text label
+#: src/lib/users/proposal.rb:75
+#, fuzzy
+msgid "User Settings"
+msgstr "Setovanja Lozinke"
+
+# radiobutton
+#. menu button label
+#: src/lib/users/proposal.rb:78
+#, fuzzy
+#| msgid "&Users"
+msgid "&User"
+msgstr "&Korisnici"
+
+# User account information, first version of group password
+# User account information, first version of group password
+#. menu button label
+#: src/lib/users/proposal.rb:80
+#, fuzzy
+#| msgid "&Enter a Password"
+msgid "&Root Password"
+msgstr "&Unesite lozinku:"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+msgid "<%1>Root Password<%2> set"
+msgstr ""
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+msgid "<%1>Root Password<%2> not set"
+msgstr ""
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+msgid "No <%1>user<%2> configured"
+msgstr ""
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+msgid "<%1>User<%2> %3 configured"
+msgstr ""
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr ""
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "Ključ &enkripcije"
+
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
#, fuzzy
@@ -4232,7 +4091,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:722
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -4244,24 +4103,24 @@
msgstr ""
#. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:970
msgid "Multiple users satisfy the input conditions."
msgstr ""
#. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1548
#, fuzzy
msgid "Initializing User and Group Configuration"
msgstr "Inicijalizacija konfiguracije TV i Radio Karte"
#. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1555
#, fuzzy
msgid "Read the default login settings"
msgstr "Ne mogu da pročitam trenutna podešavanja."
#. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1557
#, fuzzy
msgid "Read the default system settings"
msgstr "Ne mogu da pročitam trenutna podešavanja."
@@ -4269,36 +4128,36 @@
# progress stage label
# progress stage label
#. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1559
msgid "Read the configuration type"
msgstr "Čitam tip konfiguracije"
# progress stage label
# progress stage label
#. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1561
msgid "Read the user custom settings"
msgstr "Čitam korisnikovo setovanje:"
#. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1563
#, fuzzy
msgid "Read users and groups"
msgstr "Podešavanja korisnika i grupa"
#. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1565
#, fuzzy
msgid "Build the cache structures"
msgstr "Podešavam keš memoriju linkera"
#. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1569
msgid "Reading the default login settings..."
msgstr ""
#. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1571
#, fuzzy
msgid "Reading the default system settings..."
msgstr "Ne mogu da pročitam trenutna podešavanja."
@@ -4306,26 +4165,26 @@
# progress step label
# progress step label
#. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1573
msgid "Reading the configuration type..."
msgstr "Čitam itip konfiguracije..."
# progress step label
# progress step label
#. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1575
msgid "Reading custom settings..."
msgstr "Čitam setovanja..."
# progress step label
# progress step label
#. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1577
msgid "Reading users and groups..."
msgstr "Čitam informacije o korisnicima i grupama..."
#. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1579
#, fuzzy
msgid "Building the cache structures..."
msgstr "Pravim direktorij image..."
@@ -4333,7 +4192,7 @@
# progress step
# final progress step label
#. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
msgid "Finished"
msgstr "&Završeno"
@@ -4341,50 +4200,50 @@
# %1 is a name of an init script in /etc/init.d,
# eg. nfsserver
#. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2137
#, fuzzy
msgid "User does not exist."
msgstr "Servis %1 ne postoji."
#. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2389
#, fuzzy
msgid "Group does not exist."
msgstr "Posao %1 ne postoji."
#. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4258
#, fuzzy
msgid "Writing User and Group Configuration"
msgstr "Snimanje imena servera i DNS podešavanja..."
#. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4267
#, fuzzy
msgid "Write LDAP users and groups"
msgstr "Konfiguracija L&DAP korisnika i Grupa"
#. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4269
#, fuzzy
msgid "Write groups"
msgstr "&RPM Grupe"
#. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4271
#, fuzzy
msgid "Check for deleted users"
msgstr "- Proveri ažurne dodatke"
#. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4273
#, fuzzy
msgid "Write users"
msgstr "Maskiraj korisnike"
# progress stage label
#. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4275
#, fuzzy
msgid "Write passwords"
msgstr "Izmene lozinki"
@@ -4392,79 +4251,79 @@
# progress stage label
# progress stage label
#. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4277
msgid "Write the custom settings"
msgstr "Snimite vaše setovanje:"
#. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4279
#, fuzzy
msgid "Write the default login settings"
msgstr "Snimi Kerberos klijent podešavanja"
#. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4282
#, fuzzy
msgid "Writing LDAP users and groups..."
msgstr "Konfiguracija L&DAP korisnika i Grupa"
#. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4284
#, fuzzy
msgid "Writing groups..."
msgstr "&RPM Grupe"
#. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4286
#, fuzzy
msgid "Checking deleted users..."
msgstr "<p><b>Korisnici i grupe</b></p>"
#. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4288
#, fuzzy
msgid "Writing users..."
msgstr "Maskiraj korisnike"
#. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4290
#, fuzzy
msgid "Writing passwords..."
msgstr "Izmene lozinki"
#. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4292
#, fuzzy
msgid "Writing the custom settings..."
msgstr "Čitam setovanja..."
#. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4294
#, fuzzy
msgid "Writing the default login settings..."
msgstr "Snimanje Kerberos klijent podešavanja"
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4379
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
#, fuzzy
msgid "An error occurred while removing users."
msgstr "Greška se dogodila prilikom snimanja datoteke."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr ""
#. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4565
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
@@ -4472,19 +4331,19 @@
# error report
#. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
#, fuzzy
msgid "An error occurred while setting forwarding for root's mail."
msgstr "Dogodila se greška podešavanja zaštitnog zida."
#. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4843
#, fuzzy
msgid "No UID is available for this type of user."
msgstr "Nema PPD fajla za izabrani model"
#. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4874
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4494,7 +4353,7 @@
# error popup
# error popup
#. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4905
#, fuzzy
msgid ""
"The user ID entered is already in use.\n"
@@ -4502,7 +4361,7 @@
msgstr "Tačka montiranja se već koristi, molimo izaberite drugo mesto montiranja"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4918
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4511,7 +4370,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4933
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4520,7 +4379,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4947
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4528,7 +4387,7 @@
"Really change the user type to 'system'?"
msgstr ""
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4981
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
@@ -4536,7 +4395,7 @@
# error popup
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4985
#, fuzzy
msgid ""
"There is a conflict between the entered\n"
@@ -4549,14 +4408,14 @@
"Molimo pokušajte sa nekim drugim.\n"
#. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5015
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
msgstr ""
#. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5022
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4566,7 +4425,7 @@
# error popup
# error popup
#. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5085
#, fuzzy
msgid ""
"The home directory may only contain the following characters:\n"
@@ -4578,7 +4437,7 @@
"Molimo pokušajte ponovo."
#. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5108
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4587,7 +4446,7 @@
# error message
#. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5119
#, fuzzy
msgid ""
"The home directory is used by another user.\n"
@@ -4598,7 +4457,7 @@
# yes/no popup: user seleceted something strange as a home directory
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5161
#, fuzzy
msgid ""
"The path for the selected home directory already exists,\n"
@@ -4609,7 +4468,7 @@
"Molimo pokušajte ponovo.\n"
#. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5172
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4618,7 +4477,7 @@
# yes/no popup: user seleceted something strange as a home directory
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5179
#, fuzzy, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4629,7 +4488,7 @@
"Molimo pokušajte ponovo.\n"
#. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5188
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4639,20 +4498,20 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5216
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
msgstr ""
#. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5236
#, fuzzy
msgid "No GID is available for this type of group."
msgstr "Nema modula u ovoj grupi."
#. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5269
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4662,7 +4521,7 @@
# error popup
# error popup
#. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5299
#, fuzzy
msgid ""
"The group ID entered is already in use.\n"
@@ -4670,7 +4529,7 @@
msgstr "Tačka montiranja se već koristi, molimo izaberite drugo mesto montiranja"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5311
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4679,7 +4538,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5326
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4688,7 +4547,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5340
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4698,7 +4557,7 @@
# error popup
#. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5359
#, fuzzy
msgid ""
"No group name entered.\n"
@@ -4709,7 +4568,7 @@
# error popup
#. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5376
#, fuzzy, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4720,7 +4579,7 @@
# error popup
#. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5389
#, fuzzy
msgid ""
"The group name may contain only\n"
@@ -4735,7 +4594,7 @@
# error popup
#. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5397
#, fuzzy
msgid ""
"There is a conflict between the entered\n"
@@ -4750,13 +4609,13 @@
# Error message.
# %1 is a name of an init script in /etc/init.d,
# eg. nfsserver
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5513
#, fuzzy, perl-format
msgid "User %s does not exist."
msgstr "Servis %1 ne postoji."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5567
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4764,7 +4623,7 @@
msgstr ""
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5574
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4772,13 +4631,13 @@
msgstr ""
#. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6587
#, fuzzy
msgid "<h3>Users</h3>"
msgstr "Maskiraj korisnike"
#. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6597
#, fuzzy
msgid "<h3>Groups</h3>"
msgstr "&RPM Grupe"
@@ -4786,13 +4645,13 @@
# congratulation text 1/4
# congratulation text 1/4
#. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6608
#, fuzzy
msgid "<h3>Login Settings</h3>"
msgstr "<p><b>Čestitamo!</b></p>"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6610
msgid "User %1 configured for automatic login"
msgstr ""
@@ -4815,23 +4674,23 @@
"na LDAP serveru. Kreirati jedan sada?\n"
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
#, fuzzy
#| msgid "User and Group Configuration"
msgid "Kerberos Configuration"
msgstr "Konfiguracija Korisnika i Grupa"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
msgid "No Kerberos Management for Groups"
msgstr ""
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
msgid "Manage Kerberos Principials"
msgstr ""
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
msgid "Cannot execute kadmin.local."
msgstr ""
@@ -4961,7 +4820,7 @@
# error popup
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:505
+#: src/modules/UsersSimple.pm:379
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -4973,7 +4832,7 @@
"Molimo pokušajte ponovo."
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4985,7 +4844,7 @@
# error popup
# error popup
#. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
#, fuzzy
msgid ""
"The user's full name cannot contain\n"
@@ -4996,37 +4855,37 @@
"Molimo pokušajte ponovo."
#. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
msgid "You have used the group name as a part of the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
msgid "You have used the username as a part of the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
msgid "You have used only lowercase letters for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
msgid "You have used only uppercase letters for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
msgid "You have used a palindrome for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
msgid "You have used only digits for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
#, perl-format
msgid ""
"The password is too long for the current encryption method.\n"
@@ -5034,7 +4893,7 @@
msgstr ""
#. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
#, perl-format
msgid ""
"The password is too simple:\n"
@@ -5044,7 +4903,7 @@
# yes/no popup text
# yes/no popup text
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
#, fuzzy, perl-format
#| msgid ""
#| "The password should have at least five characters.\n"
@@ -5057,7 +4916,7 @@
# error popup
# error popup
#. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
#, fuzzy
msgid ""
"No username entered.\n"
@@ -5068,7 +4927,7 @@
# error popup
#. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
#, fuzzy, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -5079,7 +4938,7 @@
# error popup
#. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
#, fuzzy
msgid ""
"The username may contain only\n"
@@ -5094,7 +4953,7 @@
# error popup
#. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
#, fuzzy
msgid ""
"There is a conflict between the entered\n"
@@ -5106,15 +4965,13 @@
"\n"
"Molimo pokušajte sa nekim drugim.\n"
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
msgid "Retrieving %1 extension..."
msgstr ""
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
msgid "Releasing %1 extension..."
msgstr ""
@@ -5216,6 +5073,95 @@
msgstr ""
#, fuzzy
+#~ msgid "User Authentication Method"
+#~ msgstr "Korisnička autorizacija korišćenjem MD5 zbirke autorizacija"
+
+#, fuzzy
+#~ msgid "&LDAP"
+#~ msgstr "&Koristi LDAP"
+
+#, fuzzy
+#~ msgid "N&IS"
+#~ msgstr "Vrednost %1 je nepravilna."
+
+# text entry
+#, fuzzy
+#~ msgid "&Windows Domain"
+#~ msgstr "&Domen"
+
+#, fuzzy
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "Nepostojeća putanja rezervne kopije"
+
+# type of item (displayed in the table)
+#, fuzzy
+#~ msgid "eDirectory LDAP"
+#~ msgstr "&Direktorijum:"
+
+# pushbutton label
+# choose a host from a list
+# appears in help text too
+#, fuzzy
+#~ msgid "&Choose"
+#~ msgstr "&Izaberi"
+
+#, fuzzy
+#~ msgid "Authentication Method"
+#~ msgstr "Korisnička autorizacija korišćenjem MD5 zbirke autorizacija"
+
+# translators: command line help text for pam action
+#, fuzzy
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "Uključi ili isključi Kerberos autorizaciju"
+
+#, fuzzy
+#~ msgid "E&xpert Options..."
+#~ msgstr "<p><b>Napredne opcije</b></p>"
+
+# yes/no popup text
+# yes/no popup text
+#, fuzzy
+#~| msgid ""
+#~| "The password should have at least five characters.\n"
+#~| "Are you sure?"
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "Lozinka mora imati najmanje 5 karaktera.\n"
+#~ "Molimo pokušajte ponovo."
+
+# congratulation text 1/4
+# congratulation text 1/4
+#, fuzzy
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>Čestitamo!</b></p>"
+
+#, fuzzy
+#~ msgid "Expert Settings"
+#~ msgstr "<p><b>Napredne opcije</b></p>"
+
+#, fuzzy
+#~ msgid "The password encryption method is %s."
+#~ msgstr "Potrebna je lozinka"
+
+# button label
+# button label
+#, fuzzy
+#~| msgid "&Configure..."
+#~ msgid "&Change..."
+#~ msgstr "&Promeni..."
+
+# text entry
+#, fuzzy
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "&Domen"
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "Korisnička autorizacija korišćenjem MD5 zbirke autorizacija"
+
+#, fuzzy
#~ msgid "No Password Entered"
#~ msgstr "Potrebna je lozinka"
@@ -5652,15 +5598,6 @@
#~ msgid "Cannot write %s file."
#~ msgstr "&Nemogu da upišem fajl %s."
-# error popup
-#, fuzzy
-#~ msgid ""
-#~ "The password must have between %i and %i characters.\n"
-#~ "Try again."
-#~ msgstr ""
-#~ "Lozinka mora biti između %i i %i karaktera po dužini.\n"
-#~ "Molimo pokušajte ponovo.\n"
-
# popup question: user didn't enter password
#, fuzzy
#~ msgid ""
Modified: trunk/yast/sr@Latn/po/vm.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/vm.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/vm.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -31,12 +31,12 @@
msgstr "Konfigurisanje Opštih setovanja"
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr ""
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -45,172 +45,172 @@
# progress stages
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
#, fuzzy
msgid "Verify Installed Packages"
msgstr "&Instaliraj pakete"
# Wireless dialog caption
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
#, fuzzy
msgid "Network Bridge Configuration"
msgstr "Podešavanje bežične mrežne kartice"
# description of configuration object
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
#, fuzzy
msgid "Configuring the VM Server (domain 0)"
msgstr "Podešavanje alata za upravljanje korisnicima"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr ""
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr ""
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr ""
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr ""
#. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
#, fuzzy
msgid "The installation will be aborted."
msgstr "Instalacioni proces prekinut."
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
msgid "Choose Hypervisor(s) to install"
msgstr ""
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
msgid "Server: Minimal system to get a running Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
#, fuzzy
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "Konfigurisanje Opštih setovanja"
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
msgid "KVM Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
msgid "KVM server"
msgstr ""
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
msgid "KVM tools"
msgstr ""
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
msgid "libvirt LXC containers"
msgstr ""
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
msgid "libvirt LXC daemon"
msgstr ""
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
msgid "Software to connect to Virtualization server"
msgstr ""
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
#, fuzzy
msgid "Virtualization client tools"
msgstr "Vizualizacija"
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
msgid "Xen Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
#, fuzzy
msgid "Xen server"
msgstr "Sačuvaj Sadašnje"
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
msgid "Xen tools"
msgstr ""
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
#, fuzzy
msgid "Package installation failed\n"
msgstr "Instalacioni proces prekinut."
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
#, fuzzy
msgid "Package installation failed for lxc\n"
msgstr "Instalacioni proces prekinut."
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
msgid "Package installation failed for sled client pattern\n"
msgstr ""
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
msgid "Package installation failed for sles patterns\n"
msgstr ""
#. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
msgid "Running in text mode. Install graphical components anyway?"
msgstr ""
# module method progress label
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
#, fuzzy
msgid "Checking packages..."
msgstr "Provera paketa..."
# summary header
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
msgid "Installing packages..."
msgstr "&Instalacija paketa..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
msgid "Cannot install required packages."
msgstr "Nisam uspeo da instaliram potrebne pakete."
# Progress stage 3/10 - multiple devices may be present,really plural
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
#, fuzzy
msgid "Updating grub2 configuration files..."
msgstr "Snimanje podešavanja uređaja"
# PushButton label
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
#, fuzzy
msgid "Configuring Default Network Bridge..."
msgstr "&Podešavanje mrežne kartice"
# screen title for uml options
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
#, fuzzy
#| msgid "Network Settings"
msgid "Network Bridge."
msgstr "Setovanje Mreže"
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr ""
@@ -223,27 +223,27 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
msgstr ""
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
msgid "Xen Hypervisor and tools are installed."
msgstr ""
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
msgid "Virtualization client tools are installed."
msgstr ""
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
msgid "Libvirt LXC components are installed."
msgstr ""
Modified: trunk/yast/sr@Latn/po/vpn.sr@Latn.po
===================================================================
--- trunk/yast/sr@Latn/po/vpn.sr@Latn.po 2016-09-03 12:12:46 UTC (rev 96731)
+++ trunk/yast/sr@Latn/po/vpn.sr@Latn.po 2016-09-03 12:13:51 UTC (rev 96732)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-09-28 18:17+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -198,12 +198,12 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
msgid "The user name is already used."
msgstr ""
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
msgid "Cannot find a matching client connection."
msgstr ""
@@ -284,102 +284,102 @@
msgstr ""
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
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
+#: src/lib/vpn/main_dialog.rb:365
msgid "Name"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
msgid "Description"
msgstr ""
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
msgid "All IPv6 networks (::/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
msgid "Connection name: "
msgstr ""
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
msgid "Type"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
msgid "Gateway (Server)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
msgid "Client"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
msgid "The scenario is"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
msgid "Secure communication with a certificate"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
msgid "Edit Credentials"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
msgid "The gateway requires authentication"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
msgid "By a certificate"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
msgid "VPN gateway IP"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -464,32 +464,32 @@
msgstr ""
#. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
msgid "Failed to install IPSec packages."
msgstr ""
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
msgid "Failed to start IPSec daemon."
msgstr ""
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr ""
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
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
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
msgid "Failed to restart SuSE firewall."
msgstr ""
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
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"
@@ -497,28 +497,28 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
msgid "VPN Global Settings"
msgstr ""
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
msgid "Enable VPN (IPSec) daemon: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
msgid "Gateway and Connections"
msgstr ""
#. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
msgid "A client connecting to "
msgstr ""
1
0
03 Sep '16
Author: minton
Date: 2016-09-03 14:12:46 +0200 (Sat, 03 Sep 2016)
New Revision: 96731
Modified:
trunk/yast/pt_BR/po/add-on.pt_BR.po
trunk/yast/pt_BR/po/auth-client.pt_BR.po
trunk/yast/pt_BR/po/auth-server.pt_BR.po
trunk/yast/pt_BR/po/autoinst.pt_BR.po
trunk/yast/pt_BR/po/base.pt_BR.po
trunk/yast/pt_BR/po/bootloader.pt_BR.po
trunk/yast/pt_BR/po/ca-management.pt_BR.po
trunk/yast/pt_BR/po/cio.pt_BR.po
trunk/yast/pt_BR/po/cluster.pt_BR.po
trunk/yast/pt_BR/po/control.pt_BR.po
trunk/yast/pt_BR/po/country.pt_BR.po
trunk/yast/pt_BR/po/crowbar.pt_BR.po
trunk/yast/pt_BR/po/dhcp-server.pt_BR.po
trunk/yast/pt_BR/po/dns-server.pt_BR.po
trunk/yast/pt_BR/po/docker.pt_BR.po
trunk/yast/pt_BR/po/drbd.pt_BR.po
trunk/yast/pt_BR/po/fcoe-client.pt_BR.po
trunk/yast/pt_BR/po/firewall.pt_BR.po
trunk/yast/pt_BR/po/firstboot.pt_BR.po
trunk/yast/pt_BR/po/fonts.pt_BR.po
trunk/yast/pt_BR/po/geo-cluster.pt_BR.po
trunk/yast/pt_BR/po/installation.pt_BR.po
trunk/yast/pt_BR/po/iscsi-client.pt_BR.po
trunk/yast/pt_BR/po/iscsi-lio-server.pt_BR.po
trunk/yast/pt_BR/po/kdump.pt_BR.po
trunk/yast/pt_BR/po/live-installer.pt_BR.po
trunk/yast/pt_BR/po/mail.pt_BR.po
trunk/yast/pt_BR/po/network.pt_BR.po
trunk/yast/pt_BR/po/nfs.pt_BR.po
trunk/yast/pt_BR/po/nis.pt_BR.po
trunk/yast/pt_BR/po/ntp-client.pt_BR.po
trunk/yast/pt_BR/po/packager.pt_BR.po
trunk/yast/pt_BR/po/pkg-bindings.pt_BR.po
trunk/yast/pt_BR/po/printer.pt_BR.po
trunk/yast/pt_BR/po/rdp.pt_BR.po
trunk/yast/pt_BR/po/rear.pt_BR.po
trunk/yast/pt_BR/po/registration.pt_BR.po
trunk/yast/pt_BR/po/reipl.pt_BR.po
trunk/yast/pt_BR/po/samba-client.pt_BR.po
trunk/yast/pt_BR/po/samba-server.pt_BR.po
trunk/yast/pt_BR/po/security.pt_BR.po
trunk/yast/pt_BR/po/services-manager.pt_BR.po
trunk/yast/pt_BR/po/snapper.pt_BR.po
trunk/yast/pt_BR/po/storage.pt_BR.po
trunk/yast/pt_BR/po/update.pt_BR.po
trunk/yast/pt_BR/po/users.pt_BR.po
trunk/yast/pt_BR/po/vm.pt_BR.po
trunk/yast/pt_BR/po/vpn.pt_BR.po
Log:
pt_BR merged
Modified: trunk/yast/pt_BR/po/add-on.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/add-on.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/add-on.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2012-05-05 14:29-0300\n"
"Last-Translator: Ísis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -88,15 +88,16 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>Mídia: %1, caminho: %2, produto: %3</li>\n"
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr "Disponibilize o complemento \"%1\" com \"%2\""
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
msgid "Failed to add add-on product."
msgstr "Falha ao adicionar o produto complementar."
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr "Disponibilize o complemento \"%1\" com \"%2\""
-
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
#. placeholder for unknown directory
Modified: trunk/yast/pt_BR/po/auth-client.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/auth-client.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/auth-client.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-11-06 10:48-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -20,1187 +20,1885 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Lokalize 1.5\n"
-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
-msgstr "Módulo de configuração do cliente de autenticação"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
+msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
-msgstr "Resumo da configuração do cliente de autenticação"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
+msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
-msgstr "Criar autoyast rnc a partir de @parameters"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
+msgstr ""
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+#, fuzzy
+#| msgid "Name"
+msgid "User Name"
+msgstr "Nome"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr ""
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr ""
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr ""
+
+#. Add an auth_to_local_names
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
+msgstr ""
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter realm name."
+msgstr "Digite um nome para o novo perfil."
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication via Kerberos"
+msgstr "Modo de &autenticação"
+
+#. LDAP tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:76
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:84
+msgid ""
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:92
+msgid ""
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:100
+msgid ""
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:108
+msgid ""
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:163
+msgid ""
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:176
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Are you sure to delete realm %s?"
+msgstr "Você realmente quer remover a partição %1?"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Automatically Create Home Directory"
+msgstr "Criar diretório pessoal no login"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "All Authentication Realms"
+msgstr "Modo de &autenticação"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Realm"
+msgstr "Remover"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+#, fuzzy
+#| msgid "Basic Settings:"
+msgid "Change Settings"
+msgstr "Configurações básicas:"
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "User Logon Configuration"
+msgstr "Configuração global"
+
+#: src/lib/authui/main_dialog.rb:68
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "LDAP/Kerberos Configuration"
+msgstr "Configuração global"
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr "Nome"
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr "Valor"
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+#, fuzzy
+#| msgid "Add New Domain"
+msgid "Network Domain"
+msgstr "Adicionar novo domínio"
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+#, fuzzy
+#| msgid "Activate Domain"
+msgid "Identity Domains"
+msgstr "Ativar domínio"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr "Descrição"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name filter:"
+msgstr "Filtro:"
+
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
#, fuzzy
#| msgid "None"
msgid "None."
msgstr "Nenhum"
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
#, fuzzy
#| msgid "Mount Parameters"
msgid "Mandatory Parameters"
msgstr "Parâmetros de Montagem"
-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
#, fuzzy
#| msgid "Optional Parameter File"
msgid "Optional Parameters"
msgstr "Arquivo de Parâmetros Opcionais"
#. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
msgid "Please complete all of the following mandatory parameters:\n"
msgstr ""
-#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
#, fuzzy
-#| msgid "Authentication Client Configuration (sssd)"
-msgid "Authentication Client Configuration"
-msgstr "Configuração do cliente de autenticação (sssd)"
-
-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
+#| msgid "Global Configuration"
+msgid "Global Options"
msgstr "Configuração global"
-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
+#: src/lib/authui/sssd/main_dialog.rb:40
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name switch"
+msgstr "Filtro:"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication"
+msgstr "Modo de &autenticação"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
+#. Render overview and edit buttons on left side, config editor on right side.
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:77
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Create Home Directory"
msgstr "Criar diretório pessoal no login"
-#: src/lib/yauthclient/main_dialog.rb:68
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
#, fuzzy
-#| msgid "Enable the NTP daemon"
-msgid "Enable SSSD daemon"
-msgstr "Habilitar o daemon do NTP"
+#| msgid "Domain"
+msgid "Join Domain"
+msgstr "Domínio"
-#: src/lib/yauthclient/main_dialog.rb:73
+#: src/lib/authui/sssd/main_dialog.rb:92
#, fuzzy
+#| msgid "Activate Domain"
+msgid "Leave Domain"
+msgstr "Ativar domínio"
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+#, fuzzy
#| msgid "Sections: %1"
-msgid "Sections"
+msgid "Service Options"
msgstr "Seções: %1"
-#: src/lib/yauthclient/main_dialog.rb:76
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
#, fuzzy
-#| msgid "Network Services"
-msgid "New Service/Domain"
-msgstr "Serviços de rede"
+#| msgid "Domain"
+msgid "Domain Options"
+msgstr "Domínio"
-#: src/lib/yauthclient/main_dialog.rb:77
-#, fuzzy
-#| msgid "Selected Service"
-msgid "Delete Service/Domain"
-msgstr "Serviços selecionados"
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
#. TRANSLATORS: Label of the area used to customise parameters.
#. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
+#: src/lib/authui/sssd/main_dialog.rb:172
#, fuzzy
#| msgid "Custom Registration Server"
-msgid "Customisation - %s"
+msgid "Options - %s"
msgstr "Servidor personalizado de registro"
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
-msgstr "Nome"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
-msgstr "Valor"
+#: src/lib/authui/sssd/main_dialog.rb:220
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Do you really wish to erase configuration for domain %s?"
+msgstr "Você realmente quer remover a partição %1?"
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
-msgstr "Descrição"
+#. Enable/disable SSSD daemon
+#: src/lib/authui/sssd/main_dialog.rb:252
+msgid ""
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. For the currently selected config section, render list of additional parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-#, fuzzy
-#| msgid "Modem Parameters"
-msgid "More Parameters"
-msgstr "Parâmetros do modem"
+#. Enable/disable NSS password database
+#: src/lib/authui/sssd/main_dialog.rb:284
+msgid ""
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:140
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name filter:"
-msgstr "Filtro:"
+#. Enable/disable NSS group database
+#: src/lib/authui/sssd/main_dialog.rb:302
+msgid ""
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
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"
-"Do you want to continue?"
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
msgstr ""
-"Seu sistema está configurado para utilizar nss_ldap.\n"
-"Este módulo foi projetado para configurar seu sistema via sssd.\n"
-"Se você continuar, sua configuração nss_ldap será removida.\n"
-"Você deseja continuar?"
-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"Sudo data source has been globally enabled.\n"
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
msgstr ""
-"Seu sistema está configurado como um cliente OES.\n"
-"Este módulo foi projetado para configurar seu sistema via sssd.\n"
-"Se você continuar, sua configuração de cliente OES será desativada.\n"
-"Deseja continuar?"
-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-#, fuzzy
-#| msgid "You cannot delete the active profile."
-msgid "You may not delete section SSSD."
-msgstr "Você não pode deletar o perfil ativo."
+#. Enable/disable NSS automount database
+#: src/lib/authui/sssd/main_dialog.rb:342
+msgid ""
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:225
-#, fuzzy
-#| msgid "Do you really want to delete partition %1?"
-msgid "Do you really wish to delete section %s?"
-msgstr "Você realmente quer remover a partição %1?"
+#: src/lib/authui/sssd/main_dialog.rb:350
+msgid ""
+"Automount data source has been globally enabled.\n"
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
+msgstr ""
+#. Enable/disable PAC responder
+#: src/lib/authui/sssd/main_dialog.rb:374
+msgid ""
+"MS-PAC data source has been globally enabled.\n"
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
+msgstr ""
+
#. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
#, fuzzy
#| msgid "Modem parameter details"
msgid "Confirm parameter removal: "
msgstr "Detalhes de parâmetro de modem"
-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to continue?"
+"Do you still wish to remove the parameter?"
msgstr ""
#. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
+#: src/lib/authui/sssd/main_dialog.rb:434
#, fuzzy
#| msgid "Logging enabled"
-msgid "No domain enabled"
+msgid "No domain"
msgstr "Log habilitado"
-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
#, 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"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
+"SSSD will fail to start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
"Não existem domínios ativios na seção [sssd].\n"
"O sssd não será iniciado. Somente autenticação local estará disponível.\n"
"Você deseja escrever esta configuração?"
-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
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 "Você deseja habilitar o acesso ao repositório de perfil?"
+#. The frame is shown only if AD server can be discovered or is explicitly specified
+#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
+#: src/lib/authui/sssd/manage_ad_dialog.rb:68
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
+msgstr ""
-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
-msgstr "Serviço"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
+msgstr ""
-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
-msgstr "Domínio"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com)"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:64
-#, fuzzy
-#| msgid "Identification:"
-msgid "Identification provider:"
-msgstr "Identificação:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:69
-#, fuzzy
-#| msgid "&Authentication Mode"
-msgid "Authentication provider:"
-msgstr "Modo de &autenticação"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
-msgstr "Ativar domínio"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
+msgstr ""
-#. Create new service
-#: src/lib/yauthclient/new_section_dialog.rb:105
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+msgid ""
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
+msgid ""
+"Enrollment has completed successfully!\n"
+"\n"
+"Command output:\n"
+msgstr ""
+
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+msgid ""
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
+msgstr ""
+
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
+msgstr ""
+
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com)"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:78
+msgid "Which service provides identity data, such as user names and group memberships?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
#, fuzzy
-#| msgid "These services will be enabled"
-msgid "There are no more services to be enabled."
-msgstr "Estes serviços serão habilitados"
+#| msgid "Enable the NTP daemon"
+msgid "Enable the domain"
+msgstr "Habilitar o daemon do NTP"
#. Create new domain
-#: src/lib/yauthclient/new_section_dialog.rb:123
+#: src/lib/authui/sssd/new_section_dialog.rb:106
#, fuzzy
#| msgid "Enter a name for the new profile."
-msgid "Please enter a name for the new domain."
+msgid "Please enter the domain name."
msgstr "Digite um nome para o novo perfil."
-#: src/lib/yauthclient/new_section_dialog.rb:126
+#: src/lib/authui/sssd/new_section_dialog.rb:109
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:112
#, fuzzy
#| msgid "This domain is already defined."
msgid "The domain name is already in-use."
msgstr "O domínio já está definido."
#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
-msgstr "Indica qual é a sintaxe do arquivo de configuração."
-
-#: src/lib/yauthclient/params.rb:114
-msgid "Comma separated list of services that are started when sssd itself starts."
-msgstr "Lista de itens separados por vírgula contendo serviços que são iniciados quando o próprio sssd inicia."
-
-#: src/lib/yauthclient/params.rb:115
-msgid ""
-"\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
msgstr ""
-#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
msgstr "Número de vezes que os serviços devem tentar se reconectar caso um provedor de dados trave ou reinicie"
-#: 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 pode utilizar vários domínios ao mesmo tempo, mas ao meno um deve ser configurado, caso contrário o SSSD não será inicializado."
-
-#: src/lib/yauthclient/params.rb:126
-msgid "This parameter contains the list of domains in the order these will be queried."
-msgstr "Este parâmetro contém a lista de domínios na ordem pela qual serão pesquisados."
-
-#: 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"
+#: src/lib/authui/sssd/params.rb:119
+#, fuzzy
+#| msgid "Default regular expression that describes how to parse the string containing user name and domain into these components"
+msgid "The regular expression parses user name and domain name into components"
msgstr "A expressão regular padrão que descreve como analisar a string contendo nome de usuário e domínio nestes componentes"
-#: 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."
+#: src/lib/authui/sssd/params.rb:123
+#, fuzzy
+#| msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name."
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
msgstr "O formato padrão compatível com printf(3) que descreve como traduzir uma tupla (nome, domínio) em um nome completamente qualificado."
-#: 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."
+#: src/lib/authui/sssd/params.rb:127
+#, fuzzy
+#| msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver."
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
msgstr "O SSSD monitora o estado do resolv.conf para identificar quando é necessário atualizar seu resolver de DNS interno."
-#: 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 "Por padrão, tentaremos utilizar o inotify para isto. Caso não seja possível utilizá-lo, reverteremos para o polling do resolv.conf a cada 5 segundos."
-
-#: src/lib/yauthclient/params.rb:143
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+#: src/lib/authui/sssd/params.rb:131
+#, fuzzy
+#| msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
msgstr "O diretório no sistema de arquivos no qual o SSSD deve armazenar os arquivos do cache de replay do Kerberos."
-#: 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."
+#: src/lib/authui/sssd/params.rb:135
+#, fuzzy
+#| msgid "This string will be used as a default domain name for all names without a domain name component."
+msgid "A default domain name for all names without a domian name component"
msgstr "Esta string será utilizada como um nome de domínio padrão para todos os nomes sem um componente de nome de domínio."
#. Define Global Services Parameters
-#: 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 "A máscara de bits que indica quais níveis de depuração serão visíveis. 0x0010 é o valor padrão, bem como o menor valor permitido. 0xFFF0 é o modo mais descritivo."
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
+#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
+#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
+msgstr ""
-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
msgid "Add a timestamp to the debug messages"
msgstr "Adicione um timestamp às mensagens de depuração"
-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
msgid "Add microseconds to the timestamp in debug messages"
msgstr "Adicione microssegundos ao timestamp nas mensagens de depuração"
-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
+#: src/lib/authui/sssd/params.rb:161
+#, fuzzy
+#| msgid "Timeout in seconds between heartbeats for this service."
+msgid "Timeout in seconds between heartbeats for this service"
msgstr "Tempo de espera em segundos entre batidas para este serviço."
-#: 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."
+#: src/lib/authui/sssd/params.rb:171
+#, fuzzy
+#| msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process."
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
msgstr "Esta opção especifica a quantidade máxima de descritores de arquivos que podem ser abertos de uma única vez por este processo SSSD."
-#: 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."
+#: src/lib/authui/sssd/params.rb:176
+#, fuzzy
+#| 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."
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
msgstr "Esta opção especifica a quantidade de segundos pela qual um cliente de um processo SSSD pode manter um descritor de arquivo aberto sem se comunicar através dele."
-#: 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 "Se um serviço não está respondendo às verificações pind (veja a opção \"timeout\"), ele receberá primeiro o sinal SIGTERM, que o instruirá a terminar corretamente."
+#: src/lib/authui/sssd/params.rb:181
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
+msgstr ""
-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/yauthclient/params.rb:202
+#: src/lib/authui/sssd/params.rb:198
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 "O cache de entradas pode ser configurado para atualizar automaticamentes em background as entradas ser elas forem requisitadas além da porcentagem do valor de entry_cache_timeout para o domínio."
-#: src/lib/yauthclient/params.rb:207
+#: src/lib/authui/sssd/params.rb:203
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 "Especifica por quantos segundos o nss_sss deve realizar cache de hits negativos de cache (ou seja, pesquisas por entradas inválidas de banco de dados, como entradas inexistentes) antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
#, fuzzy
#| msgid "Exclude certain users from being fetched from the sss NSS database."
msgid "Exclude certain users from being fetched by SSS backend"
msgstr "Excluir determinados usuários dos resultados vindos do banco de dados NSS do sss."
-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
#, fuzzy
#| msgid "Exclude certain groups from being fetched from the sss NSS database."
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr "Excluir determinados grupos dos resultados vindos do banco de dados NSS do sss."
-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
msgid "If you want filtered user to still be group members set this option to false."
msgstr "Se você deseja que o usuário filtrado ainda seja membro de algum grupo, configure esta opção como \"falsa\"."
-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr "Sobrescreve o diretório do usuário. Você pode fornecer um valor absoluto ou um modelo."
-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr "Configure um modelo padrão para o diretório de usuário se nenhum estiver especificado explicitamente pelo provedor de dados do domínio."
-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
msgid "Override the login shell for all users."
msgstr "Sobrescreve o shell de login para todos os usuários."
-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
msgid "Restrict user shell to one of the listed values."
msgstr "Restringe o shell do usuário para um dos valores listados."
-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
msgid "Replace any instance of these shells with the shell_fallback"
msgstr "Substitui quaisquer instâncias desses shells com o shell_fallback"
-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr "O shell padrão a ser utilizado se um shell permitido não estiver instalado na máquina."
-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
msgid "The default shell to use if the provider does not return one during lookup."
msgstr "O shell padrão a ser utilizado se provedor não retornar um durante a pesquisa."
-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr "Especifica o tempo em segundo durante o qual a lista de subdomínios será considerada válida."
-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr "Especifica o tempo em segundos durante o qual os registros no cache em memória serão válidos."
-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: src/lib/authui/sssd/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 "Se o provedor de autenticação estiver offline, por quanto tempo permitiremos logins em cache (em dias contados a partir do último login bem-sucedido)."
-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/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 "O tempo em minutos a aguardar após offline_failed_login_attempts ter sido atingido antes que uma nova tentativa de login seja possível."
-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr "Controla quais tipos de mensagens são exibidas para o usuário durante a autenticação."
-#: src/lib/yauthclient/params.rb:291
+#: src/lib/authui/sssd/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 "Para qualquer requisição PAM enquanto o SSSD estiver online, o SSSD tentará atualizar imediatamente as informações de identidade em cache para o usuário de forma a garantir que a autenticação seja realizada com as últimas informações."
#. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
msgid "Display a warning N days before the password expires."
msgstr "Exibe um aviso N dias antes da expiração da senha."
-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr "Se a avaliação dos atributos sudoNotBefore e sudoNotAfter deve ocorrer ou não. Esses atributos implementam entradas de sudoers dependentes de horário."
-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: src/lib/authui/sssd/params.rb:325
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr "Especifica por quantos segundos o responder do autofs deve manter o cache de hits negativos antes de consultar novamente a infraestrutura."
-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr "Define se deve ou não ser realizado o hash de nomes de máquinas de endereços no arquivo known_hosts."
-#: src/lib/yauthclient/params.rb:330
+#: src/lib/authui/sssd/params.rb:342
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr "Por quantos segundos uma máquina deve ser mantida no arquivo gerenciado known_hosts após a requisição de suas chaves."
-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr "Limites de UID e GID para o domínio. Se um domínio contiver uma entrada que estiver fora desses limites, ele será ignorado."
-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/yauthclient/params.rb:355
+#: src/lib/authui/sssd/params.rb:371
msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
msgstr "Se o serviço não terminar após \"force_timeout\" segundos, o monitor o desligará de maneira forçada enviando um sinal SIGKILL."
-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr "Por quantos segundos o nss_sss deve considerar as entradas como válidas antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr "Por quantos segundos o nss_sss deve considerar as entradas de usuário como válidas antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr "Por quantos segundos o nss_sss deve considerar as entradas de grupo como válidas antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr "Por quantos segundos o nss_sss deve considerar as entradas de netgroup válidas antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr "Por quantos segundos o nss_sss deve considerar as entradas de serviço como válidas antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr "Por quantos segundos o sudo deve considerar as regras como válidas antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr "Por quantos segundos o serviço autofs deve considerar os mapas do automounter como válidos antes de consultar novamente a infraestrutura."
-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/yauthclient/params.rb:401
+#: src/lib/authui/sssd/params.rb:417
msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr "Quantidade de dias durante os quais as entradas serão mantidas no cache após o último login bem-sucedido antes que sejam removidas durante uma limpeza de cache."
-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
msgid "The identification provider used for the domain."
msgstr "O provedor de identificação utilizado para o domínio."
-#: src/lib/yauthclient/params.rb:413
+#: src/lib/authui/sssd/params.rb:429
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 "Utilize o nome completo e domínio (como formatado pelo full_name_format do domínio) como nome do usuário relatado ao NSS."
-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
msgstr "O provedor de autenticação utilizado para o domínio"
-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
msgid "The access control provider used for the domain."
msgstr "O provedor de controle de acesso utilizado pelo domínio."
-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
msgid "The provider which should handle change password operations for the domain."
msgstr "O provedor que deve gerenciar operações de alteração de senha para o domínio."
-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
msgid "The SUDO provider used for the domain."
msgstr "O provedor SUDO utilizado pelo domínio."
-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
msgid "The provider which should handle loading of selinux settings."
msgstr "O provedor que deve gerenciar o carregamento das configurações do selinux."
-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
msgid "The provider which should handle fetching of subdomains."
msgstr "O provedor que deve gerenciar a pesquisa de subdomínios."
-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
msgid "The autofs provider used for the domain."
msgstr "O provedor autofs utilizado pelo domínio."
-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
msgid "The provider used for retrieving host identity information."
msgstr "O provedor utilizar para receber informações de identidade da máquina."
-#: src/lib/yauthclient/params.rb:466
+#: src/lib/authui/sssd/params.rb:482
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr "Expressão regular para este domínio que descreve como analisar a string contendo o nome de usuário e domínio nestes componentes."
-#: src/lib/yauthclient/params.rb:471
+#: src/lib/authui/sssd/params.rb:487
msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
msgstr "Um formato compatível com o printf(3) que descreve como traduzir uma tupla (nome, domínio) para este domínio em um nome completamente qualificado."
-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr "Fornece a habilidade de selecionar famílias de endereços preferidos a serem utilizados durante a pesquisa de DNS."
-#: src/lib/yauthclient/params.rb:482
+#: src/lib/authui/sssd/params.rb:498
msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr "Define por quanto tempo (em segundos) deve-se aguardar por uma resposta do resolver DNS antes de assumir que ele está inatingível."
-#: src/lib/yauthclient/params.rb:486
+#: src/lib/authui/sssd/params.rb:502
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr "Se a descoberta de serviço for utilizada na infraestrutura, especifique a parte do domínio da consulta DNS de descoberta de domínio."
-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr "Sobrescreve o valor GID primário com o valor especificado."
-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:516
msgid "Treat user and group names as case sensitive."
msgstr "Diferenciar maiúsculas e minúsculas nos nomes de usuário e grupo."
-#: src/lib/yauthclient/params.rb:500
+#: src/lib/authui/sssd/params.rb:521
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 "Quando um usuário ou grupo é pesquisado por nome no provedor de proxy, uma segunda consulta por ID é realizada para 'canonizar' o nome pesquisado caso ele seja um apelido."
-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:526
msgid "Use this homedir as default value for all subdomains within this domain."
msgstr "User este homedir como valor padrão para todos os subdomínios dentro deste domínio."
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:532
msgid "Comma separated list of users who are allowed to log in."
msgstr "Lista de itens separados por vírgula contendo usuários cujo login é permitido."
-#: src/lib/yauthclient/params.rb:516
+#: src/lib/authui/sssd/params.rb:537
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr "Lista de itens separados por vírgula contendo groups cujo login é permitido. Isto se aplica somente a grupos dentro deste domínio SSSD."
-#: src/lib/yauthclient/params.rb:521
+#: src/lib/authui/sssd/params.rb:542
msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr "Lista de itens separados por vírgula contendo groups cujo login é explicitamente negado. Isto se aplica somente a grupos dentro deste domínio SSSD."
#. 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/lib/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:551
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr "As ferramentas concatenam o nome de login ao base_directory utilizam o resultado como diretório do usuário."
-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:556
msgid "Indicate if a home directory should be created by default for new users."
msgstr "Indica se um diretório home deve ser criado por padrão para novos usuários."
-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:561
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr "Indica se um diretório home deve ser excluído por padrão para usuários excluídos."
-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:566
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr "Utilizado pelo sss_useradd(8) para especificar as permissões padrão em um diretório home recém-criado."
-#: src/lib/yauthclient/params.rb:550
+#: src/lib/authui/sssd/params.rb:571
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 "O diretório esqueleto que contém arquivos e diretórios a serem copiados para o diretório do usuário, quando ele for criado pelo sss_useradd(8)."
-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:576
msgid "The mail spool directory."
msgstr "O diretório de spool de e-mail."
-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:580
msgid "The command that is run after a user is removed."
msgstr "O comando executado após a remoção de um usuário."
#. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:589
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:595
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:601
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr "O DN base padrão a ser utilizado para aplicar as regras sudo do LDAP."
-#: src/lib/yauthclient/params.rb:579
+#: src/lib/authui/sssd/params.rb:606
msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr "Especifica uma lista de itens separados por vírgula que contém as URIs dos servidores LDAP nos quais o SSSD deve se conectar na ordem de preferência."
-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
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 "Especifica uma lista de itens separados por vírgula contendo URIs dos servidores LDAP aos quais o SSSd deve ser conectar em ordem de preferência para alterar a senha de um usuário."
-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:624
#, fuzzy
#| msgid "Base DN for the database"
msgid "Base DN for LDAP search"
msgstr "Banco DN para o banco de dados"
-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:631
#, fuzzy
#| msgid "LDAP secure port"
msgid "LDAP schema type"
msgstr "Porta segura LDAP"
-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:635
msgid "The default bind DN to use for performing LDAP operations."
msgstr "O DN padrão de associação para realizar operações LDAP."
-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:641
msgid "The type of the authentication token of the default bind DN."
msgstr "O tipo de token de autenticação para o DN padrão de associação."
-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:645
msgid "The authentication token of the default bind DN."
msgstr "O token de autenticação para o DN padrão de associação."
-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:650
msgid "The object class of a user entry in LDAP."
msgstr "A classe de objeto de uma entrada de usuário no LDAP."
-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:655
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr "O atributo LDAP que corresponde ao nome de usuário."
-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:660
msgid "The LDAP attribute that corresponds to the user's id."
msgstr "O atributo LDAP que corresponde ao identificador (id) do usuário."
-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:665
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr "O atributo LDAP que corresponde ao identificador de grupo primário do usuário."
-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:670
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr "O atributo LDAP que corresponde ao campo gecos do usuário."
-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:675
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr "O atributo LDAP que contém o nome do diretório do usuário."
-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:680
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr "O atributo LDAP que contém o caminho para o shell padrão do usuário."
-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:685
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr "O atributo LDAP que contém o UUID/GUID de um objeto de usuário LDAP."
-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:690
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr "O atributo LDAP que contém o objectSID de um objeto de usuário LDAP."
-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr "O atributo LDAP que contém o timestamp da última modificação no objeto pai."
-#: src/lib/yauthclient/params.rb:673
+#: src/lib/authui/sssd/params.rb:700
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 "Ao utilizar ldap_pwd_policy=shadow, este parâmetro contém o nome de um atributo LDAP correspondente ao seu equivalente shadow(5) (data da última alteração de senha)."
-#: src/lib/yauthclient/params.rb:678
+#: src/lib/authui/sssd/params.rb:705
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 "Ao utilizar ldap_pwd_policy=shadow, este parâmetro contém o nome de um atributo LDAP correspondente ao seu equivalente shadow(5) (idade mínima da senha)."
-#: src/lib/yauthclient/params.rb:683
+#: src/lib/authui/sssd/params.rb:710
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 "Ao utilizar ldap_pwd_policy=shadow, este parâmetro contém o nome de um atributo LDAP correspondente ao seu equivalente shadow(5) (idade máxima da senha)."
-#: src/lib/yauthclient/params.rb:688
+#: src/lib/authui/sssd/params.rb:715
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 "Ao utilizar ldap_pwd_policy=shadow, este parâmetro contém o nome de um atributo LDAP correspondente ao seu equivalente shadow(5) (período de aviso)."
-#: src/lib/yauthclient/params.rb:693
+#: src/lib/authui/sssd/params.rb:720
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 "Ao utilizar ldap_pwd_policy=shadow, este parâmetro contém o nome de um atributo LDAP correspondente ao seu equivalente shadow(5) (período de inatividade da senha)."
-#: src/lib/yauthclient/params.rb:698
+#: src/lib/authui/sssd/params.rb:725
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 "Ao utilizar ldap_pwd_policy=shadow ou ldap_access_expire_policy=shadow, este parâmetro contém o nome de um atributo LDAP correspondente ao seu equivalente shadow(5) (data de expiração da conta)."
-#: src/lib/yauthclient/params.rb:703
+#: src/lib/authui/sssd/params.rb:730
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 "Ao utilizar ldap_pwd_policy=mit_kerberos, este parâmetro contém o nome de um atributo LDAp que armazena a data e horário da última alteração de senha no kerberos."
-#: src/lib/yauthclient/params.rb:708
+#: src/lib/authui/sssd/params.rb:735
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 "Ao utilizar ldap_pwd_policy=mit_kerberos, este parâmetro contém o nome de um atributo LDAP que armazena a data e horário de expiração da senha atual."
-#: src/lib/yauthclient/params.rb:713
+#: src/lib/authui/sssd/params.rb:740
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 "Ao utilizar ldap_account_expire_policy=ad, este parâmetro contém o nome de um atributo LDAP que armazena o horário de expiração da conta."
-#: src/lib/yauthclient/params.rb:718
+#: src/lib/authui/sssd/params.rb:745
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 "Ao utilizar ldap_account_expire_policy=ad, este parâmetro contém o nome de um atributo LDAP que armazena o campo de bit de controle de conta do usuário."
-#: src/lib/yauthclient/params.rb:723
+#: src/lib/authui/sssd/params.rb:750
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr "Ao utilizar o ldap_account_expire_policy=rhds ou equivalente, este parâmetro determina se o acesso é permitido ou não."
-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:755
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr "Ao utilizar o ldap_account_expire_policy=nds, este atributo determina se o acesso é permitido ou não."
-#: src/lib/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:760
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr "Ao utilizar o ldap_account_expire_policy=nds, este atributo determina até qual data o acesso será permitido."
-#: src/lib/yauthclient/params.rb:738
+#: src/lib/authui/sssd/params.rb:765
msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
msgstr "Ao utilizar ldap_account_expire_policy=nds, este atributo determina a quantidade de horas por dia durante as quais o acesso é permitido."
-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:770
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr "O atributo LDAP que contém o nome principal de usuário do Kerberos (UPN)."
-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:774
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr "O atributo LDAP que contém as chaves públicas de SSH do usuário."
-#: src/lib/yauthclient/params.rb:752
+#: src/lib/authui/sssd/params.rb:779
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 "Alguns servidores de dicionário (ex.: Active Directory), podem enviar a parte realm do UPN em minúscula, o que pode causar falha na autenticação."
-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:780
msgid "Set this option to true if you want to use an upper-case realm."
msgstr "Configure esta opção para \"verdadeiro\" se quiser utilizar um realm em maiúsculas."
-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:785
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr "Especifica por quantos segundos o SSSD deve aguardar antes de atualizar o cache de registros enumerados."
-#: src/lib/yauthclient/params.rb:763
+#: src/lib/authui/sssd/params.rb:790
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 "Determina a frequência de verificação do cache por entradas inativas (ex.: grupos vazios e usuários que nunca efetuaram login) e as remove para limpar espaço."
-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:795
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr "O atributo LDAP que corresponde ao nome completo do usuário."
-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:800
msgid "The LDAP attribute that lists the user's group memberships."
msgstr "O atributo LDAP que lista os grupos dos quais o usuário faz parte."
-#: src/lib/yauthclient/params.rb:778
+#: src/lib/authui/sssd/params.rb:805
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 "Se forem utilizados o access_provider=ldap e ldap_access_order=authorized_service, o SSSD utilizará a presença do atributo authorizedService na entrada do usuário LDAP para determinar o privilégio de acesso."
-#: src/lib/yauthclient/params.rb:783
+#: src/lib/authui/sssd/params.rb:810
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 "Se forem utilizados o access_provider=ldap e ldap_access_order=host, o SSSD utilizará a presença do atributo host na entrada de usuário LDAP para determinar o privilégio de acesso."
-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:820
msgid "The object class of a group entry in LDAP."
msgstr "A classe de objeto de uma entrada de grupo no LDAP."
-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:825
msgid "The LDAP attribute that corresponds to the group name."
msgstr "O atributo LDAp que corresponde ao nome de grupo."
-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:830
msgid "The LDAP attribute that corresponds to the group's id."
msgstr "O atributo LDAP que corresponde ao identificador (id) do grupo."
-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:835
msgid "The LDAP attribute that contains the names of the group's members."
msgstr "O atributo LDAP que contém os nomes dos membros do grupo."
-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:840
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr "O atributo LDAP que contém o UUID/GUID de um objeto de grupo LDAP."
-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:845
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr "O atributo LDAP que contém o objectSID de um objeto de grupo LDAP."
-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:850
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr "O atributo LDAP que contém o timestamp da última alteração do objeto pai."
-#: src/lib/yauthclient/params.rb:829
+#: src/lib/authui/sssd/params.rb:856
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 "Se o ldap_schema estiver definido para um formato de esquema que suporta grupos aninhados (ex.: RFC2307bis), então esta opção controla quantos níveis de aninhamento o SSSD irá seguir."
-#: src/lib/yauthclient/params.rb:835
+#: src/lib/authui/sssd/params.rb:862
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 "Esta opção informa ao SSSD para tirar proveito de um recurso específico do Active Directory que pode melhorar o desempenho das operações de pesquisa de grupos em implantações com grupos complexos ou com muitos níveis de aninhamento."
-#: src/lib/yauthclient/params.rb:841
+#: src/lib/authui/sssd/params.rb:868
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 "Esta opção informa ao SSSD para tirar proveito de um recurso específico do Active Directory que pode melhorar o desempenho das operações initgroups (notavelmente ao lidar com grupos complexos ou com muitos níveis de aninhamento)."
-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:874
msgid " The object class of a netgroup entry in LDAP."
msgstr " A classe de objeto de uma entrada netgroup no LDAP."
-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:880
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr "O atributo LDAP que corresponde ao nome netgroup."
-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:885
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr "O atributo LDAP que contém os nomes dos membros do netgroup."
-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:890
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr "O atributo LDAP que contém as triplas (máquina, usuário, domínio) do netgroup."
-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:895
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr "O atributo LDAP que contém o UUID/GUID de um objeto netgroup do LDAP."
-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:905
msgid "The object class of a service entry in LDAP."
msgstr "A classe de objeto de uma entrada de serviço no LDAP."
-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:910
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr "O atributo LDAP que contém o nome de atributos de serviço e seus apelidos."
-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:915
msgid "The LDAP attribute that contains the port managed by this service."
msgstr "O atributo LDAP que contém a porta gerenciada por este serviço."
-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:920
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr "O atributo LDAP que contém os protocolos entendidos por este serviço."
-#: src/lib/yauthclient/params.rb:899
+#: src/lib/authui/sssd/params.rb:926
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/yauthclient/params.rb:904
+#: src/lib/authui/sssd/params.rb:931
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 "Especifica o timeout (em segundos) durante o qual as pesquisas ldap podem ser executadas antes que sejam canceladas e os resultados em cache retornados (e antes que seja ativado o modo offline)."
-#: src/lib/yauthclient/params.rb:909
+#: src/lib/authui/sssd/params.rb:936
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 "Especifica o timeout (em segundos) durante o qual as pesquisas ldap por enumerações de usuários e grupos podem ser executadas antes que sejam canceladas e os resultados em cache sejam retornados (e antes que seja ativado o modo offline)."
-#: src/lib/yauthclient/params.rb:914
+#: src/lib/authui/sssd/params.rb:941
msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr "Especifica o timeout (em segundos) após o qual o poll(2)/select(2) que segue um connect(2) retorna caso não haja nenhuma atividade."
-#: src/lib/yauthclient/params.rb:919
+#: src/lib/authui/sssd/params.rb:946
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr "Especifica um timeout (em segundos) após o qual as chamadas para as APIs síncronas do LDAP serão canceladas se nenhuma resposta for recebida."
-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:951
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr "Especifica um timeout (em segundos) pelo qual uma conexão a um servidor LDAP será mantida."
-#: src/lib/yauthclient/params.rb:929
+#: src/lib/authui/sssd/params.rb:956
msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr "Especifica o número de registros a recuperar do LDAP em uma única requisição. Alguns servidores LDAP forçam um limite máximo por requisição."
-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:961
msgid "Disable the LDAP paging control."
msgstr "Desabilitar o controle de paginação LDAP."
-#: src/lib/yauthclient/params.rb:938
+#: src/lib/authui/sssd/params.rb:965
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr "Ao se comunicar com um servidor LDAP utilizando SASL, especifique o nível de segurança mínimo necessário para estabelecer a conexão."
-#: src/lib/yauthclient/params.rb:943
+#: src/lib/authui/sssd/params.rb:970
msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr "Especifique a quantidade de membros de grupo que devem estar faltando no cache interno para que uma pesquisa de derreferenciamento seja iniciada."
-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:977
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:981
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr "Especifica o arquivo que contém certificados para todas as autoridades certificadoras que serão reconhecidas pelo sssd."
-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:985
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr "Especifica o caminho de um diretório que contém certificados de uma autoridade certificadora em arquivos individuais."
-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the certificate for the client's key."
msgstr "Especifica o arquivo que contém o certificado para a chave do cliente."
-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:993
msgid "Specifies the file that contains the client's key."
msgstr "Especifica o arquivo que contém a chave do cliente."
-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:998
msgid "Specifies acceptable cipher suites."
msgstr "Especifica conjuntos de cifras aceitáveis."
-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:1003
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr "Especifica que a conexão id_provider deve utilizar também TLS para proteger o canal."
-#: src/lib/yauthclient/params.rb:981
+#: src/lib/authui/sssd/params.rb:1008
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 "Especifica que o SSSD deve tentar mapear os identificadores de usuário e grupo a partir dos atributos ldap_user_objectsid e ldap_group_objectsid ao invés de confiar nos atributos ldap_user_uid_number e ldap_group_gid_number."
-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1012
msgid "Specify the SASL mechanism to use."
msgstr "Especifica o mecanismo SASL a ser utilizado."
-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1017
msgid "Specify the SASL authorization id to use."
msgstr "Especifica o identificador de autorização SASL a ser utilizado."
-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1022
msgid "Specify the SASL realm to use."
msgstr "Especifica o realm SASL a ser utilizado."
-#: src/lib/yauthclient/params.rb:1000
+#: src/lib/authui/sssd/params.rb:1027
msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr "Se configurado como \"verdadeiro\", a biblioteca LDAP irá realizar uma pesquisa reversa para canonizar o nome de máquina durante uma associação SASL."
-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1032
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr "Especifique o keytab a ser utilizar com SASL/GSSAPI."
-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1037
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr "Especifica que o id_provider deve iniciar as credenciais Kerberos (TGT)."
-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1042
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr "Especifica o tempo de vida em segundos do TGT se o GSSAPI for utilizado."
-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1047
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr "Seleciona a política de avaliação da expiração de senha no lado do cliente."
-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1052
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr "Especifica se o chasing automático de referências deve ser habilitado."
-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1057
msgid "Specifies the service name to use when service discovery is enabled."
msgstr "Especifica o nome do serviço a ser utilizado quando a descoberta de serviço estiver habilitada."
-#: src/lib/yauthclient/params.rb:1034
+#: src/lib/authui/sssd/params.rb:1061
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr "Especifica o nome de serviço a utilizar para pesquisar por um servidor LDAP que permite alterações de senhas quando a descoberta de serviços estiver habilitada."
-#: src/lib/yauthclient/params.rb:1039
+#: src/lib/authui/sssd/params.rb:1066
msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
msgstr "Especifica se o atributo ldap_user_shadow_last_change deverá ser atualizado com os dias desde a Época após uma alteração de senha."
-#: src/lib/yauthclient/params.rb:1044
+#: src/lib/authui/sssd/params.rb:1071
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 "Se os atributos access_provider=ldap e ldap_access_order=filter forem utilizados (padrão) esta opção é obrigatória. Ela especifica um critério de filtro de pesquisa LDAP que deve ser utilizado para que seja concedido acesso ao usuário nesta máquina."
-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1076
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr "Com esta opção pode-se habilitar uma avaliação dos atributos de controle de acesso no lado do cliente."
-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1082
msgid "Comma separated list of access control options."
msgstr "Lista de itens separados por vírgula contendo opções de controle de acesso."
-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1087
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr "Especifica como o derreferenciamento de apelidos é feito ao realizar uma pesquisa."
-#: src/lib/yauthclient/params.rb:1065
+#: src/lib/authui/sssd/params.rb:1092
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr "Permite manter usuários locais como membros de um grupo LDAP para sevidores que usam o esquema RFC2307."
-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1105
#, fuzzy
#| msgid "The IP address (or host name) of the host with a fixed address"
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr "O endereço IP (ou nome de host) do host com endereço fixo"
-#: src/lib/yauthclient/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1109
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 "Especifica uma lista de itens separados por vírgula contendo endereços de IP ou nomes de máquina dos servidores Kerberos aos quais o SSSD deve se conectar, em ordem de preferência."
-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1114
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr "Se o serviço de alteração de senha não estiver em execução no KDC, servidores alternativos podem ser definidos aqui."
-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1128
msgid "Directory to store credential caches."
msgstr "Diretório no qual serão armazenados os caches de credenciais."
-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1133
msgid "Location of the user's credential cache."
msgstr "Local do cache de credenciais do usuário."
-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1138
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr "Timeout em segundos após o qual uma requisição de autenticação online ou requisição de alteração de senha será cancelada."
-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1143
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr "Verifique com a ajuda do krb5_keytab que o TGT obtido não foi alvo de spoofing."
-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1148
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr "A localização do keytab a ser utilizado ao validar credenciais obtidas dos KDCs."
-#: src/lib/yauthclient/params.rb:1126
+#: src/lib/authui/sssd/params.rb:1153
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 "Armazene a senha do usuário se o provedor estiver offline e use-a para requisitar um TGT quando o provedor ficar online novamente."
-#: src/lib/yauthclient/params.rb:1130
+#: src/lib/authui/sssd/params.rb:1157
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr "Solicite um ticket renovável com um tempo de vida total, dado como inteiro seguido imediatamente por uma unidade de tempo."
-#: src/lib/yauthclient/params.rb:1134
+#: src/lib/authui/sssd/params.rb:1161
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr "Solicite um ticket com um tempo de vida, dado como um inteiro seguido imediatamente de uma unidade de tempo."
-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1165
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr "O tempo em segundos entre duas verificações se o TGT tiver que ser renovado."
-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1170
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr "Habilita o tunelamento seguro de autenticação flexível (FAST) para a pré-autenticação Kerberos."
-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1174
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1179
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1191
msgid "Specifies the name of the Active Directory domain."
msgstr "Especifica o nome do domínio Active Directory."
-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1196
#, fuzzy
#| msgid "The IP address (or host name) of the host with a fixed address"
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr "O endereço IP (ou nome de host) do host com endereço fixo"
-#: src/lib/yauthclient/params.rb:1173
+#: src/lib/authui/sssd/params.rb:1200
msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
msgstr "Lista de itens separados por vírgula de endereços IP ou nomes de máquinas dos servidores AD aos quais o SSSD deve se conectar em ordem de preferência."
-#: 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."
+#: src/lib/authui/sssd/params.rb:1205
+#, fuzzy
+#| 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."
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
msgstr "Opcional. Pode ser configurado em máquinas nas quais o hostname(5) não reflete o nome completamente qualificado utilizado no domínio do Active Directory para identificar esta máquina."
-#: src/lib/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1209
msgid "Override the user's home directory."
msgstr "Sobrescreve o diretório do usuário."
-#: src/lib/yauthclient/params.rb:1194
+#: src/lib/authui/sssd/params.rb:1222
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr "Especifica o valor mínimo do intervalo de IDs POSIX a ser utilizado para mapear os SIDs de usuário e grupo do Active Directory."
-#: src/lib/yauthclient/params.rb:1199
+#: src/lib/authui/sssd/params.rb:1227
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr "Especifica o valor máximo do intervalo de IDs POSIX a ser utilizado para mapear os SIDs de usuário e grupo do Active Directory."
-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the domain SID of the default domain."
msgstr "Especifica o SID de domínio do domínio padrão."
-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1240
msgid "Specify the name of the default domain."
msgstr "Especifica o nome do domínio padrão."
-#: src/lib/yauthclient/params.rb:1217
+#: src/lib/authui/sssd/params.rb:1245
msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr "Altera o comportamento do algoritmo de mapeamento de ID para se comportar de forma semelhante ao algoritmo \"idmap_autorid\" do winbind."
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1257
msgid "Specifies the name of the IPA domain."
msgstr "Especifica o nome do domínio IPA."
-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1262
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1238
-msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
-msgstr "Pode ser configurado em máquinas nas quais o hostname(5) não reflete o nome completamente qualificado."
+#: src/lib/authui/sssd/params.rb:1267
+#, fuzzy
+#| 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."
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
+msgstr "Opcional. Pode ser configurado em máquinas nas quais o hostname(5) não reflete o nome completamente qualificado utilizado no domínio do Active Directory para identificar esta máquina."
-#: src/lib/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1272
#, fuzzy
#| msgid "The configuration of the NIS client will be saved.\n"
msgid "The automounter location this IPA client will be using."
msgstr "A configuração do cliente NIS vai ser salva.\n"
-#: src/lib/yauthclient/params.rb:1248
+#: src/lib/authui/sssd/params.rb:1277
msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
msgstr "Esta opção informa ao SSSd para atualizar automaticamente o servidor de DNS embutido no FreeIPA v2 com o endereço IP deste cliente."
-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1282
msgid "The TTL to apply to the client DNS record when updating it."
msgstr "O TTL a ser aplicado ao registro de cliente DNS durante sua atualização."
-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1286
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr "Escolha a interface que possui o endereço IP que deve ser utilizado para atualizações dinâmicas de DNS."
-#. 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 ""
+#~ msgid "Authentication client configuration module"
+#~ msgstr "Módulo de configuração do cliente de autenticação"
-#: src/modules/AuthClient.rb:232
-msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
-msgstr ""
+#~ msgid "Configuration summary of the authentication client"
+#~ msgstr "Resumo da configuração do cliente de autenticação"
-#. end Export
-#. ################################################################
-#. ################################################################
-#. Summary()
-#. returns html formated configuration summary
-#. @return summary
-#: src/modules/AuthClient.rb:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr "O sistema está configurado para utilizar nss_ldap.\n"
+#~ msgid "Create autoyast rnc from @parameters"
+#~ msgstr "Criar autoyast rnc a partir de @parameters"
-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr "O sistema está configurado para utilizar sssd.\n"
+#, fuzzy
+#~| msgid "Authentication Client Configuration (sssd)"
+#~ msgid "Authentication Client Configuration"
+#~ msgstr "Configuração do cliente de autenticação (sssd)"
-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr "O sistema está configurado para utilizar OES.\n"
+#, fuzzy
+#~| msgid "Network Services"
+#~ msgid "New Service/Domain"
+#~ msgstr "Serviços de rede"
-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr "O sistema está configurado para utilizar somente /etc/passwd.\n"
+#, fuzzy
+#~| msgid "Selected Service"
+#~ msgid "Delete Service/Domain"
+#~ msgstr "Serviços selecionados"
#, fuzzy
+#~| msgid "Modem Parameters"
+#~ msgid "More Parameters"
+#~ msgstr "Parâmetros do modem"
+
+#~ 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"
+#~ "Do you want to continue?"
+#~ msgstr ""
+#~ "Seu sistema está configurado para utilizar nss_ldap.\n"
+#~ "Este módulo foi projetado para configurar seu sistema via sssd.\n"
+#~ "Se você continuar, sua configuração nss_ldap será removida.\n"
+#~ "Você deseja continuar?"
+
+#~ msgid ""
+#~ "Your system is configured as OES client.\n"
+#~ "This module is designed to configure your system via sssd.\n"
+#~ "If you continue, your OES client configuration will be deactivated.\n"
+#~ "Do you want to continue?"
+#~ msgstr ""
+#~ "Seu sistema está configurado como um cliente OES.\n"
+#~ "Este módulo foi projetado para configurar seu sistema via sssd.\n"
+#~ "Se você continuar, sua configuração de cliente OES será desativada.\n"
+#~ "Deseja continuar?"
+
+#, fuzzy
+#~| msgid "You cannot delete the active profile."
+#~ msgid "You may not delete section SSSD."
+#~ msgstr "Você não pode deletar o perfil ativo."
+
+#, 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 "Você deseja habilitar o acesso ao repositório de perfil?"
+
+#~ msgid "Service"
+#~ msgstr "Serviço"
+
+#, fuzzy
+#~| msgid "Identification:"
+#~ msgid "Identification provider:"
+#~ msgstr "Identificação:"
+
+#, fuzzy
+#~| msgid "These services will be enabled"
+#~ msgid "There are no more services to be enabled."
+#~ msgstr "Estes serviços serão habilitados"
+
+#~ msgid "Indicates what is the syntax of the config file."
+#~ msgstr "Indica qual é a sintaxe do arquivo de configuração."
+
+#~ msgid "Comma separated list of services that are started when sssd itself starts."
+#~ msgstr "Lista de itens separados por vírgula contendo serviços que são iniciados quando o próprio sssd inicia."
+
+#~ msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
+#~ msgstr "SSSD pode utilizar vários domínios ao mesmo tempo, mas ao meno um deve ser configurado, caso contrário o SSSD não será inicializado."
+
+#~ msgid "This parameter contains the list of domains in the order these will be queried."
+#~ msgstr "Este parâmetro contém a lista de domínios na ordem pela qual serão pesquisados."
+
+#~ 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 "Por padrão, tentaremos utilizar o inotify para isto. Caso não seja possível utilizá-lo, reverteremos para o polling do resolv.conf a cada 5 segundos."
+
+#~ 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 "A máscara de bits que indica quais níveis de depuração serão visíveis. 0x0010 é o valor padrão, bem como o menor valor permitido. 0xFFF0 é o modo mais descritivo."
+
+#~ 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 "Se um serviço não está respondendo às verificações pind (veja a opção \"timeout\"), ele receberá primeiro o sinal SIGTERM, que o instruirá a terminar corretamente."
+
+#~ msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
+#~ msgstr "Pode ser configurado em máquinas nas quais o hostname(5) não reflete o nome completamente qualificado."
+
+#~ msgid "System is configured for using nss_ldap.\n"
+#~ msgstr "O sistema está configurado para utilizar nss_ldap.\n"
+
+#~ msgid "System is configured for using sssd.\n"
+#~ msgstr "O sistema está configurado para utilizar sssd.\n"
+
+#~ msgid "System is configured for using OES.\n"
+#~ msgstr "O sistema está configurado para utilizar OES.\n"
+
+#~ msgid "System is configured for using /etc/passwd only.\n"
+#~ msgstr "O sistema está configurado para utilizar somente /etc/passwd.\n"
+
+#, fuzzy
#~| msgid "Authentication Client"
#~ msgid "Authentication Client Config"
#~ msgstr "Cliente de autenticação"
@@ -1247,9 +1945,6 @@
#~ msgid "New"
#~ msgstr "Novo"
-#~ msgid "Add New Domain"
-#~ msgstr "Adicionar novo domínio"
-
#~ msgid "Name:"
#~ msgstr "Nome:"
@@ -1262,9 +1957,6 @@
#~ msgid "You have to provide a domain name!"
#~ msgstr "É obrigatório fornecer um nome de domínio!"
-#~ msgid "Basic Settings:"
-#~ msgstr "Configurações básicas:"
-
#~ msgid "Services:"
#~ msgstr "Serviços:"
@@ -1286,9 +1978,6 @@
#~ msgid "Edit"
#~ msgstr "Editar"
-#~ msgid "Delete"
-#~ msgstr "Remover"
-
#~ msgid "Determines if a domain can be enumerated."
#~ msgstr "Determina se um domínio pode ser enumerado."
Modified: trunk/yast/pt_BR/po/auth-server.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/auth-server.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/auth-server.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-02-19 08:59-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -308,8 +308,7 @@
msgstr "Registrar em um daemon &SLP"
#. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
msgid "Firewall Settings"
msgstr "Configurações do firewall"
@@ -457,12 +456,12 @@
msgid "Configure Account for Replication"
msgstr "Configurar conta para replicação"
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
msgid "is not a valid LDAP DN"
msgstr "não é um DN LDAP válido"
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
msgid "Password"
msgstr "Senha"
@@ -488,8 +487,8 @@
msgid "Provider Details"
msgstr "Detalhes do Provedor"
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
msgid "Protocol"
msgstr "Protocolo"
@@ -497,7 +496,7 @@
msgid "Provider Hostname"
msgstr "Nome de máquina do provedor"
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
msgid "Use StartTLS"
msgstr "Usar StartTLS"
@@ -582,8 +581,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr "Falha ao verificar as credenciais de autenticação definidas na configuração de replicação do servidor provedor.\n"
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
msgid "The test returned the following error messages:"
msgstr "O teste retornou as seguintes mensagens de erro:"
@@ -2031,8 +2030,7 @@
#. Initialization dialog contents
#. Initialization dialog contents
#: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
#: src/include/auth-server/wizards.rb:207
#: src/include/auth-server/wizards.rb:300
msgid "Initializing..."
@@ -2406,7 +2404,7 @@
msgid "Index Cache (IDL cache)"
msgstr "Cache de índice (cache IDL)"
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
msgid "Checkpoint Settings"
msgstr "Configurações de checkpoint"
@@ -2476,7 +2474,7 @@
msgstr "Adicionar índice"
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
msgid "Password Policy Settings"
msgstr "Configurações de política de senha"
@@ -2637,145 +2635,145 @@
msgstr "O diretório não existe. Criá-lo?"
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr "Falha na autenticação. A senha provavelmente está incorreta.\n"
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
msgid "The error message was: '"
msgstr "A mensagem de erro é: '"
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
msgid "Try again?"
msgstr "Tentar novamente?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
msgid "Available Attribute Types"
msgstr "Tipos de atributos disponíveis"
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
msgid "Selected Attribute Types"
msgstr "Tipos de atributos selecionados"
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
msgid "Who should this rule apply to"
msgstr "A quem esta regra deve ser aplicada"
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
msgid "Entry DN"
msgstr "Entrada DN"
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
msgid "Select"
msgstr "Selecionar"
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
msgid "Define the Access Level"
msgstr "Definir o nível de acesso"
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
msgid "Stop access control evaluation here (default)"
msgstr "Parar aqui a avaliação de controle de acesso (padrão)"
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
msgid "Continue with next access control rule (\"break\")"
msgstr "Continuar com a próxima regra de controle de acesso (\"break\")"
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
msgid "Continue evaluation of this rule (\"continue\")"
msgstr "Continuar com a avaliação desta regra (\"continue\")"
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
msgid "Please enter a DN in the textfield"
msgstr "Por favor, forneça um DN no campo de texto"
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
msgid "Subtree DN"
msgstr "Subárvore DN"
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
msgid "Group DN"
msgstr "Grupo DN"
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
msgid "Edit Access Control Rule"
msgstr "Editar regra de controle de acesso"
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
msgid "Target Objects"
msgstr "Objetos de destino"
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
msgid "Matching the filter:"
msgstr "Filtro correspondente:"
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
msgid "LDAP Filter"
msgstr "Filtro LDAP"
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
msgid "Apply this rule only to the listed attribute"
msgstr "Aplicar esta regra somente no atributo listado"
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
msgid "Attributes"
msgstr "Atributos"
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
msgid "Edit"
msgstr "Editar"
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
msgid "Access Level"
msgstr "Nível de acesso"
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
msgid "Who"
msgstr "Quem"
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
msgid "DN"
msgstr "DN"
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
msgid "Flow Control"
msgstr "Controle de Fluxo"
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
msgid "Up"
msgstr "Para cima"
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
msgid "Down"
msgstr "Para baixo"
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr "Forneça uma lista de atributos válidos no campo \"Atributos\""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
msgid "Enter valid a LDAP filter in the textfield"
msgstr "Forneça um filtro LDAP válido"
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
msgid "You must add at least one item to the \"Access Level\" list."
msgstr "Você precisa adicionar ao menos um item na lista \"Nível de acesso\"."
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Target"
msgstr "Destino"
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Filter"
msgstr "Filtro"
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
@@ -2783,93 +2781,93 @@
"O banco de dados selecionado contém regras de controle de acesso que não\n"
"são atualmente suportadas pelo YaST. O diálogo de controle de acesso será desabilitado.\n"
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
msgid "This database is a Replication Consumer."
msgstr "Este banco de dados é um Consumidor de Replicação."
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
msgid "Provider Name"
msgstr "Nome do provedor"
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
msgid "Port"
msgstr "Porta"
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
msgid "Replication Type"
msgstr "Tipo de replicação"
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
msgid "Replication Interval"
msgstr "Intervalo de Replicação"
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
msgid "Days"
msgstr "Dias"
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
msgid "Hours"
msgstr "Horas"
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
msgid "Minutes"
msgstr "Minutos"
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
msgid "Seconds"
msgstr "Segundos"
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
msgid "Authentication DN"
msgstr "Autenticação DN"
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
msgid "Custom update referral"
msgstr "Referência personalizada de atualização"
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
msgid "Target Host"
msgstr "Máquina destino"
#. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
msgid "Invalid replication interval specified"
msgstr "Intervalo de replicação especificado inválido"
#. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
msgid "Checking LDAP connectivity to the provider failed."
msgstr "Falha ao verificar a conectividade LDAP com o provedor."
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
msgid "Do you still want to continue?"
msgstr "Deseja continuar?"
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr "Falha na verificação dos recursos LDAPsync do provedor."
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr "Por favor, verifique se o servidor destino está configurado para ser um provedor LDAPsync"
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
msgid "Enable ldapsync provider for this database"
msgstr "Habilitar provedor ldapsync para este banco de dados"
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
msgid "Operations"
msgstr "Operações"
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
msgid "Session Log"
msgstr "Registro de Sessão"
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
msgid "Enable Session Log"
msgstr "Habilitar registro de seção"
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
msgid "Replication Settings"
msgstr "Configurações da replicação"
Modified: trunk/yast/pt_BR/po/autoinst.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/autoinst.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/autoinst.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-10-30 10:44-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -42,7 +42,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
msgid "This may take a while"
msgstr "Isto pode demorar alguns instantes"
@@ -62,14 +62,13 @@
#. command line options
#. Init variables
-#. Import users configuration from the profile
-#.
+#. unique id
#. 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:410
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
@@ -265,7 +264,7 @@
msgstr "Primeiro, selecione um arquivo da tabela."
#. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -276,73 +275,57 @@
"</p>"
#. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
msgid "Progress"
msgstr "Progresso"
#. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
msgid "Configuring System according to auto-install settings"
msgstr "Configurando o sistema conforme configurações de instalação automática"
#. 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."
+#: src/clients/inst_autoconfigure.rb:94
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>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:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
msgid "Configuring %1"
msgstr "Configurando %1"
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
msgid "Not Configuring %1"
msgstr "Não configurando %1"
#. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
msgid "Executing Post-Scripts"
msgstr "Executando scripts de pós-instalação"
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
+#. Do not restart NetworkManager* services
+#. bnc#955260
#: src/clients/inst_autoconfigure.rb:304
msgid "Restarting all running services"
msgstr "Reiniciando todos os serviços em execução"
-#: src/clients/inst_autoconfigure.rb:327
+#. Filtering out all services which must not to be restarted
+#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr "Ativando o destino padrão do systemd"
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
msgid "Finishing Configuration"
msgstr "Concluindo a configuração"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:447
msgid "Processing resource %1"
msgstr "Processando o recurso %1"
@@ -402,8 +385,15 @@
"falha no script de execução da imagem:\n"
"%1"
-#. import "Arch";
#. encoding: utf-8
+#. File: clients/inst_autoinit.ycp
+#. Package: Auto-installation
+#. Summary: Parses XML Profile for automatic installation
+#. Authors: Anas Nashif <nashif(a)suse.de>
+#.
+#. $Id$
+#.
+#. encoding: utf-8
#. File: clients/autoinst_post.ycp
#. Package: Auto-installation
#. Author: Anas Nashif <nashif(a)suse.de>
@@ -411,7 +401,7 @@
#. the system as described in the profile file.
#.
#. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
msgid ""
"<p>\n"
"Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -419,59 +409,45 @@
"<p>\n"
"Por favor, aguarde enquanto o sistema é preparado para a instalação automática.</p>\n"
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
msgid "Probe hardware"
msgstr "Testar o hardware"
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
msgid "Retrieve & Read Control File"
msgstr "Recuperar e ler arquivo de controle"
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
msgid "Parse control file"
msgstr "Analisar o arquivo de controle"
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
msgid "Initial Configuration"
msgstr "Configuração inicial"
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
msgid "Preparing System for Automatic Installation"
msgstr "Preparando o sistema para a instalação automática"
#. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
msgid "Preprobing stage"
msgstr "Etapa de pré-teste"
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
msgid "Probing hardware..."
msgstr "Testando o hardware..."
+#. 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_autoinit.rb:128
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+
#. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
msgid "Parsing control file"
msgstr "Analisando o arquivo de controle"
@@ -515,57 +491,67 @@
#. Uwe Gansert <ug(a)suse.de>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>Por favor, aguarde enquanto o sistema é preparado para a instalação automática.</P>"
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
msgid "Execute pre-install user scripts"
msgstr "Executar scripts de usuário de pré-instalação"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
msgid "Configure General Settings "
msgstr "Configurar opções gerais"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
msgid "Set up language"
msgstr "Defina o idioma"
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:58
msgid "Create partition plans"
msgstr "Criar planos de partição"
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
msgid "Configure Bootloader"
msgstr "Configurar o carregador de inicialização"
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
msgid "Registration"
msgstr "Registro"
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure Software selections"
msgstr "Configurar seleções de software"
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:62
msgid "Configure Systemd Default Target"
msgstr "Configure o destino padrão do systemd"
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:63
#, fuzzy
#| msgid "Configure Volume Groups"
msgid "Configure users and groups"
msgstr "Configurar grupos de volume"
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "Configurar unidades"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
msgid "Executing pre-install user scripts..."
msgstr "Executando scripts de usuário de pré-instalação..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configuring general settings..."
msgstr "Configurando opções gerais..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
msgid "Setting up language..."
msgstr "Configurando o idioma..."
@@ -573,15 +559,15 @@
msgid "Creating partition plans..."
msgstr "Criando planos de partição..."
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
msgid "Configuring Bootloader..."
msgstr "Configurando o carregador de inicialização..."
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
msgid "Registering the system..."
msgstr "Registrando o sistema..."
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring Software selections..."
msgstr "Configurando seleções de software..."
@@ -593,7 +579,19 @@
msgid "Importing users and groups configuration..."
msgstr ""
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "Importando arquivo Kickstart..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "Configurando o idioma..."
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
msgid "Preparing System for Automated Installation"
msgstr "Preparando o sistema para a instalação automática"
@@ -602,19 +600,19 @@
#. while the general inst_finish process at the end of the
#. first stage. But for the installation workflow the linuxrc
#. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#: src/clients/inst_autosetup.rb:185
msgid "Handling Add-On Products..."
msgstr "Gerenciamento de produtos complementares..."
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
msgid "Configuring language..."
msgstr "Configurando o idioma..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:298
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -622,8 +620,9 @@
"Erro ao configurar partições.\n"
"Tente novamente.\n"
-#. Software
-#: src/clients/inst_autosetup.rb:344
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -703,11 +702,11 @@
#. Select packages
#. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
msgid "Software Selection"
msgstr "Seleção de software"
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
msgid ""
"<p>\n"
"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
@@ -722,19 +721,19 @@
#. AutoinstSoftware::pmInit();
#. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
#. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
msgstr "Localização da fonte de instalação (como http://meuhost/11.3/DVD1/)"
-#: src/clients/software_auto.rb:128
+#: src/clients/software_auto.rb:129
msgid "The inst-source of this system (you can't create images if you choose this)"
msgstr "A fonte de instalação deste sistema (você não pode criar imagens se escolher esta opção)"
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
msgid "using that installation source failed"
msgstr "falha ao utilizar a fonte da instalação"
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
msgid "Reading package database..."
msgstr "Lendo o banco de dados de pacotes..."
@@ -986,6 +985,11 @@
msgid "Volgroup device name"
msgstr "Nome do dispositivo grupo de volume"
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
#. Shows a dialog when 'control file' can't be found
#. @param [String] original Original value
#. @return [String] new value
@@ -1475,8 +1479,7 @@
msgid "Settings"
msgstr "Configurações"
-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
msgid "Select Directory"
msgstr "Selecionar diretório"
@@ -1600,7 +1603,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
msgid "Checking XML with RNG validation..."
msgstr "Verificando XML com validação RNG..."
@@ -1610,7 +1613,7 @@
msgstr "Seção %1:"
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
msgid "Checking XML with RNC validation..."
msgstr "Verificando XML com validação RNC..."
@@ -1989,67 +1992,6 @@
"LVM e RAID não formatadas como uma preparação.\n"
"</p>\n"
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "Não foi possível localizar o URL '%1' pelo protocolo HTTP(S). O servidor retornou o código %2."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "Não foi possível localizar o URL '%1' pelo protocolo FTP. O servidor retornou o código %2."
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "Falha na leitura de %1/%2.\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr "Falha na leitura de %1.\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:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "Falha na montagem de %1."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "Falha na leitura de um arquivo no CD. Caminho: %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:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "Não foi possível recuperar o arquivo remoto %1"
-
-#. this is workaround for bnc#849767
-#. 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:485
-msgid "%1 is not mounted and mount failed"
-msgstr "%1 não está montado e a montagem falhou"
-
-#. autoyast tried to copy a file but that file can't be found
-#: src/include/autoinstall/io.rb:505
-msgid "File %1 cannot be found"
-msgstr "Arquivo %1 não encontrado"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "Não foi possível localizar o URL '%1' pelo protocolo TFTP."
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "Protocolo %1 desconhecido."
-
#. Script Configuration
#. @return script configuration dialog
#: src/include/autoinstall/script_dialogs.rb:30
@@ -2316,12 +2258,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:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "O analisador de XML informou um erro durante a análise do perfil do AutoYaST. Mensagem de erro:\n"
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
msgid ""
"\n"
"User-defined classes could not be retrieved. Make sure all classes \n"
@@ -2337,45 +2279,45 @@
#. The line above needs to be fixed when we have more attributes
#. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:278
+#: src/modules/AutoinstConfig.rb:279
msgid "Choose Profile"
msgstr "Escolher o perfil"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:335
msgid "Retrieving control file from floppy."
msgstr "Recuperando arquivo de controle do disquete."
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "Recuperando arquivo de controle (%1) do servidor TFTP: %2."
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "Recuperando arquivo de controle (%1) do servidor NFS: %2."
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "Recuperando arquivo de controle (%1) do servidor HTTP: %2."
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:356
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "Recuperando arquivo de controle (%1) do servidor FTP: %2."
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:362
msgid "Copying control file from file: %1."
msgstr "Copiando arquivo de controle do arquivo %1."
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:367
msgid "Copying control file from device: /dev/%1."
msgstr "Copiando arquivo de controle do dispositivo /dev/%1."
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:371
msgid "Copying control file from default location."
msgstr "Copiando arquivo de controle do local padrão."
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:373
msgid "Source unknown."
msgstr "Fonte desconhecida."
@@ -2385,7 +2327,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:453
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2395,7 +2337,7 @@
"<p>Com algumas exceções, quase todos recursos do arquivo de controle\n"
"podem ser configurados usando o sistema de gerenciamento de configuração.</p>\n"
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:458
msgid ""
"<p>Most of the modules used to create the configuration are identical to those available\n"
"through the YaST Control Center. Instead of configuring this system, the data\n"
@@ -2409,7 +2351,7 @@
"ser usado para instalar outro sistema usando o AutoYaST.\n"
"</p>\n"
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:465
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2515,24 +2457,24 @@
msgstr "Não importando novas chaves GPG"
#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
+#: src/modules/AutoinstGeneral.rb:419
#, fuzzy
#| msgid "Syncing server..."
msgid "Syncing time..."
msgstr "Sincronizando o servidor..."
#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
+#: src/modules/AutoinstGeneral.rb:421
msgid "Syncing time with %s."
msgstr ""
-#: src/modules/AutoinstGeneral.rb:420
+#: src/modules/AutoinstGeneral.rb:425
#, fuzzy
#| msgid "Parsing failed."
msgid "Time syncing failed."
msgstr "Falha na análise."
-#: src/modules/AutoinstGeneral.rb:424
+#: src/modules/AutoinstGeneral.rb:429
#, fuzzy
#| msgid "Cannot mount file system."
msgid "Cannot update system time."
@@ -2555,18 +2497,18 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
msgid "Drives"
msgstr "Unidades"
#. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
msgid "%s drive in total"
msgid_plural "%s drives in total"
msgstr[0] ""
msgstr[1] ""
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
#, fuzzy
#| msgid "Not detected."
msgid "Not yet cloned."
@@ -2574,55 +2516,55 @@
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
msgid "Preinstallation Scripts"
msgstr "Scripts de pré-instalação"
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
msgid "Postinstallation Scripts"
msgstr "Scripts de pós-instalação"
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
msgid "Chroot Scripts"
msgstr "Scripts chroot"
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
msgid "Init Scripts"
msgstr "Scripts de inicialização"
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
msgid "Postpartitioning Scripts"
msgstr "Scripts de pós-particionamento"
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
msgid "Pre"
msgstr "Pré"
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
msgid "Post"
msgstr "Pós"
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
msgid "Init"
msgstr "Inicialização"
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
msgid "Chroot"
msgstr "Chroot"
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
msgid "Postpartitioning"
msgstr "Pós-particionamento"
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
msgid "Unknown"
msgstr "Desconhecido"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:174
msgid ""
"These packages could not be found in the software repositories:\n"
"%1"
@@ -2632,31 +2574,31 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
msgid "Adding repo %1 failed"
msgstr "Falha ao adicionar o repositório %1"
#. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:377
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr "Falha na criação da imagem durante a instalação de padrões. Por favor, verifique o arquivo /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:385
msgid "Creating Image - installing packages"
msgstr "Criando imagem - instalando pacotes"
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:395
msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
msgstr "Falha na criação da imagem durante a instalação de pacotes. Por favor, verifique o arquivo /tmp/ay_image.log"
#. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:404
+#: src/modules/AutoinstSoftware.rb:406
msgid "Store image to ..."
msgstr "Armazenar imagem em..."
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:435
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."
@@ -2664,16 +2606,16 @@
"Agora você pode alterar a imagem em %1/\n"
"Se você pressionar o botão Ok, a imagem será comprimida e não poderá mais ser alterada."
-#: src/modules/AutoinstSoftware.rb:447
+#: src/modules/AutoinstSoftware.rb:449
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr "Falha na compressão da imagem em '%1'. Por favor, verifique o arquivo /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:456
msgid "Image created successfully"
msgstr "Imagem criada com sucesso"
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:492
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."
@@ -2682,30 +2624,30 @@
"Você pode criar o arquivo com 'ls - F > directory.yast' se ele não existir."
#. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:524
+#: src/modules/AutoinstSoftware.rb:526
msgid "can not read '%1'. Try again?"
msgstr "não foi possível ler '%1'. Tentar novamente?"
#. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:544
msgid "can not read '%1'. ISO creation failed"
msgstr "Não foi possível ler '%1': falha na criação da imagem ISO."
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:574
msgid "Preparing ISO Filestructure ..."
msgstr "Preparando estrutura de arquivos da imagem ISO..."
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:623
msgid "boot config for the DVD"
msgstr "configuração da inicialização do DVD"
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:627
msgid "Ok"
msgstr "Ok"
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:630
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."
@@ -2715,43 +2657,43 @@
#. 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:647
+#: src/modules/AutoinstSoftware.rb:649
msgid "Store ISO image to ..."
msgstr "Armazenar a imagem ISO em..."
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:650
msgid "Creating ISO File ..."
msgstr "Criando o arquivo ISO..."
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:671
msgid "ISO successfully created at %1"
msgstr "ISO criada com sucesso em %1"
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:753
msgid "Selected Patterns"
msgstr "Padrões selecionados"
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:763
msgid "Individually Selected Packages"
msgstr "Pacotes selecionados individualmente"
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:769
msgid "Packages to Remove"
msgstr "Pacotes a remover"
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:776
msgid "Force Kernel Package"
msgstr "Forçar pacote do kernel"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:871
msgid "Could not set patterns: %1."
msgstr "Não foi possível definir padrões: %1."
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:932
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr "Falha na execução do resolvedor de pacotes. Verifique sua seção de software no perfil do AutoYaST."
@@ -2796,14 +2738,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:363
msgid "Collecting configuration data..."
msgstr "Obtendo dados de configuração..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:466
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr "Perfil AutoYaST criptografado. Digite a senha duas vezes."
@@ -2811,14 +2753,14 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:540
msgid "Could not write section %1 to file %2."
msgstr "Não foi possível escrever a seção %1 no arquivo %2."
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr "Perfil AutoYaST criptografado. Digite a senha correta."
@@ -2836,6 +2778,39 @@
msgid "&OK"
msgstr "&OK"
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "Não foi possível localizar o URL '%1' pelo protocolo HTTP(S). O servidor retornou o código %2."
+
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "Não foi possível localizar o URL '%1' pelo protocolo FTP. O servidor retornou o código %2."
+
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "Falha na leitura de %1/%2.\n"
+
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "Falha na leitura de %1.\n"
+
+#~ msgid "Mounting %1 failed."
+#~ msgstr "Falha na montagem de %1."
+
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "Falha na leitura de um arquivo no CD. Caminho: %1/%2."
+
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "Não foi possível recuperar o arquivo remoto %1"
+
+#~ msgid "%1 is not mounted and mount failed"
+#~ msgstr "%1 não está montado e a montagem falhou"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "Arquivo %1 não encontrado"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "Não foi possível localizar o URL '%1' pelo protocolo TFTP."
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "Protocolo %1 desconhecido."
+
#~ msgid "The resulting autoyast profile can be found in /root/autoinst.xml."
#~ msgstr "O perfil AutoYaST resultante encontra-se em /root/autoinst.xml."
@@ -2970,9 +2945,6 @@
#~ "Para mais informações, favor consultar a documentação.\n"
#~ "</P>\n"
-#~ msgid "Configure Drives"
-#~ msgstr "Configurar unidades"
-
#~ msgid "&Drive"
#~ msgstr "&Unidade"
Modified: trunk/yast/pt_BR/po/base.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/base.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/base.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-31 10:45UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -90,79 +90,79 @@
msgstr "Este módulo YaST2 não suporta a interface de linha de comando."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
msgid "Use 'help' for a complete list of available commands."
msgstr "Use 'help' para uma lista completa dos comandos disponíveis."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
msgid "Use 'yast2 %1 help' for a complete list of available commands."
msgstr "Use 'yast2 %1 help' para uma lista completa dos comandos disponíveis."
#. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
msgid "Unknown Command: %1"
msgstr "Comando desconhecido: %1"
#. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
msgid "Option '%1' is missing value."
msgstr "Está faltando o valor da opção '%1'."
#. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
msgid "Unknown option for command '%1': %2"
msgstr "Opção desconhecida para o comando '%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:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
msgid "Invalid value for option '%1': %2"
msgstr "Valor inválido para a opção '%1': %2"
#. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
msgid "Invalid value for option '%1' -- expected '%2', received %3"
msgstr "Valor inválido para a opção '%1' -- esperado '%2', recebido %3"
#. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
msgid "Option '%1' cannot have a value. Given value: %2"
msgstr "A opção '%1' não pode ter valor. O valor fornecido foi: %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:541
+#: library/commandline/src/modules/CommandLine.rb:533
msgid "Use '%1 %2 help' for a complete list of available options."
msgstr "Use '%1 %2 help' para uma lista completa de opções disponíveis."
#. 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:551
+#: library/commandline/src/modules/CommandLine.rb:543
msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
msgstr "Use 'yast2 %1 %2 help' para uma lista completa de opções disponíveis."
#. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
msgid "YaST Configuration Module %1\n"
msgstr "Módulo de configuração %1 do YaST\n"
#. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
msgid "No help available"
msgstr "Nenhuma ajuda disponível"
#. Process <command> "help"
#. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
msgid "Command '%1'"
msgstr "Comando '%1'"
#. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
msgid ""
"\n"
" Options:"
@@ -171,7 +171,7 @@
" Opções:"
#. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
msgid ""
"\n"
" Options of the [string] type must be written in the form 'option=value'."
@@ -180,7 +180,7 @@
" Opções do tipo [string] devem ser escritas no formato 'opção=valor'."
#. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
msgid ""
"\n"
" Example:"
@@ -189,137 +189,137 @@
" Exemplo:"
#. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
msgid "This is a YaST module."
msgstr "Este é um módulo do YaST."
#. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
msgid "Basic Syntax:"
msgstr "Sintaxe básica:"
#. translators: module command line help, %1 is the module name
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
msgid " yast2 %1 <command> [verbose] [options]"
msgstr " yast2 %1 <comando> [detalhes] [opções]"
#. translators: module command line help, %1 is the module name
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
msgid " yast2 %1 <command> help"
msgstr " yast2 %1 <comando> help"
#. translators: module command line help
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
msgid " <command> [options]"
msgstr " <comando> [opções]"
#. translators: module command line help
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
msgid " <command> help"
msgstr " <comando> help"
#. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
msgid "Commands:"
msgstr "Comandos:"
#. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
msgid "No help available."
msgstr "Nenhuma ajuda disponível."
#. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
msgid "<Error: invalid help>"
msgstr "<Erro: ajuda inválida>"
#. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
msgid "Run 'yast2 %1 <command> help' for a list of available options."
msgstr "Execute 'yast2 %1 <comando> help' para uma lista de opções disponíveis."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
+#: library/commandline/src/modules/CommandLine.rb:930
msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option."
msgstr "O nome do arquivo de destino (opção 'xmlfile') está faltando. Use a opção de linha de comando xmlfile=<arquivo_XML_de_destino>."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
+#: library/commandline/src/modules/CommandLine.rb:942
msgid "Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> command line option."
msgstr "O nome do arquivo de destino (opção 'xmlfile') está vazio. Use a opção de linha de comando xmlfile=<arquivo_XML_de_destino>."
#. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
msgid "unknown"
msgstr "desconhecido"
#. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
msgid "or '%1'"
msgstr "ou '%1'"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
msgid "Specify the command '%1'."
msgstr "Especifique o comando '%1'."
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
msgid "Specify one of the commands: %1."
msgstr "Especifique um dos comandos: %1."
#. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
msgid "Specify only one of the commands: %1."
msgstr "Especifique somente um dos comandos: %1."
#. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
msgid "There is no user interface available for this module."
msgstr "Não existe interface de usuário disponível para este módulo."
#. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
msgid "Ready"
msgstr "Pronto"
#. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
msgid "Initializing"
msgstr "Inicializando"
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
msgid "Finishing"
msgstr "Concluindo"
#. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
msgid "Done"
msgstr "Concluído"
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
msgid "Quitting (without changes)"
msgstr "Saindo (sem alterações)"
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
msgid "yes or no?"
msgstr "sim ou não?"
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
msgid "yes"
msgstr "sim"
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
msgid "no"
msgstr "não"
@@ -400,7 +400,7 @@
#. 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:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1435
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr "http://en.opensuse.org/Bugs/YaST"
@@ -413,7 +413,7 @@
#. from YaST logs.
#.
#. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
msgid "Installation Error"
msgstr "Erro na instalação"
@@ -436,7 +436,7 @@
msgstr "Removendo da memória de pacotes '%s'"
#. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1244
msgid "No workflow defined for this installation mode."
msgstr "Nenhum fluxo de trabalho definido para este modo de instalação."
@@ -448,14 +448,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
msgid "&Continue Installation"
msgstr "&Continuar a instalação"
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
msgid "&Abort Installation"
msgstr "Cancel&ar a instalação"
@@ -496,12 +496,12 @@
#. make sure that every workflow is merged only once
#. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
msgid "An internal error occurred when integrating additional workflow."
msgstr "Ocorreu um erro interno durante a integração do fluxo de trabalho adicional."
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
msgid "The value of %1 is invalid."
msgstr "O valor de %1 é inválido."
@@ -548,7 +548,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:255
#: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
msgid "During Boot"
msgstr "Durante a inicialização"
@@ -557,7 +557,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:257
#: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
msgid "Manually"
msgstr "Manualmente"
@@ -567,22 +567,22 @@
msgstr "Via xinetd"
#. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
msgid "Via &xinetd"
msgstr "Via &xinetd"
#. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
msgid "Service Start"
msgstr "Iniciar serviço"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
msgid "Service is running"
msgstr "O serviço está em execução"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
msgid "Service is not running"
msgstr "O serviço não está em execução"
@@ -591,7 +591,7 @@
#. %1 is eg. "Start the Service Now"
#. %2 is eg. "Stop the Service Now"
#. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
msgid ""
"<p><b><big>Switch On or Off</big></b><br>\n"
"To start or stop the service immediately, use \n"
@@ -605,7 +605,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:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
msgid ""
"<p>To save all changes and restart the\n"
"service immediately, use <b>%3</b>.</p>\n"
@@ -614,48 +614,48 @@
"serviço imediatamente, use <b>%3</b>.</p>\n"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
msgid "Start the Service Now"
msgstr "Iniciar o serviço agora"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
msgid "Stop the Service Now"
msgstr "Parar o serviço agora"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
msgid "Save Changes and Restart Service Now"
msgstr "Salvar as configurações e reiniciar o serviço agora"
#. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
msgid "&Start the Service Now"
msgstr "Iniciar o &serviço agora"
#. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
msgid "S&top the Service Now"
msgstr "&Parar o serviço agora"
#. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
msgid "S&ave Changes and Restart Service Now"
msgstr "S&alvar as configurações e reiniciar o serviço agora"
#. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
msgid "Switch On and Off"
msgstr "Ligar e desligar"
#. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
msgid "Current Status: "
msgstr "Status atual: "
#. help text for LDAP enablement widget
#. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
msgid ""
"<p><b><big>LDAP Support</big></b><br>\n"
"To store the settings in LDAP instead of native configuration files,\n"
@@ -666,12 +666,12 @@
"defina <b>%1</b>.</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
msgid "LDAP Support Active"
msgstr "Suporte LDAP ativo"
#. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
msgid "&LDAP Support Active"
msgstr "Suporte &LDAP ativo"
@@ -683,7 +683,7 @@
#. push button
#. push button
#. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
#: library/cwm/src/modules/TablePopup.rb:940
#: library/general/src/modules/Label.rb:166
msgid "&Up"
@@ -691,7 +691,7 @@
#. push button
#. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
#: library/cwm/src/modules/TablePopup.rb:942
msgid "&Down"
msgstr "Para &baixo"
@@ -733,12 +733,12 @@
msgstr "O arquivo especificado já existe. Sobrescrevê-lo?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
msgid "The TSIG key ID was not specified."
msgstr "O ID da chave TSIG não foi especificado."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
msgid ""
"The key with the specified ID exists and is used.\n"
"Remove it?"
@@ -747,7 +747,7 @@
"Removê-la?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
msgid ""
"A key with the specified ID was found\n"
"on your disk. Remove it?"
@@ -756,27 +756,27 @@
"no seu disco. Removê-la?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
msgid "The key will be created now. Continue?"
msgstr "A chave será criada agora. Continuar?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
msgid "Creating the TSIG key failed."
msgstr "Falha na criação de chave TSIG."
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
msgid "The specified file does not exist."
msgstr "O arquivo especificado não existe."
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
msgid "The specified file does not contain any TSIG key."
msgstr "O arquivo especificado não contém nenhuma chave TSIG."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
msgid ""
"The specified file contains a TSIG key with the same\n"
"identifier as some of already present keys.\n"
@@ -787,7 +787,7 @@
"As chaves antigas serão removidas. Continuar?"
#. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
msgid ""
"<p><big><b>TSIG Key Management</b></big><br>\n"
"Use this dialog to manage the TSIG keys.</p>\n"
@@ -796,7 +796,7 @@
"Use este diálogo para gerenciar as chaves TSIG.</p>\n"
#. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
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"
@@ -807,7 +807,7 @@
"contém a chave e clique em <b>Adicionar</b>.</p>\n"
#. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
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"
@@ -820,7 +820,7 @@
"<b>Gerar</b>.</p>\n"
#. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
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"
@@ -837,27 +837,27 @@
"parar de usá-la na configuração primeiro.</p>\n"
#. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
msgid "Add an Existing TSIG Key"
msgstr "Adicionar uma chave TSIG existente"
#. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
msgid "Create a New TSIG Key"
msgstr "Criar uma nova chave TSIG"
#. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
msgid "&Key ID"
msgstr "ID da c&have"
#. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
msgid "&Generate"
msgstr "&Gerar"
#. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
msgid "Current TSIG Keys"
msgstr "Chaves TSIG atuais"
@@ -865,7 +865,7 @@
#. table header - GPG key ID
#. table header - GPG key ID
#. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
#: library/gpg/src/modules/GPGWidgets.rb:192
#: library/gpg/src/modules/GPGWidgets.rb:224
#: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -873,22 +873,22 @@
msgstr "ID da chave"
#. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
msgid "Filename"
msgstr "Nome do arquivo"
#. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
msgid "&Selected Option"
msgstr "Opção &selecionada"
#. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
msgid "Current Option: "
msgstr "Opção atual: "
#. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
msgid "The selected option is already present."
msgstr "A opção selecionada já está presente."
@@ -952,19 +952,19 @@
"na lista.</p>"
#. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
msgid "&Other"
msgstr "&Outro"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
msgid "The device is not configured"
msgstr "O dispositivo não está configurado"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
msgid "Press <B>Edit</B> to configure"
msgstr "Pressione <B>Editar</B> para configurar"
@@ -1108,9 +1108,91 @@
"<p>Em alguns ambientes, todas ou algumas\n"
"teclas F não estão disponíveis.</p>"
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+#, fuzzy
+#| msgid "Reload After Saving Settings"
+msgid "Restart After Saving Settings"
+msgstr "Recarregar após salvar as configurações"
+
+#: library/general/src/lib/ui/service_status.rb:61
+msgid "Reload After Saving Settings"
+msgstr "Recarregar após salvar as configurações"
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+msgid "Service Status"
+msgstr "Status do serviço"
+
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:129
+#, fuzzy
+#| 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"
+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_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</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 ""
+"<p><b><big>Status atual</big></b><br>\n"
+"Exibe o status atual do serviço. O status irá permanecer o mesmo após salvar as configurações, independentemente do valor do 'iniciar o serviço durante a inicialização'.</p>\n"
+"<p><b><big>Recarregar após salvar as configurações</big></b><br>\n"
+"Somente aplicável se o serviço está atualmente em execução. Garante que o serviço em execução recarregue a nova configuração após salvá-la (através dos botões 'OK' ou 'Salvar').</p>\n"
+"<p><b><big>Iniciar durante a inicialização do sistema</big></b><br>\n"
+"Marque este campo para habilitar o serviço na inicialização do sistema. Desmarque-o para desabilitar o serviço. Isto não afeta o status atual do serviço no sistema atualmente em execução.</p>\n"
+
+#. Widget displaying the status and associated buttons
+#: library/general/src/lib/ui/service_status.rb:155
+msgid "Current status:"
+msgstr "Status atual:"
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:168
+msgid "Start During System Boot"
+msgstr "Iniciar durante a inicialização do sistema"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:192
+msgid "running"
+msgstr "em execução"
+
+#: library/general/src/lib/ui/service_status.rb:194
+msgid "Stop now"
+msgstr "Parar agora"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:199
+msgid "stopped"
+msgstr "parado"
+
+#: library/general/src/lib/ui/service_status.rb:201
+msgid "Start now"
+msgstr "Iniciar agora"
+
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
msgid ""
"Although the path %1 exists, it is not a directory.\n"
"Continue or cancel the operation?\n"
@@ -1120,7 +1202,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:306
+#: library/general/src/modules/FileUtils.rb:300
msgid ""
"The path %1 does not exist.\n"
"Create it now?\n"
@@ -1130,7 +1212,7 @@
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
msgid ""
"Failed to create the directory %1.\n"
"Continue or cancel the current operation?\n"
@@ -1308,7 +1390,7 @@
#. 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:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "&Ignorar"
@@ -1331,7 +1413,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2221
msgid "&Password"
msgstr "S&enha"
@@ -1550,27 +1632,27 @@
msgstr "O arquivo de versão %{file} não foi encontrado"
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
msgid "Really abort the installation?"
msgstr "Realmente cancelar a instalação?"
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
msgid "Really abort YaST System Repair?"
msgstr "Realmente cancelar o reparo do sistema (YaST)?"
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
msgid "Abort System Repair"
msgstr "Cancelar o reparo do sistema"
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
msgid "&Continue System Repair"
msgstr "&Continuar o reparo do sistema"
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1583,7 +1665,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:766
+#: library/general/src/modules/Popup.rb:759
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1597,7 +1679,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:775
+#: library/general/src/modules/Popup.rb:768
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1608,18 +1690,18 @@
"Você necessitará reinstalar."
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
msgid "Really abort?"
msgstr "Realmente cancelar?"
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
msgid "All changes will be lost!"
msgstr "Todas as alterações serão perdidas!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
msgid "&Details..."
msgstr "&Detalhes..."
@@ -1647,7 +1729,7 @@
#: 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/network/src/modules/NetworkPopup.rb:90
#: library/types/src/modules/String.rb:101
msgid "Yes"
msgstr "Sim"
@@ -1658,7 +1740,7 @@
#: 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/network/src/modules/NetworkPopup.rb:89
#: library/types/src/modules/String.rb:101
msgid "No"
msgstr "Não"
@@ -1722,19 +1804,19 @@
msgstr "Erros de log: %1"
#. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
msgid "Warning:"
msgstr "Aviso:"
#. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
msgid "Error:"
msgstr "Erro:"
#. translators: message summary header
#. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
msgid "Message:"
msgstr "Mensagem:"
@@ -1787,7 +1869,7 @@
msgstr "Remo&ver"
#. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
msgid "&Variable"
msgstr "&Variável"
@@ -1883,7 +1965,7 @@
msgstr "Digite a frase secreta"
#. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
msgid "Enter Passphrase to Unlock GPG Key %1: "
msgstr "Digite a frase secreta para desbloquear a chave GPG %1: "
@@ -1989,6 +2071,233 @@
msgid "Error occurred while reading the log."
msgstr "Ocorreu um erro durante a leitura do log."
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "Zona desconhecida"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"A interface '%1' não está associada a nenhuma zona do firewall.\n"
+"Execute o firewall do YaST2 e associe-a.\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "Zona externa"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "Zona interna"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "Zona desmilitarizada"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+msgid "TCP"
+msgstr "TCP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+msgid "UDP"
+msgstr "UDP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+msgid "RPC"
+msgstr "RPC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+msgid "IP"
+msgstr "IP"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"A interface '%1' está incluída em múltiplas zonas do firewall.\n"
+"Continuando a configuração poderá ocorrer erros.\n"
+"\n"
+"É recomendado deixar a configuração e corrigir manualmente\n"
+"o arquivo '/etc/sysconfig/SuSEFirewall'."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "Inicializando a configuração do firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "Verificar dispositivos de rede"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "Ler a configuração atual"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "Verificar possíveis serviços conflitantes"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "Verificando dispositivos de rede..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "Lendo a configuração atual..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "Verificando possíveis serviços conflitantes..."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "Salvando as configurações do firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "Salvar as configurações do firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "Ajustar o serviço do firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "Salvando as configurações do firewall..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "Ajustando o serviço do firewall..."
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "Falha ao salvar as configurações"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+msgid "Unknown protocol (%1)"
+msgstr "Protocolo desconhecido (%1) "
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" => [ ],
+#. "rpc_ports" => [ "portmap", "ypbind" ],
+#. "ip_protocols" => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr "O serviço com o nome '%{service_name}' não existe"
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+msgid "Service: %{filename}"
+msgstr "Serviço: %{filename}"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "Chaves GPG públicas"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "Serviço desconhecido '%1'"
+
#. label
#: library/network/src/modules/CWMFirewallInterfaces.rb:109
msgid "Firewall cannot be adjusted during first stage installation."
@@ -2030,13 +2339,13 @@
msgstr "A interface não está atribuída a nenhuma zona"
#. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
msgid "&Network Interfaces with Open Port in Firewall"
msgstr "&Interfaces de rede com porta aberta no firewall"
#. Check the INT zone, it's not protected by default
#. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
msgid ""
"These network interfaces assigned to internal network cannot be deselected:\n"
"%1\n"
@@ -2045,7 +2354,7 @@
"%1\n"
#. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -2058,7 +2367,7 @@
"Continuar?"
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces will additionally be open:\n"
@@ -2074,8 +2383,8 @@
#. yes-no popup
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces cannot be opened:\n"
@@ -2090,22 +2399,22 @@
"Continuar?"
#. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
msgid "Network &Interfaces with Open Port in Firewall"
msgstr "I&nterfaces de rede com porta aberta no firewall"
#. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
msgid "Select &All"
msgstr "&Selecionar tudo"
#. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
msgid "Select &None"
msgstr "A&nular seleção"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
msgid ""
"Error checking service status:\n"
"%{details}"
@@ -2114,7 +2423,7 @@
"%{details}"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
msgid ""
"Error setting service status:\n"
"%{details}"
@@ -2124,7 +2433,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:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
"To open the firewall to allow access to the service from remote computers,\n"
@@ -2137,7 +2446,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:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
msgid ""
"To select interfaces on which to open the port,\n"
"click <b>%2</b>.<br>"
@@ -2146,7 +2455,7 @@
"clique em <b>%2</b>.<br>"
#. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
@@ -2155,46 +2464,48 @@
"estiver habilitado.</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
msgid "Open Port in Firewall"
msgstr "Abrir porta no firewall"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
msgid "Firewall Details"
msgstr "Detalhes do firewall"
#. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
msgid "Open Port in &Firewall"
msgstr "Abrir porta no &firewall"
#. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
msgid "Firewall &Details..."
msgstr "Detalhes do &firewall..."
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
msgstr "Configurações do firewall"
#. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
msgid "Firewall is open"
msgstr "O firewall está aberto"
#. pppN must be tried before pN, modem before netcard
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
#: 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:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
msgid "Network Card"
msgstr "Placa de rede"
@@ -2202,27 +2513,27 @@
#. Device type label
#. Device type label
#. Device type label
-#: 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:425
#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN"
msgstr "ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL"
msgstr "DSL"
-#: 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
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
msgid "Unknown"
msgstr "Desconhecido"
@@ -2232,389 +2543,389 @@
#. are represented as its sub-interfaces.
#. And also we frequently confuse "device" and "interface"
#. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
msgid "Additional Address"
msgstr "Endereço adicional"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet"
msgstr "ARCnet"
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet Network Card"
msgstr "Placa de rede ARCnet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
msgid "ATM"
msgstr "ATM"
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
msgid "Asynchronous Transfer Mode (ATM)"
msgstr "Modo de transferência assíncrono (ATM)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
msgid "Bluetooth"
msgstr "Bluetooth"
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
msgid "Bluetooth Connection"
msgstr "Conexão Bluetooth"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond"
msgstr "Vínculo"
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond Network"
msgstr "Rede vinculada"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
msgid "CLAW"
msgstr "CLAW"
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
msgid "Common Link Access for Workstation (CLAW)"
msgstr "Acesso por link comum para estações de trabalho (CLAW)"
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
msgid "ISDN Card"
msgstr "Placa ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
#: library/system/src/include/hwinfo/classnames.rb:223
msgid "CTC"
msgstr "CTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
msgid "Channel to Channel Interface (CTC)"
msgstr "Interface canal a canal (CTC)"
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL Connection"
msgstr "Conexão DSL"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy"
msgstr "Fictício"
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy Network Device"
msgstr "Dispositivo de rede fictício"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
#: library/system/src/include/hwinfo/classnames.rb:227
msgid "ESCON"
msgstr "ESCON"
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
msgid "Enterprise System Connector (ESCON)"
msgstr "Conector de sistemas empresariais (ESCON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
#: library/system/src/include/hwinfo/classnames.rb:220
msgid "Ethernet"
msgstr "Ethernet"
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
msgid "Ethernet Network Card"
msgstr "Placa de rede Ethernet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
#: library/system/src/include/hwinfo/classnames.rb:222
msgid "FDDI"
msgstr "FDDI"
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
msgid "FDDI Network Card"
msgstr "Placa de rede FDDI"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
msgid "FICON"
msgstr "FICON"
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
msgid "Fiberchannel System Connector (FICON)"
msgstr "Conector de sistema de canal de fibra (FICON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
msgid "HIPPI"
msgstr "HIPPI"
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
msgid "HIgh Performance Parallel Interface (HIPPI)"
msgstr "Interface paralela de alta performance (HIPPI)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
msgid "Hipersockets"
msgstr "Hipersockets"
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
msgid "Hipersockets Interface (HSI)"
msgstr "Interface hipersockets (HSI)"
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN Connection"
msgstr "Conexão ISDN"
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "IrDA"
msgstr "Infravermelho"
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
msgid "Infrared Network Device"
msgstr "Dispositivo de rede infravermelho"
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "Infrared Device"
msgstr "Dispositivo infravermelho"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
#: library/system/src/include/hwinfo/classnames.rb:224
msgid "IUCV"
msgstr "IUCV"
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
msgid "Inter User Communication Vehicle (IUCV)"
msgstr "Veículo de comunicação inter-usuário (IUCV)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS"
msgstr "OSA LCS"
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS Network Card"
msgstr "Placa de rede OSA LCS"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
#: library/system/src/include/hwinfo/classnames.rb:219
msgid "Loopback"
msgstr "Loopback"
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
msgid "Loopback Device"
msgstr "Dispositivo loopback"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
#: library/system/src/include/hwinfo/classnames.rb:228
msgid "Myrinet"
msgstr "Myrinet"
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
msgid "Myrinet Network Card"
msgstr "Placa de rede Myrinet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
msgid "Parallel Line"
msgstr "Linha paralela"
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
msgid "Parallel Line Connection"
msgstr "Conexão de linha paralela"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
#: library/system/src/include/hwinfo/classnames.rb:226
msgid "QETH"
msgstr "QETH"
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
msgid "OSA-Express or QDIO Device (QETH)"
msgstr "Dispositivo OSA-Express ou QDIO (QETH)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
msgid "IPv6-in-IPv4"
msgstr "IPv6 no IPv4"
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
msgid "IPv6-in-IPv4 Encapsulation Device"
msgstr "Dispositivo de encapsulamento IPv6 no IPv4"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
msgid "Serial Line"
msgstr "Linha serial"
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
msgid "Serial Line Connection"
msgstr "Conexão de linha serial"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
msgid "Token Ring"
msgstr "Token Ring"
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
msgid "Token Ring Network Card"
msgstr "Placa de rede Token Ring"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB"
msgstr "USB"
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB Network Device"
msgstr "Dispositivo de rede USB"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare"
msgstr "VMWare"
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare Network Device"
msgstr "Dispositivo de rede VMWare"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
msgid "Wireless"
msgstr "Sem fio"
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
msgid "Wireless Network Card"
msgstr "Placa de rede sem fio"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XPNET"
msgstr "XPNET"
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XP Network"
msgstr "Rede XP"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "VLAN"
msgstr "VLAN"
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "Virtual LAN"
msgstr "Rede local virtual"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#: library/system/src/include/hwinfo/classnames.rb:89
#: library/system/src/include/hwinfo/classnames.rb:101
msgid "Bridge"
msgstr "Ponte"
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
msgid "Network Bridge"
msgstr "Ponte de rede"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "TUN"
msgstr "TUN"
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "Network TUNnel"
msgstr "TUNel de rede"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "TAP"
msgstr "TAP"
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "Network TAP"
msgstr "TAP de rede"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#: library/system/src/include/hwinfo/classnames.rb:152
msgid "InfiniBand"
msgstr "InfiniBand"
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
msgid "InfiniBand Device"
msgstr "Dispositivo InfiniBand"
#. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
msgid "Unknown device"
msgstr "Dispositivo desconhecido"
#. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
msgid "DHCP address"
msgstr "Endereço DHCP"
#. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
msgid "No IP address assigned"
msgstr "Nenhum endereço IP atribuído"
#. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
msgid "Device Type"
msgstr "Tipo de dispositivo"
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
msgid "Device Name"
msgstr "Nome do dispositivo"
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
msgid "IP Address"
msgstr "Endereço IP"
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
msgid "Device ID"
msgstr "ID do dispositivo"
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
msgid "Connected"
msgstr "Conectado"
#. label message
#. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
msgid "Scanning for hosts on this LAN..."
msgstr "Pesquisando por máquinas nesta rede local..."
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
msgid "&NFS Servers"
msgstr "Servidores &NFS"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
msgid "Re&mote Hosts"
msgstr "Máquinas re&motas"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
msgid "&Exported Directories"
msgstr "Diretórios &exportados"
#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
msgid ""
"Your network interfaces are currently controlled by NetworkManager\n"
"but the service to configure might not work well with it.\n"
@@ -2629,7 +2940,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:348
+#: library/network/src/modules/NetworkService.rb:346
msgid ""
"No running network detected.\n"
"Restart installation and configure network in Linuxrc\n"
@@ -2639,7 +2950,7 @@
"Reinicie a instalação e configure a rede no Linuxrc\n"
"ou continue sem rede."
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
msgid ""
"No running network detected.\n"
"Configure network with YaST or Network Manager plug-in\n"
@@ -2662,142 +2973,6 @@
"e '*+._-'. Um número de porta deve ser um número de 0 a 65535.\n"
"Espaços não são permitidos.\n"
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
-msgid "External Zone"
-msgstr "Zona externa"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
-msgid "Internal Zone"
-msgstr "Zona interna"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
-msgid "Demilitarized Zone"
-msgstr "Zona desmilitarizada"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
-msgid "TCP"
-msgstr "TCP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
-msgid "UDP"
-msgstr "UDP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
-msgid "RPC"
-msgstr "RPC"
-
-#. protocol name
-#: 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:1158
-msgid "Unknown Zone"
-msgstr "Zona desconhecida"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"A interface '%1' está incluída em múltiplas zonas do firewall.\n"
-"Continuando a configuração poderá ocorrer erros.\n"
-"\n"
-"É recomendado deixar a configuração e corrigir manualmente\n"
-"o arquivo '/etc/sysconfig/SuSEFirewall'."
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: 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"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"A interface '%1' não está associada a nenhuma zona do firewall.\n"
-"Execute o firewall do YaST2 e associe-a.\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
-msgid "Initializing Firewall Configuration"
-msgstr "Inicializando a configuração do firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
-msgid "Check for network devices"
-msgstr "Verificar dispositivos de rede"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Read current configuration"
-msgstr "Ler a configuração atual"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Check possibly conflicting services"
-msgstr "Verificar possíveis serviços conflitantes"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
-msgid "Checking for network devices..."
-msgstr "Verificando dispositivos de rede..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Reading current configuration..."
-msgstr "Lendo a configuração atual..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Checking possibly conflicting services..."
-msgstr "Verificando possíveis serviços conflitantes..."
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
-msgid "Writing Firewall Configuration"
-msgstr "Salvando as configurações do firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
-msgid "Write firewall settings"
-msgstr "Salvar as configurações do firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
-msgid "Adjust firewall service"
-msgstr "Ajustar o serviço do firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
-msgid "Writing firewall settings..."
-msgstr "Salvando as configurações do firewall..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
-msgid "Adjusting firewall service..."
-msgstr "Ajustando o serviço do firewall..."
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
-msgid "Writing settings failed"
-msgstr "Falha ao salvar as configurações"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
-msgid "Unknown protocol (%1)"
-msgstr "Protocolo desconhecido (%1) "
-
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
#: library/network/src/modules/SuSEFirewallProposal.rb:167
msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2884,61 +3059,14 @@
msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
msgstr "Você está instalando um sistema usando um destino iSCSI, mas você não abriu as portas necessárias no firewall."
-#. Returns service definition.
-#. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
-#.
-#. @param [String] service name
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param map <string, list <string> > of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. $[
-#. "tcp_ports" : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports" : [ ],
-#. "rpc_ports" : [ "portmap", "ypbind" ],
-#. "ip_protocols" : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: library/network/src/modules/SuSEFirewallServices.rb:354
-#: library/network/src/modules/SuSEFirewallServices.rb:637
-msgid "Service with name '%{service_name}' does not exist"
-msgstr "O serviço com o nome '%{service_name}' não existe"
-
-#. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:430
-msgid "Service: %{filename}"
-msgstr "Serviço: %{filename}"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
-msgid "Unknown service '%1'"
-msgstr "Serviço desconhecido '%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:106
#: library/packages/src/include/packages/common.rb:135
msgid "These packages need to be installed:"
msgstr "Estes pacotes necessitam ser instalados:"
+#. the message is followed by list of required packages
#. Popup Text
#: library/packages/src/include/packages/common.rb:109
#: library/packages/src/include/packages/common.rb:137
@@ -2952,35 +3080,77 @@
msgid "&Uninstall"
msgstr "&Desinstalar"
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
+#, fuzzy
+#| msgid "Checking possibly conflicting services..."
+msgid "Checking file conflicts..."
+msgstr "Verificando possíveis serviços conflitantes..."
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
msgid "Downloading package %1 (%2)..."
msgstr "Baixando o pacote %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
msgid "Downloading Package"
msgstr "Baixando o pacote"
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
msgid "Package %1 is broken, integrity check has failed."
msgstr "O pacote %1 está corrompido. Falha na verificação da integridade."
#. 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:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
msgid "Retry installation of the package?"
msgstr "Repetir a instalação do pacote?"
#. 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:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
msgid "Abort the installation?"
msgstr "Cancelar a instalação?"
@@ -2989,15 +3159,15 @@
#. 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:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2136
msgid "Error: %1:"
msgstr "Erro: %1:"
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
msgid ""
"Ignoring a download failure may result in a broken system.\n"
"Verify the system later by running the Software Management module.\n"
@@ -3006,35 +3176,35 @@
"Verifique o sistema mais tarde executando o módulo de gerenciamento de software.\n"
#. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
msgid "Uninstalling package %1 (%2)..."
msgstr "Desinstalando o pacote %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
msgid "Installing package %1 (%2)..."
msgstr "Instalando o pacote %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Uninstalling Package"
msgstr "Desinstalando o pacote"
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Installing Package"
msgstr "Instalando o pacote"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
msgid "Removal of package %1 failed."
msgstr "Falha ao remover o pacote %1."
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
msgid "Installation of package %1 failed."
msgstr "Falha ao instalar o pacote %1."
#. 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:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
msgid ""
"Ignoring a package failure may result in a broken system.\n"
"The system should be later verified by running the Software Management module."
@@ -3043,7 +3213,7 @@
"O sistema deve ser verificado mais tarde através da execução do módulo de gerenciamento de software."
#. error report
-#: library/packages/src/modules/PackageCallbacks.rb:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
"If the URL is correct, this indicates that the repository content has changed. To \n"
@@ -3058,27 +3228,27 @@
#. 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:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
msgid "Side A"
msgstr "Lado A"
#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
msgid "Side B"
msgstr "Lado 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:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
msgid "%1 (Disc %2)"
msgstr "%1 (disco %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:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
msgid "%1 (Medium %2)"
msgstr "%1 (mídia %2)"
#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
msgid ""
"Insert\n"
"'%1'"
@@ -3087,7 +3257,7 @@
"'%1'"
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
msgid ""
"Cannot access installation media\n"
"%1\n"
@@ -3100,7 +3270,7 @@
"Verifique se o diretório está acessível."
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
msgid ""
"Cannot access installation media \n"
"%1\n"
@@ -3114,83 +3284,83 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1835
msgid "Skip Autorefresh"
msgstr "Ignorar a atualização automática"
#. 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:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
msgid "&Eject"
msgstr "&Ejetar"
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
msgid "A&utomatically Eject CD or DVD Medium"
msgstr "Ejetar a&utomaticamente a mídia de CD/DVD"
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
msgid "Retry the installation?"
msgstr "Repetir a instalação?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
msgid "Skip the medium?"
msgstr "Ignorar a mídia?"
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
msgid "Ignoring the bad medium..."
msgstr "Ignorando a mídia defeituosa..."
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
msgid "&URL"
msgstr "&URL"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
msgid "Creating Repository %1"
msgstr "Criando o repositório %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
msgid "An error occurred while creating the repository."
msgstr "Ocorreu um erro durante a criação do repositório."
#. 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:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
msgid "Unable to retrieve the remote repository description."
msgstr "Não foi possível obter a descrição do repositório remoto."
#. 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:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
msgid "An error occurred while retrieving the new metadata."
msgstr "Ocorreu um erro ao obter os novos metadados."
#. 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:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
msgid "The repository is not valid."
msgstr "O repositório não é válido."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
msgid "The repository metadata is invalid."
msgstr "Os metadados do repositório são inválidos."
@@ -3198,92 +3368,92 @@
#. 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:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2090
msgid "Retry?"
msgstr "Repetir?"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
msgid "Probing Repository %1"
msgstr "Testando o repositório %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
msgid "Error occurred while probing the repository."
msgstr "Ocorreu um erro durante o teste do repositório."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
msgid "Repository probing details."
msgstr "Detalhes do teste do repositório."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
msgid "Repository metadata is invalid."
msgstr "Os metadados do repositório são inválidos."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
msgid "Repository %1"
msgstr "Repositório %1"
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "Baixando o pacote RPM delta %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
msgid "Downloading Delta RPM package"
msgstr "Baixando o pacote RPM delta"
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
msgid "Applying delta RPM package %1..."
msgstr "Aplicando o pacote RPM delta %1..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
msgid "Applying delta RPM package"
msgstr "Aplicando o pacote RPM delta"
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3070
msgid "Package: "
msgstr "Pacote: "
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
msgid "Starting script %1 (patch %2)..."
msgstr "Iniciando o script %1 (correção %2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
msgid "Running Script"
msgstr "Executando o script"
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
msgid "Patch: "
msgstr "Correção: "
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
msgid "Script: "
msgstr "Script: "
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
msgid "Output of the Script"
msgstr "Saída do script"
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
msgid ""
"Patch: %1\n"
"\n"
@@ -3292,7 +3462,7 @@
"\n"
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3307,36 +3477,36 @@
"podem faltar ou estarem desatualizados."
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
msgid "&Skip Refresh"
msgstr "Ig&norar atualização"
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
msgid "Downloading"
msgstr "Baixando"
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1770
msgid "Downloading: %1"
msgstr "Baixando: %1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
msgid "Checking Package Database"
msgstr "Verificando o banco de dados de pacotes"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1875
msgid "Rebuilding package database. This process can take some time."
msgstr "Reconstruindo o banco de dados de pacotes. Este processo pode levar algum tempo."
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1908
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3345,16 +3515,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Converting package database. This process can take some time."
msgstr "Convertendo o banco de dados de pacotes. Este processo pode levar algum tempo."
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1954
msgid "Status"
msgstr "Status"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1978
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3363,12 +3533,12 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2014
msgid "Reading RPM database..."
msgstr "Lendo o banco de dados RPM..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2023
msgid "Reading Installed Packages"
msgstr "Lendo os pacotes instalados"
@@ -3379,27 +3549,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
msgid "Scanning RPM database..."
msgstr "Lendo o banco de dados RPM..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2079
msgid "Initialization of the target failed."
msgstr "Falha na inicialização do destino."
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2171
msgid "RPM database read"
msgstr "Banco de dados RPM lido"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2203
msgid "User Authentication"
msgstr "Autenticação de usuário"
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2209
msgid ""
"URL: %1\n"
"\n"
@@ -3410,20 +3580,20 @@
"%2"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid "&User Name"
msgstr "Nome de &usuário"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3005
msgid "Show &details"
msgstr "Exibir &detalhes"
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3071
msgid "Size: "
msgstr "Tamanho:"
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3094
msgid "Remaining time to automatic retry: %1"
msgstr "Tempo restante para a tentativa automática: %1"
@@ -3501,12 +3671,12 @@
"ser resolvidas manualmente no gerenciador de software."
#. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:418
msgid "Installing required packages failed."
msgstr "Falha ao instalar os pacotes requeridos."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:422
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3517,12 +3687,12 @@
"o YaST pode não funcionar adequadamente.\n"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
msgid "Cannot continue without installing required packages."
msgstr "Não foi possível continuar sem instalar os pacotes requeridos."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
@@ -3531,22 +3701,22 @@
"o YaST pode não funcionar adequadamente.\n"
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
msgid "Confirm Package License: %1"
msgstr "Confirmar a licença do pacote: %1"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
msgid "I &Agree"
msgstr "Eu &concordo"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
msgid "I &Disagree"
msgstr "Eu &discordo"
#. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
"The package in the headline of the dialog requires an explicit confirmation\n"
@@ -3565,7 +3735,7 @@
"Para rejeitar a licença do pacote, clique em <b>Eu discordo</b></p>."
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3579,7 +3749,7 @@
"\t\t da esquerda. Para ver a descrição de um item, selecione-o na lista.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3593,7 +3763,7 @@
"\t\t Com o menu de contexto, você também pode alterar o status de todos os itens.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3605,7 +3775,7 @@
"\t\t em que você pode ver e selecionar pacotes de software individuais.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
msgid ""
"<p>\n"
"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3625,124 +3795,124 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
msgid "Software Selection and System Tasks"
msgstr "Seleção de software e tarefas do sistema"
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
msgid "(more)"
msgstr "(mais)"
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
msgid "Installation Successfully Finished"
msgstr "Instalação concluída com sucesso"
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
msgid "Package Installation Failed"
msgstr "Falha na instalação de pacotes"
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
msgid "Error Message: %1"
msgstr "Mensagem de erro: %1"
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
msgid "Failed Packages: %1"
msgstr "Falha nos pacotes: %1"
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
msgid "Installed Packages: %1"
msgstr "Pacotes instalados: %1"
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
msgid "Updated Packages: %1"
msgstr "Pacotes atualizados: %1"
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
msgid "Removed Packages: %1"
msgstr "Pacotes removidos: %1"
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
msgid "Not Installed Packages: %1"
msgstr "Pacotes não instalados: %1"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
msgid "Packages"
msgstr "Pacotes"
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
msgid "Elapsed Time: %1"
msgstr "Tempo decorrido: %1"
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
msgid "Total Installed Size: %1"
msgstr "Tamanho total instalado: %1"
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
msgid "Total Downloaded Size: %1"
msgstr "Tamanho total do download: %1"
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
msgid "Statistics"
msgstr "Estatísticas"
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:713
msgid "Installation log"
msgstr "Log da instalação"
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
msgid "Details"
msgstr "Detalhes"
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
msgid "After Installing Packages"
msgstr "Após instalar os pacotes"
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Show This Report"
msgstr "Exibir este relatório"
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:682
msgid "Finish"
msgstr "Concluir"
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:683
msgid "Continue in the Software Manager"
msgstr "Permanecer no gerenciador de software"
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:688
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr "<P><BIG><B>Relatório da instalação</B></BIG><BR>Eis o resumo dos pacotes instalados ou removidos.</P>"
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:696
msgid "Installation Report"
msgstr "Relatório de instalação"
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:718
msgid "Installed Packages"
msgstr "Pacotes instalados"
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:723
msgid "Updated Packages"
msgstr "Pacotes atualizados"
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:728
msgid "Removed Packages"
msgstr "Pacotes removidos"
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:733
msgid "Remaining Packages"
msgstr "Pacotes restantes"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:754
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -3759,7 +3929,7 @@
#. popup question, %1 stands for the package name
#. %2 is a repository name
#. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
msgid ""
"The package %1 from repository %2\n"
"%3\n"
@@ -3780,7 +3950,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:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
msgid ""
"The file %1 from repository %2\n"
"%3\n"
@@ -3799,16 +3969,16 @@
"Usá-lo mesmo assim?\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
msgid "Unsigned Package"
msgstr "Pacote não assinado"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
msgid "Unsigned File"
msgstr "Arquivo não assinado"
#. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
msgid ""
"No checksum for package %1 was found in the repository.\n"
"While the package is part of the signed repository, it is not contained \n"
@@ -3825,7 +3995,7 @@
"Instalá-lo mesmo assim?\n"
#. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
msgid ""
"No checksum for file %1 was found in the repository.\n"
"This means that the file is part of the signed repository,\n"
@@ -3842,62 +4012,62 @@
"Usá-lo mesmo assim?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
msgid "No Checksum Found"
msgstr "Nenhuma soma de verificação encontrada"
#. 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:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
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:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
msgid "Fingerprint: %1"
msgstr "Impressão digital: %1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
msgid "Name: %1"
msgstr "Nome: %1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
msgid "Created: %1"
msgstr "Criada em: %1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
msgid "Expires: %1"
msgstr "Expira em: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
msgid "ID: "
msgstr "ID: "
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
msgid "Name: "
msgstr "Nome:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
msgid "Fingerprint: "
msgstr "Impressão digital:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
msgid "Created: "
msgstr "Criada em:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
msgid "Expires: "
msgstr "Expira em:"
#. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
msgid ""
"Package %1 from repository %2\n"
"%3\n"
@@ -3920,7 +4090,7 @@
"Instalá-lo mesmo assim?\n"
#. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
msgid ""
"File %1 from repository %2\n"
"%3\n"
@@ -3943,12 +4113,12 @@
"Usá-lo mesmo assim?\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
msgid "Validation Check Failed"
msgstr "Falha na verificação da validação"
#. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
msgid ""
"The package %1 is digitally signed\n"
"with the following unknown GnuPG key: %2.\n"
@@ -3969,7 +4139,7 @@
"Instalá-lo mesmo assim?"
#. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
msgid ""
"The file %1\n"
"is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -3990,12 +4160,12 @@
"Usá-lo mesmo assim?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
msgid "Unknown GnuPG Key"
msgstr "Chave GnuPG desconhecida"
#. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
msgid ""
"The package %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4018,7 +4188,7 @@
"ignorar o pacote.\n"
#. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
msgid ""
"The file %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4041,17 +4211,17 @@
"ignorá-lo.\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
msgid "Signed with Untrusted Public Key"
msgstr "Assinado com chave pública não confiável"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
msgid "&Trust and Import the Key"
msgstr "Confiar e impor&tar a chave"
#. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
msgid ""
"<p>The owner of the key may distribute updates,\n"
"packages, and package repositories that your system will trust and offer\n"
@@ -4066,7 +4236,7 @@
"tenha um certo controle sobre o software do seu sistema.</p>"
#. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
msgid ""
"<p>A warning dialog opens for every package that\n"
"is not signed by a trusted (imported) key. If you do not trust the key,\n"
@@ -4077,7 +4247,7 @@
"pacotes ou repoitórios criados pelo proprietário da chave não serão usados.</p>"
#. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
msgid ""
"The following GnuPG key has been found in repository\n"
"%1\n"
@@ -4088,7 +4258,7 @@
"(%2):"
#. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
msgid ""
"You can choose to import it into your keyring of trusted\n"
"public keys, meaning that you trust the owner of the key.\n"
@@ -4101,23 +4271,23 @@
"que a chave realmente pertence a esse proprietário antes de importá-la."
#. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
msgid "WARNING: The key has expired!"
msgstr "AVISO: a chave expirou!"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
msgid "Import Untrusted GnuPG Key"
msgstr "Importar chave GnuPG não confiável"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
msgid "&Trust"
msgstr "&Confiar"
#. 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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
msgid ""
"The expected checksum of file %1\n"
"is %2,\n"
@@ -4140,12 +4310,12 @@
"Usá-lo mesmo assim?\n"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
msgid "Wrong Digest"
msgstr "Digest errado"
#. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
msgid ""
"The checksum of file %1\n"
"is %2,\n"
@@ -4166,7 +4336,7 @@
"Usá-lo mesmo assim?\n"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
msgid "Unknown Digest"
msgstr "Digest desconhecido"
@@ -4175,76 +4345,76 @@
#. Return the description for the current stage.
#. @return [String] localized string description
#. 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:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
msgid "Installing..."
msgstr "Instalando..."
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
msgid "Media"
msgstr "Mídia"
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
msgid "Remaining"
msgstr "Restante"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
msgid "Time"
msgstr "Hora"
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
msgid "Actions performed:"
msgstr "Ações realizadas:"
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
msgid "<p>Packages are being installed.</p>"
msgstr "<p>Pacotes estão sendo instalados.</p>"
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
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 "<P><B>Cancelando a instalação</B>A instalação de pacotes pode ser cancelada usando o botão <B>Cancelar</B>. No entanto, o sistema pode então se tornar inconsistente ou instável ou poderá não mais inicializar se um componente básico do sistema não for instalado.</P>"
#. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:652
+#: library/packages/src/modules/SlideShow.rb:653
msgid "%s Release Notes"
msgstr "Notas de lançamento do %s"
#. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
+msgid "&Details"
+msgstr "&Detalhes"
+
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
msgid "Slide Sho&w"
msgstr "Apresentação de &slides"
-#. tab
-#: library/packages/src/modules/SlideShow.rb:666
-msgid "&Details"
-msgstr "&Detalhes"
-
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:708
msgid "Performing Upgrade"
msgstr "Atualizando"
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:711
msgid "Performing Installation"
msgstr "Instalando"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:746
msgid "Package Installation"
msgstr "Instalação de pacotes"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:818
msgid ""
"Do you really want\n"
"to quit the installation?"
@@ -4253,7 +4423,7 @@
"da instalação?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:830
msgid "Aborted"
msgstr "Cancelado"
@@ -4848,17 +5018,18 @@
msgid "Bluetooth device"
msgstr "Dispositivo Bluetooth"
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
msgstr ""
-"O arquivo %1 foi alterado manualmente.\n"
-"O YaST poderá perder algumas das alterações.\n"
#. Continue/Cancel question, %1 is a coma separated list of file names
-#: library/system/src/modules/FileChanges.rb:180
+#: library/system/src/modules/FileChanges.rb:178
msgid ""
"Files %1 have been changed manually.\n"
"YaST might lose some of the changes"
@@ -4866,35 +5037,46 @@
"Os arquivos %1 foram alterados manualmente.\n"
"O YaST poderá perder algumas das alterações"
-#: library/system/src/modules/FileChanges.rb:193
+#. Continue/Cancel question, %1 is a file name
+#: library/system/src/modules/FileChanges.rb:180
+msgid ""
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
+msgstr ""
+"O arquivo %1 foi alterado manualmente.\n"
+"O YaST poderá perder algumas das alterações.\n"
+
+#: library/system/src/modules/FileChanges.rb:192
msgid "Do not show this message anymore"
msgstr "Não exibir esta mensagem novamente"
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
+#, fuzzy
+#| msgid ""
+#| "File %s has been created manually.\n"
+#| "YaST might lose this file."
msgid ""
"File %s has been created manually.\n"
"YaST might lose this file."
-msgstr ""
+msgid_plural ""
+"Files %s have been created manually.\n"
+"YaST might lose these files."
+msgstr[0] ""
"O arquivo %s foi criado manualmente.\n"
"O YaST poderá perder este arquivo."
+msgstr[1] ""
+"O arquivo %s foi criado manualmente.\n"
+"O YaST poderá perder este arquivo."
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-msgid ""
-"Files %s have been created manually.\n"
-"YaST might lose these files."
-msgstr ""
-"Os arquivos %s foram criados manualmente.\n"
-"O YaST poderá perder estes arquivos."
-
#. error report
#: library/system/src/modules/Initrd.rb:415
msgid "An error occurred during initrd creation."
msgstr "Ocorreu um erro durante a criação do initrd."
#. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
msgid ""
"Reboot your system\n"
"to activate the new kernel.\n"
@@ -4929,7 +5111,7 @@
"hexadecimais separados por dois-pontos."
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -4940,7 +5122,7 @@
"ou encerrar um componente e o último componente não pode começar com dígito."
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -5022,13 +5204,13 @@
#. 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:738
+#: library/types/src/modules/String.rb:730
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
+#: library/types/src/modules/String.rb:846
msgid "%1/s"
msgstr "%1/s"
@@ -5110,8 +5292,8 @@
#. fallback name for the dialog title
#. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
msgid "Module"
msgstr "Módulo"
@@ -5891,60 +6073,13 @@
"Não há uma zona reversa para o %1 administrado por seu servidor DNS.\n"
"Não é possível adicionar o nome de máquina %2."
-#: src/lib/ui/srv_status_component.rb:60
-msgid "Service Status"
-msgstr "Status do serviço"
+#~ msgid ""
+#~ "Files %s have been created manually.\n"
+#~ "YaST might lose these files."
+#~ msgstr ""
+#~ "Os arquivos %s foram criados manualmente.\n"
+#~ "O YaST poderá perder estes arquivos."
-#. 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 ""
-"<p><b><big>Status atual</big></b><br>\n"
-"Exibe o status atual do serviço. O status irá permanecer o mesmo após salvar as configurações, independentemente do valor do 'iniciar o serviço durante a inicialização'.</p>\n"
-"<p><b><big>Recarregar após salvar as configurações</big></b><br>\n"
-"Somente aplicável se o serviço está atualmente em execução. Garante que o serviço em execução recarregue a nova configuração após salvá-la (através dos botões 'OK' ou 'Salvar').</p>\n"
-"<p><b><big>Iniciar durante a inicialização do sistema</big></b><br>\n"
-"Marque este campo para habilitar o serviço na inicialização do sistema. Desmarque-o para desabilitar o serviço. Isto não afeta o status atual do serviço no sistema atualmente em execução.</p>\n"
-
-#. Widget displaying the status and associated buttons
-#: src/lib/ui/srv_status_component.rb:181
-msgid "Current status:"
-msgstr "Status atual:"
-
-#. Widget to configure the status on boot
-#: src/lib/ui/srv_status_component.rb:194
-msgid "Start During System Boot"
-msgstr "Iniciar durante a inicialização do sistema"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-msgid "Reload After Saving Settings"
-msgstr "Recarregar após salvar as configurações"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-msgid "running"
-msgstr "em execução"
-
-#: src/lib/ui/srv_status_component.rb:220
-msgid "Stop now"
-msgstr "Parar agora"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:225
-msgid "stopped"
-msgstr "parado"
-
-#: src/lib/ui/srv_status_component.rb:227
-msgid "Start now"
-msgstr "Iniciar agora"
-
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "A mídia correta do repositório não pode ser montada."
Modified: trunk/yast/pt_BR/po/bootloader.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/bootloader.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/bootloader.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-10-31 10:45UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -28,637 +28,546 @@
"X-Poedit-SourceCharset: utf-8\n"
#. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
msgid "Boot loader configuration module"
msgstr "Módulo de configuração do carregador de inicialização"
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "Resumo da configuração do carregador de inicialização"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "A partição de inicialização é do tipo NFS. O carregador de inicialização não pode ser instalado."
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
-msgid "Delete a global option"
-msgstr "Remover a opção global"
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "Configurações do carregador de inicialização"
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
-msgid "Set a global option"
-msgstr "Configurar opção global"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
+msgid "Device map must contain at least one device"
+msgstr "O mapa de dispositivos deve conter pelo menos um dispositivo"
-#. command line help text for print action
-#: src/clients/bootloader.rb:75
-msgid "Print value of specified option"
-msgstr "Exibir o valor da opção especificada"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
+msgid "Disk order settings"
+msgstr "Configurações de ordem de disco"
-#. command line help text for an option
-#: src/clients/bootloader.rb:83
-msgid "The key of the option"
-msgstr "A chave da opção"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "D&iscos"
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The value of the option"
-msgstr "O valor da opção"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "&Dispositivo"
-#. command line error report
-#: src/clients/bootloader.rb:152
-msgid "Value was not specified."
-msgstr "O valor não foi especificado."
-
-#. command line error report
-#: src/clients/bootloader.rb:174
-msgid "Option was not specified."
-msgstr "A opção não foi especificada."
-
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
-msgid "Value: %s"
-msgstr "Valor: %s"
-
-#. command line error report
-#: src/clients/bootloader.rb:183
-msgid "Specified option does not exist."
-msgstr "A opção especificada não existe."
-
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>Menu de inicialização</b></big><br></p>"
-
-#: src/include/bootloader/grub/helps.rb:24
-msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active even\n"
-"if the boot loader is installed in the MBR.</p>"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+msgid "Selected bootloader partition %s is not available any more."
msgstr ""
-"<p><b>Definir indicador ativo na tabela de partição para a partição de inicialização</b><br>\n"
-"Para ativar a partição que contém o carregador de inicialização. Em seguida, o código genérico da MBR inicializará\n"
-"a partição ativa. As BIOS mais antigas requerem uma partição ativa, mesmo\n"
-"que o carregador de inicialização esteja instalado na MBR.</p>"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
-msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
-msgstr ""
-"<p><b>Tempo de espera em segundos</b><br>\n"
-"Especifica quanto tempo o carregador de inicialização deverá aguardar até que o kernel padrão seja carregado.</p>\n"
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
+msgid "Saving bootloader configuration..."
+msgstr "Salvando a configuração do carregador de inicialização..."
-#: src/include/bootloader/grub/helps.rb:33
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:102
msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
msgstr ""
-"<p> Ao pressionar <b>Definir como padrão</b>, você marca a seção \n"
-"selecionada como padrão. Durante a inicialização, o carregador de inicialização fornecerá \n"
-"um menu de inicialização e aguardará até que o usuário selecione o kernel ou um outro \n"
-"SO para inicialização. Se nenhuma tecla for pressionada antes do fim do tempo de espera, o \n"
-"kernel ou o SO padrão será inicializado. A ordem das seções no menu do carregador de inicialização\n"
-"pode ser alterada com o uso dos botões <b>Para cima</b> e <b>Para baixo</b>.</p>\n"
+"\n"
+"Seu sistema será desligado agora. %1\n"
+"Para obter mais informações, consulte o capítulo referente ao tema\n"
+"na documentação.\n"
-#: src/include/bootloader/grub/helps.rb:41
-msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
-msgstr ""
-"<p><b>Gravar código de inicialização genérico na MBR</b> substitui a MBR (Master Boot Record) do seu disco por um código genérico\n"
-"(código independente do SO que inicializa a partição ativa).</p>"
+#. 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:115
+msgid "The system will reboot now..."
+msgstr "O sistema vai reiniciar agora..."
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
-"<b>Boot from Root Partition</b>.</p>"
-msgstr ""
-"<p><b>Inicializar da partição de inicialização</b> é uma das opções recomendadas, a outra é\n"
-"<b>Inicializar da partição raiz</b>.</p>"
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "Carregador de &inicialização"
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
-"installed on your computer</p>"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
msgstr ""
-"<p><b>Inicializar da MBR (Master Boot Record)</b> não é recomendado se você possui outro sistema operacional\n"
-"instalado no computador</p>"
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
-"to start this section.</p>"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
msgstr ""
-"<p><b>Inicializar da partição de inicialização</b> é a opção recomendada sempre que houver uma partição\n"
-"adequada. Selecione <b>Definir indicador ativo na tabela de partição para a partição de inicialização</b> e <b>Gravar código de inicialização genérico na MBR</b>\n"
-"nas <b>Opções do carregador de inicialização</b> para atualizar a MBR, caso seja necessário ou configurar o outro\n"
-"carregador de inicialização para iniciar esta seção.</p>"
-#: src/include/bootloader/grub/helps.rb:56
-msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
-"logical partition and the /boot partition is missing</p>"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
msgstr ""
-"<p><b>Inicializar da partição estendida</b> deve ser selecionado se sua partição raiz está\n"
-"em uma partição lógica e a partição /boot está faltando</p>"
-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p><b>Partição de inicialização personalizada</b> permite que você escolha uma partição da qual será feita a inicialização</p>"
+#: src/lib/bootloader/generic_widgets.rb:43
+#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr " (padrão)"
-#: src/include/bootloader/grub/helps.rb:62
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
msgstr ""
-"<p>A lista MD é construída a partir de 2 discos. <b>Habilitar redundância para\n"
-"lista de MD</b> habilita a escrita do GRUB para a MBR em ambos os discos.</p>"
+"\n"
+"Se você não instalar nenhum carregador de\n"
+"inicialização, talvez o sistema não seja iniciado.\n"
+"\n"
+"Continuar?\n"
-#: src/include/bootloader/grub/helps.rb:65
+#: src/lib/bootloader/generic_widgets.rb:75
msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
msgstr ""
-"<p><b>Usar console serial</b> permite que você defina os parâmetros a serem usados\n"
-"para um console serial. Consulte a documentação do grub (<code>info grub2</code>) para detalhes.</p>"
+"<p><b>Tipo de carregador de inicialização</b><br>\n"
+"Para selecionar se você deseja instalar um carregador de inicialização\n"
+"e qual deverá ser instalado, use <b>Carregador de inicialização</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:68
-msgid ""
-"<p><b>Terminal Definition</b></p><br>\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>"
-msgstr ""
-"<p><b>Definição de terminal</b></p><br> Define o tipo de terminal a ser usado. Para um terminal serial (por exemplo, um console serial),\n"
-"especifique <code>serial</code>. Você também pode passar <code>console</code> para o\n"
-"comando, como <code>serial console</code>. Nesse caso, um terminal \n"
-"no qual você pressionar qualquer tecla será selecionado como um terminal GRUB.</p>"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "Tipo de carregador de inicialização: %1"
-#: src/include/bootloader/grub/helps.rb:75
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
-msgstr ""
-"<p><b>Seções alternativas se o padrão falhar</b> contém uma lista de números de\n"
-"seção que serão usados para a inicialização se não for possível inicializar a seção padrão.</p>"
+#: src/lib/bootloader/grub2.rb:109
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Enable Trusted Boot: %1"
+msgstr "Habilitar inicialização segura: %1"
-#: src/include/bootloader/grub/helps.rb:78
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>A seleção de <b>Ocultar menu durante inicialização</b> ocultará o menu de inicialização.</p>"
-
-#: src/include/bootloader/grub/helps.rb:81
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
#, 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>"
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"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>Proteger o carregador de inicialização com senha</b><br>\n"
-"Defina a senha que será obrigatória para acessar o menu de inicialização. O YaST somente aceitará a senha se você a repetir\n"
-"em <b>Redigitar senha</b>.</p>"
+#| msgid "Yes"
+msgid "yes"
+msgstr "Sim"
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
-msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"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.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
msgstr ""
-"<p><big><b>Ordem dos discos</b></big><br>\n"
-"Para especificar a ordem dos discos de acordo com a ordem na BIOS, use\n"
-"os botões <b>Para cima</b> e <b>Para baixo</b> para reorganizar os discos.\n"
-"Para adicionar um disco, clique em <b>Adicionar</b>.\n"
-"Para remover um disco, clique em <b>Remover</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:101
-msgid "Boot Loader Locations"
-msgstr "Localizações do carregador de inicialização"
+#: src/lib/bootloader/grub2.rb:116
+msgid "Status Location: %1"
+msgstr "Status da localização: %1"
-#: src/include/bootloader/grub/helps.rb:102
-msgid "Set &active Flag in Partition Table for Boot Partition"
-msgstr "Definir indicador &ativo na tabela de partição para a partição de inicialização"
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "Ordem de discos rígidos: %1"
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
-msgid "&Timeout in Seconds"
-msgstr "&Tempo de espera em segundos"
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
+msgstr " (estendida)"
-#: src/include/bootloader/grub/helps.rb:106
-msgid "&Default Boot Section"
-msgstr "Seção de inicialização pa&drão"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
+msgstr " (MBR)"
-#: src/include/bootloader/grub/helps.rb:107
-msgid "Write &generic Boot Code to MBR"
-msgstr "Gravar código de inicialização &genérico na MBR"
+#: src/lib/bootloader/grub2.rb:216
+msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
+msgstr "Instalar o código de inicialização na MBR (<a href=\"disable_boot_mbr\">não instalar</a>)"
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Custom Boot Partition"
-msgstr "Partição de inicialização personalizada"
+#: src/lib/bootloader/grub2.rb:220
+msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
+msgstr "Não instalar o código de inicialização na MBR (<a href=\"enable_boot_mbr\">instalar</a>)"
-#: src/include/bootloader/grub/helps.rb:109
-msgid "Boot from Master Boot Record"
-msgstr "Inicializar da MBR (Master Boot Record)"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
+msgstr "Instalar o código de inicialização na partição /boot (<a href=\"disable_boot_boot\">não instalar</a>)"
-#: src/include/bootloader/grub/helps.rb:110
-msgid "Boot from Root Partition"
-msgstr "Inicializar da partição raiz"
+#: src/lib/bootloader/grub2.rb:235
+msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
+msgstr "Não instalar o código de inicialização na partição /boot (<a href=\"enable_boot_boot\">instalar</a>)"
-#: src/include/bootloader/grub/helps.rb:111
-msgid "Boot from Boot Partition"
-msgstr "Inicializar da partição de inicialização"
+#: src/lib/bootloader/grub2.rb:241
+msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
+msgstr "Instalar o código de inicialização na partição \"/\" (<a href=\"disable_boot_root\">não instalar</a>)"
-#: src/include/bootloader/grub/helps.rb:112
-msgid "Boot from Extended Partition"
-msgstr "Inicializar da partição estendida"
+#: src/lib/bootloader/grub2.rb:246
+msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
+msgstr "Não instalar o código de inicialização na partição \"/\" (<a href=\"enable_boot_root\">instalar</a>)"
-#: src/include/bootloader/grub/helps.rb:113
-msgid "Serial Connection &Parameters"
-msgstr "&Parâmetros de conexão serial"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr "Aviso: Nenhuma localização para o estágio 1 do carregador de inicialização selecionado. A menos que você saiba o que está fazendo, selecione a localização acima."
-#: src/include/bootloader/grub/helps.rb:114
-msgid "Fallback Sections if Default fails"
-msgstr "Seções alternativas se o padrão falhar"
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
+msgid "Change Location: %s"
+msgstr "Alterar localização: %s"
-#: src/include/bootloader/grub/helps.rb:115
-msgid "&Hide Menu on Boot"
-msgstr "&Ocultar menu durante inicialização"
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
+msgid "&Timeout in Seconds"
+msgstr "&Tempo de espera em segundos"
-#: src/include/bootloader/grub/helps.rb:116
-msgid "Pa&ssword for the Menu Interface"
-msgstr "&Senha para a interface do menu"
+#: src/lib/bootloader/grub2_widgets.rb:57
+msgid ""
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
+msgstr ""
+"<p><b>Tempo de espera em segundos</b><br>\n"
+"Especifica quanto tempo o carregador de inicialização deverá aguardar até que o kernel padrão seja carregado.</p>\n"
-#: src/include/bootloader/grub/helps.rb:117
-msgid "Debugg&ing Flag"
-msgstr "&Indicador de depuração"
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
+msgid "Set &active Flag in Partition Table for Boot Partition"
+msgstr "Definir indicador &ativo na tabela de partição para a partição de inicialização"
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
-msgid "Prot&ect Boot Loader with Password"
-msgstr "Prot&eger carregador de inicialização com senha"
-
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
-msgid "P&rotect Entry Modification Only"
+#: src/lib/bootloader/grub2_widgets.rb:93
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
msgstr ""
+"<p><b>Definir indicador ativo na tabela de partição para a partição de inicialização</b><br>\n"
+"Para ativar a partição que contém o carregador de inicialização. Em seguida, o código genérico da MBR inicializará\n"
+"a partição ativa. As BIOS mais antigas requerem uma partição ativa, mesmo\n"
+"que o carregador de inicialização esteja instalado na MBR.</p>"
-#. text entry
-#: src/include/bootloader/grub/options.rb:85
-msgid "&Password"
-msgstr "S&enha"
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
+msgid "Write &generic Boot Code to MBR"
+msgstr "Gravar código de inicialização &genérico na MBR"
-#. text entry
-#: src/include/bootloader/grub/options.rb:88
-msgid "Re&type Password"
-msgstr "Redigi&tar a senha"
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
+msgstr ""
+"<p><b>Gravar código de inicialização genérico na MBR</b> substitui a MBR (Master Boot Record) do seu disco por um código genérico\n"
+"(código independente do SO que inicializa a partição ativa).</p>"
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
-msgid "Boot from &Root Partition"
-msgstr "Inicializar da partição &raiz"
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
+msgid "&Hide Menu on Boot"
+msgstr "&Ocultar menu durante inicialização"
-#: src/include/bootloader/grub/options.rb:224
-msgid "Boo&t from Boot Partition"
-msgstr "Inicializar da par&tição de inicialização"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>A seleção de <b>Ocultar menu durante inicialização</b> ocultará o menu de inicialização.</p>"
-#: src/include/bootloader/grub/options.rb:235
-msgid "C&ustom Boot Partition"
-msgstr "Partição de inicialização personali&zada"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+#, fuzzy
+#| msgid "Probe Foreign OS"
+msgid "Pro&be Foreign OS"
+msgstr "Testar SO estrangeiro"
-#: 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 "Localização do carregador de inicialização"
-
-#: src/include/bootloader/grub/options.rb:256
-#: src/include/bootloader/grub/options.rb:286
-#: src/include/bootloader/grub/options.rb:307
-msgid "Boot from &Master Boot Record"
-msgstr "Inicializar da &MBR (Master Boot Record)"
-
-#: src/include/bootloader/grub/options.rb:263
-msgid "Boot from &Extended Partition"
-msgstr "Inicializar da partição &estendida"
-
-#: src/include/bootloader/grub/options.rb:312
-msgid "Enable Red&undancy for MD Array"
-msgstr "Habilitar red&undância para lista de MD"
-
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
-msgid "Boot Code Options"
-msgstr "Opções do código de inicialização"
-
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
-msgid "Kernel Parameters"
-msgstr "Parâmetros do kernel"
-
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
-msgid "Bootloader Options"
-msgstr "Opções do carregador de inicialização"
-
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-msgid "Boot Loader Options"
-msgstr "Opções do carregador de inicialização"
-
-#: src/include/bootloader/grub2/dialogs.rb:190
-msgid "Secure Boot"
-msgstr "Inicialização segura"
-
-#: src/include/bootloader/grub2/dialogs.rb:196
-msgid "Enable &Secure Boot Support"
-msgstr "Habilitar o suporte à inicialização &segura"
-
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
-msgid "Boot &Loader Location"
-msgstr "&Localização do carregador de inicialização"
-
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
-msgid "Choose partition where is boot sequence installed."
-msgstr "Escolha a partição aonde a sequência de instalação está instalada."
-
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
-msgstr "<p><b>Parâmetro opcional de linha de comando do kernel</b> permite definir parâmetros globais adicionais a serem passados para o kernel.</p>"
-
-#: src/include/bootloader/grub2/helps.rb:26
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
-msgstr "<p><b>Modo VGA</b> define o modo VGA para o <i>console</i> a ser definido pelo kernel na inicialização.</p>"
-
-#: src/include/bootloader/grub2/helps.rb:29
+#: src/lib/bootloader/grub2_widgets.rb:176
msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
msgstr "<p><b>Testar SO estrangeiro</b> na forma do os-prober para multi-inicialização com outras distribuições estrangeiras</p>"
-#: 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 "<p><b>Indicador de proteção MBR</b> é uma configuração avançada que é necessária apenas em hardwares exóticos. Para detalhes veja proteção MBR em discos GPT. Não toque se você não tem certeza.</p>"
-
-#: src/include/bootloader/grub2/helps.rb:38
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
msgid "O&ptional Kernel Command Line Parameter"
msgstr "Parâmetro &opcional da linha de comando do kernel"
-#: src/include/bootloader/grub2/helps.rb:39
-msgid "&Vga Mode"
-msgstr "Modo &VGA"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr "<p><b>Parâmetro opcional de linha de comando do kernel</b> permite definir parâmetros globais adicionais a serem passados para o kernel.</p>"
-#: src/include/bootloader/grub2/helps.rb:40
-msgid "Probe Foreign OS"
-msgstr "Testar SO estrangeiro"
-
-#: src/include/bootloader/grub2/helps.rb:41
-msgid "Protective MBR flag"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+#, fuzzy
+#| msgid "Protective MBR flag"
+msgid "&Protective MBR flag"
msgstr "Indicador de proteção MBR"
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2, %3 bits (modo %4)"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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 "<p><b>Indicador de proteção MBR</b> é uma configuração avançada que é necessária apenas em hardwares exóticos. Para detalhes veja proteção MBR em discos GPT. Não toque se você não tem certeza.</p>"
-#: src/include/bootloader/grub2/options.rb:68
-msgid "Standard 8-pixel font mode."
-msgstr "Modo de fonte padrão de 8 pixels."
-
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-msgid "Text Mode"
-msgstr "Modo texto"
-
-#: src/include/bootloader/grub2/options.rb:72
-msgid "Unspecified"
-msgstr "Não especificado"
-
#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
+#: src/lib/bootloader/grub2_widgets.rb:246
msgid "set"
msgstr "definir"
#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
+#: src/lib/bootloader/grub2_widgets.rb:248
msgid "remove"
msgstr "remover"
#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
msgid "do not change"
msgstr "não alterar"
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
-msgid "Autodetect by grub2"
-msgstr "Detectar automaticamente pelo grub2"
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
+msgid "Enable &Secure Boot Support"
+msgstr "Habilitar o suporte à inicialização &segura"
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
+#: src/lib/bootloader/grub2_widgets.rb:272
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "Habilitar inicialização segura: %1"
+
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
+#, fuzzy
+#| msgid "Enable &Secure Boot Support"
+msgid "Enable &Trusted Boot Support"
+msgstr "Habilitar o suporte à inicialização &segura"
+
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
+msgstr ""
+
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
+msgid "Prot&ect Boot Loader with Password"
+msgstr "Prot&eger carregador de inicialização com senha"
+
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
+msgid "P&rotect Entry Modification Only"
+msgstr ""
+
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
+msgstr ""
+
+#. text entry
+#: src/lib/bootloader/grub2_widgets.rb:339
+msgid "Re&type Password"
+msgstr "Redigi&tar a senha"
+
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "A senha não pode estar vazia."
+
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
+msgstr ""
+"'Senha' e 'Redigite a senha' \n"
+"diferem. Favor redigitar senha."
+
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
+#, 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>"
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"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>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
+msgstr ""
+"<p><b>Proteger o carregador de inicialização com senha</b><br>\n"
+"Defina a senha que será obrigatória para acessar o menu de inicialização. O YaST somente aceitará a senha se você a repetir\n"
+"em <b>Redigitar senha</b>.</p>"
+
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
msgid "Choose new graphical theme file"
msgstr "Escolha o novo arquivo de tema gráfico"
-#: src/include/bootloader/grub2/options.rb:258
+#: src/lib/bootloader/grub2_widgets.rb:498
msgid "Use &graphical console"
msgstr "Usar console &gráfico"
-#: src/include/bootloader/grub2/options.rb:265
+#: src/lib/bootloader/grub2_widgets.rb:503
msgid "&Console resolution"
msgstr "Resolução do &console"
-#: src/include/bootloader/grub2/options.rb:273
+#: src/lib/bootloader/grub2_widgets.rb:508
msgid "&Console theme"
msgstr "Tema do &console"
-#: src/include/bootloader/grub2/options.rb:292
+#: src/lib/bootloader/grub2_widgets.rb:539
+msgid "Autodetect by grub2"
+msgstr "Detectar automaticamente pelo grub2"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
msgid "Use &serial console"
msgstr "Usar console &serial"
-#: src/include/bootloader/grub2/options.rb:299
+#: src/lib/bootloader/grub2_widgets.rb:554
msgid "&Console arguments"
msgstr "Argumentos do &console"
-#. 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 "Carregador de inicialização não suportado '%s'. Ajuste seu perfil do AutoYaST de acordo."
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+msgid "&Default Boot Section"
+msgstr "Seção de inicialização pa&drão"
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
-msgid "Select File"
-msgstr "Selecionar Arquivo"
+#: src/lib/bootloader/grub2_widgets.rb:575
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
+msgstr ""
+"<p> Ao pressionar <b>Definir como padrão</b>, você marca a seção \n"
+"selecionada como padrão. Durante a inicialização, o carregador de inicialização fornecerá \n"
+"um menu de inicialização e aguardará até que o usuário selecione o kernel ou um outro \n"
+"SO para inicialização. Se nenhuma tecla for pressionada antes do fim do tempo de espera, o \n"
+"kernel ou o SO padrão será inicializado. A ordem das seções no menu do carregador de inicialização\n"
+"pode ser alterada com o uso dos botões <b>Para cima</b> e <b>Para baixo</b>.</p>\n"
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "A partição de inicialização é do tipo NFS. O carregador de inicialização não pode ser instalado."
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "Localização do carregador de inicialização"
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
-msgid "Boot Loader Settings"
-msgstr "Configurações do carregador de inicialização"
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
-#. message
-#: src/include/bootloader/routines/dialogs.rb:142
-msgid "There are no options to set for the current boot loader."
-msgstr "Não há opções a serem definidas para o carregador de inicialização atual."
+#: src/lib/bootloader/grub2_widgets.rb:692
+msgid "Boo&t from Boot Partition"
+msgstr "Inicializar da par&tição de inicialização"
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
-msgid "&Boot Loader"
-msgstr "Carregador de &inicialização"
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "Inicializar da partição raiz"
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
-msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
-msgstr ""
-"\n"
-"Se você não instalar nenhum carregador de\n"
-"inicialização, talvez o sistema não seja iniciado.\n"
-"\n"
-"Continuar?\n"
+#: src/lib/bootloader/grub2_widgets.rb:694
+msgid "Boot from &Master Boot Record"
+msgstr "Inicializar da &MBR (Master Boot Record)"
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "E&ditar arquivos de configuração"
+#: src/lib/bootloader/grub2_widgets.rb:695
+msgid "Boot from &Extended Partition"
+msgstr "Inicializar da partição &estendida"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
-msgid "&Propose New Configuration"
-msgstr "&Propor nova configuração"
+#: src/lib/bootloader/grub2_widgets.rb:706
+msgid "C&ustom Boot Partition"
+msgstr "Partição de inicialização personali&zada"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
-msgid "&Start from Scratch"
-msgstr "Inicia&r do zero"
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "Ordem de disco"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
-msgid "&Reread Configuration from Disk"
-msgstr "&Reler a configuração do disco"
+#: src/lib/bootloader/grub2_widgets.rb:725
+msgid ""
+"<p><big><b>Disks Order</b></big><br>\n"
+"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.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
+msgstr ""
+"<p><big><b>Ordem dos discos</b></big><br>\n"
+"Para especificar a ordem dos discos de acordo com a ordem na BIOS, use\n"
+"os botões <b>Para cima</b> e <b>Para baixo</b> para reorganizar os discos.\n"
+"Para adicionar um disco, clique em <b>Adicionar</b>.\n"
+"Para remover um disco, clique em <b>Remover</b>.</p>"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
-msgid "Restore MBR of Hard Disk"
-msgstr "Recuperar MBR do disco rígido"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+#| msgid "Kernel Parameters"
+msgid "&Kernel Parameters"
+msgstr "Parâmetros do kernel"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
-msgid "Write bootloader boot code to disk"
-msgstr "Salvar no disco o código de inicialização do carregador de inicialização"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+#| msgid "Boot Code Options"
+msgid "Boot Co&de Options"
+msgstr "Opções do código de inicialização"
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "Outro"
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+#| msgid "Bootloader Options"
+msgid "Boot&loader Options"
+msgstr "Opções do carregador de inicialização"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
-msgid "MBR restored successfully."
-msgstr "MBR restaurada com sucesso."
+#: src/lib/bootloader/grub2efi.rb:81
+msgid "Enable Secure Boot: %1"
+msgstr "Habilitar inicialização segura: %1"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Failed to restore MBR."
-msgstr "Falha ao restaurar MBR."
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "Devido ao particionamento, o carregador de inicialização não pode ser instalado corretamente."
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
-msgid "Writing bootloader settings failed."
-msgstr "Falha na gravação das configurações do carregador de inicialização."
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "Não instalar nenhum carregador de inicialização"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
-msgid "Boot &Loader Options"
-msgstr "Opções do carregador de &inicialização"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "Inicializando"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-msgid "Boot Loader Installation &Details"
-msgstr "&Detalhes da instalação do carregador de inicialização"
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "&Inicializando"
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "Nenhum carregador de inicialização selecionado para instalação. Seu sistema pode não inicializar."
+
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Devido ao particionamento, o carregador de inicialização não pode ser instalado corretamente"
+
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
msgid ""
"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
+"Reading current configuration...</P>"
msgstr ""
"<P><BIG><B>Ferramenta de configuração do carregador de inicialização</B></BIG><BR>\n"
"Alterar as configurações do carregador de inicialização.</P>"
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
msgid ""
"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
"Please wait...<br></p>"
@@ -666,640 +575,601 @@
"<P><B><BIG>Salvando a configuração do carregador de inicialização</BIG></B><BR>\n"
"Por favor, aguarde...<br></p>"
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the current \n"
-"configuration and propose a new configuration, start from scratch, or reread\n"
-"the configuration saved on your disk. %1</P>"
-msgstr ""
-"<P>Em <B>Outros</B>,\n"
-"você pode editar manualmente os arquivos de configuração do carregador de\n"
-"inicialização, limpar a configuração atual e propor uma nova, iniciar do zero ou reler\n"
-"a configuração salva no seu disco. %1</P>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
+msgstr "A combinação da plataforma de hardware %1 e do carregador de inicialização %2 não é suportada"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
-msgstr ""
-"<P>Para editar os arquivos de configuração do carregador de inicialização\n"
-"manualmente, clique em <B>Editar arquivos de configuração</B>.</P>"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+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 "Inicializar a partir da MBR não funciona bem com o sistema de arquivos btrfs e rótulos de disco GPT sem a partição bios_grub. Para corrigir isto, crie a partição bios_grub ou use qualquer sistema de arquivos ext para a partição de inicialização ou não instale o estágio 1 na MBR."
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr ""
-"<P> Na tabela, cada seção representa um item\n"
-"no menu de inicialização.</P>"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "O dispositivo de inicialização está no raid tipo: %1. O sistema não irá inicializar."
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
-msgstr ""
-"<P>Clique em <B>Editar</B> para exibir as propriedades da seção \n"
-"selecionada.</P>"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
+msgstr "O dispositivo de inicialização é um software RAID1. Selecione outra localização do carregador de inicialização, por exemplo, a MBR"
-#. help 3/4
-#: 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"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
-msgstr ""
-"<P> Ao pressionar <b>Definir como padrão</b>, marque a seção \n"
-"selecionada como padrão. Ao inicializar, o carregador de inicialização fornecerá \n"
-"um menu de inicialização e aguardará o usuário selecionar o kernel ou a inicialização de outro \n"
-"OS. Se nenhuma tecla for pressionada antes do fim do tempo de espera, o \n"
-"kernel ou o OS padrão será inicializado. A ordem das seções no menu do carregador de inicialização\n"
-"pode ser alterada com o uso dos botões <B>Para cima</B> e <B>Para baixo</B>.</P>"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
+msgstr "Partição ext faltante para a inicialização. Não foi possível instalar o código de inicialização."
-#. help 4/4
-#: 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>"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
msgstr ""
-"<P>Pressione <B>Adicionar</B> para criar uma nova seção do carregador de inicialização\n"
-"ou <B>Remover</B> para remover a seção selecionada.</P>"
-#. 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:107
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
+#: src/modules/BootSupportCheck.rb:207
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
msgstr ""
-"<p><big><b>Localização do carregador de inicialização</b></big><br>\n"
-"O carregador de inicialização (%1) pode ser instalado nas seguintes formas:</p>"
-#. custom bootloader help text, 2 of 7
-#: 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"
-"on the computer.</p>"
-msgstr ""
-"<p>- Na <b>MBR (Master Boot Record)</b>.\n"
-"Não é recomendado se houver outro sistema operacional instalado\n"
-"no computador.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "Verificar o carregador de inicialização"
-#. custom bootloader help text, 3 of 7
-#: 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"
-"partition. This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- No <b>Setor de inicialização</b> da partição <tt>/boot</tt> ou <tt>/</tt> (raiz)\n"
-"Esta é a opção recomendada sempre que houver uma partição\n"
-"adequada. Defina <b>Ativar partição do carregador de inicialização</b> e\n"
-"<b>Substituir a MBR por código genérico</b> em <b>Detalhes da instalação do carregador de inicialização</b>\n"
-"para atualizar o registro mestre de inicialização (MBR),\n"
-"caso seja necessário ou para configurar o seu outro carregador de inicialização\n"
-"para iniciar o &product;.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "Ler particionamento"
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- Em alguma <b>Outra</b> partição. Leve em consideração as restrições do sistema\n"
-"ao selecionar essa opção.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "Carregar as configurações do carregador de inicialização"
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>Por exemplo, a maioria dos PCs tem um limite de BIOS\n"
-"que restringe a inicialização em \n"
-"cilindros do disco rígido inferiores a 1024. Dependendo do gerenciador de inicialização usado,\n"
-"talvez você consiga ou não iniciar a partir de uma partição lógica.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "Verificando o carregador de inicialização..."
-#. custom bootloader help text, 7 of 7
-#: 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"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"Digite o nome do dispositivo da partição (por exemplo, <tt>/dev/hda3</tt> ou\n"
-"<tt>/dev/sdb</tt>) no campo de entrada.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "Lendo particionamento..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><b>Detalhes da instalação do carregador de inicialização</b><br>\n"
-"Para ajustar as opções avançadas de instalação do carregador de inicialização (por exemplo, o mapeamento do\n"
-"dispositivo), clique em <b>Detalhes da instalação do carregador de inicialização</b>.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "Carregando as configurações do carregador de inicialização..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><b>Tipo de carregador de inicialização</b><br>\n"
-"Para selecionar se você deseja instalar um carregador de inicialização\n"
-"e qual deverá ser instalado, use <b>Carregador de inicialização</b>.</p>"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "Inicializando a configuração do carregador de inicialização"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><b>Opções do carregador de inicialização</b><br>\n"
-"Para ajustar as opções do carregador de inicialização, como o tempo de espera, clique em\n"
-"<b>Opções do carregador de inicialização</b>.</p>"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "Criar initrd"
-#. help text 1/1
-#: 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"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>Configuração manual avançada</B><BR>\n"
-"Aqui você pode editar manualmente a configuração do carregador de inicialização.</P>\n"
-"<P>Observação: o arquivo de configuração final poderá ter recuo diferente.</P>"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
+#, fuzzy
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "Salvar arquivos de configuração do carregador de inicialização"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b>Nome da seção</b><br>\n"
-"Use <b>Nome da seção</b> para especificar o nome da seção do carregador de\n"
-"inicialização. O nome da seção deve ser exclusivo.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "Criando initrd..."
-#. help text 1/5
-#: 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>"
-msgstr ""
-"<p><big><b>Tipo da nova seção</b></big><br>\n"
-"Selecione o tipo da nova seção a ser criada.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
+#, fuzzy
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "Salvando a configuração do carregador de inicialização..."
-#. help text 2/5
-#: 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"
-"selected section.</p>"
-msgstr ""
-"<p>Selecione <b>Clonar seção selecionada</b> para clonar a seção atualmente\n"
-"selecionada. Em seguida, altere as opções que devem ser diferentes daquelas da\n"
-"seção selecionada.</p>"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "Salvando a configuração do carregador de inicialização"
-#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:241
-msgid ""
-"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
-"to load and start.</p>"
-msgstr ""
-"<p>Selecione <b>Seção de imagem</b> para adicionar um novo kernel do Linux ou\n"
-"outra imagem a ser carregada e iniciada.</p>"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "Resumo da configuração do carregador de inicialização"
-#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:245
-msgid ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>Selecione <b>Seção do XEN</b> para adicionar um novo kernel do Linux ou outra imagem,\n"
-"mas iniciá-lo em um ambiente do XEN.</p>"
+#~ msgid "Delete a global option"
+#~ msgstr "Remover a opção global"
-#. help text 5/5
-#: 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"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Selecione <b>Outro sistema (chainloader)</b> para adicionar uma seção que \n"
-"carrega e inicia um setor de inicialização de uma partição do disco. Essa opção é usada para\n"
-"inicializar outros sistemas operacionais.</p>"
+#~ msgid "Set a global option"
+#~ msgstr "Configurar opção global"
-#: src/include/bootloader/routines/helps.rb:254
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Selecione <b>Seção do menu</b> para adicionar uma seção que\n"
-"carregue um arquivo de configuração (a lista de seções de inicializaçõ) de uma partição do disco. Isto é usado para\n"
-"inicializar outros sistemas operacionais.</p>"
+#~ msgid "Print value of specified option"
+#~ msgstr "Exibir o valor da opção especificada"
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
-msgid "Order of Hard Disks: %1"
-msgstr "Ordem de discos rígidos: %1"
+#~ msgid "The key of the option"
+#~ msgstr "A chave da opção"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:51
-msgid "Do not install any boot loader"
-msgstr "Não instalar nenhum carregador de inicialização"
+#~ msgid "The value of the option"
+#~ msgstr "O valor da opção"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
-msgid "Do Not Install Any Boot Loader"
-msgstr "Não instalar nenhum carregador de inicialização"
+#~ msgid "Value was not specified."
+#~ msgstr "O valor não foi especificado."
-#. summary string
-#: src/include/bootloader/routines/misc.rb:60
-msgid "Install the default boot loader"
-msgstr "Instalar o carregador de inicialização padrão"
+#~ msgid "Option was not specified."
+#~ msgstr "A opção não foi especificada."
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Install Default Boot Loader"
-msgstr "Instalar carregador de inicialização padrão"
+#~ msgid "Value: %s"
+#~ msgstr "Valor: %s"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:68
-msgid "Boot loader"
-msgstr "Carregador de inicialização"
+#~ msgid "Specified option does not exist."
+#~ msgstr "A opção especificada não existe."
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
-msgid "Boot Loader"
-msgstr "Carregador de inicialização"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>Menu de inicialização</b></big><br></p>"
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr ""
-"Esta função não estará disponível se o carregador de inicialização\n"
-"não for especificado."
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Inicializar da partição de inicialização</b> é uma das opções recomendadas, a outra é\n"
+#~ "<b>Inicializar da partição raiz</b>.</p>"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"Realmente deixar a configuração do carregador de inicialização sem salvar?\n"
-"Todas as alterações serão perdidas.\n"
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr ""
+#~ "<p><b>Inicializar da MBR (Master Boot Record)</b> não é recomendado se você possui outro sistema operacional\n"
+#~ "instalado no computador</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:57
-msgid "The password must not be empty."
-msgstr "A senha não pode estar vazia."
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "<p><b>Inicializar da partição de inicialização</b> é a opção recomendada sempre que houver uma partição\n"
+#~ "adequada. Selecione <b>Definir indicador ativo na tabela de partição para a partição de inicialização</b> e <b>Gravar código de inicialização genérico na MBR</b>\n"
+#~ "nas <b>Opções do carregador de inicialização</b> para atualizar a MBR, caso seja necessário ou configurar o outro\n"
+#~ "carregador de inicialização para iniciar esta seção.</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:66
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr ""
-"'Senha' e 'Redigite a senha' \n"
-"diferem. Favor redigitar senha."
+#~ msgid ""
+#~ "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
+#~ "logical partition and the /boot partition is missing</p>"
+#~ msgstr ""
+#~ "<p><b>Inicializar da partição estendida</b> deve ser selecionado se sua partição raiz está\n"
+#~ "em uma partição lógica e a partição /boot está faltando</p>"
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:82
-msgid "%1Set default boot loader location?\n"
-msgstr "%1Configurar a localização do carregador de inicialização padrão?\n"
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p><b>Partição de inicialização personalizada</b> permite que você escolha uma partição da qual será feita a inicialização</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:90
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"O nome selecionado está em uso.\n"
-"Use um nome diferente.\n"
+#~ msgid ""
+#~ "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
+#~ "enable to write GRUB to MBR of both disks.</p>"
+#~ msgstr ""
+#~ "<p>A lista MD é construída a partir de 2 discos. <b>Habilitar redundância para\n"
+#~ "lista de MD</b> habilita a escrita do GRUB para a MBR em ambos os discos.</p>"
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"Um erro ocorreu durante instalação do\n"
-"carregador de inicialização. Tentar novamente a configuração?\n"
+#~ msgid ""
+#~ "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~ "for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p><b>Usar console serial</b> permite que você defina os parâmetros a serem usados\n"
+#~ "para um console serial. Consulte a documentação do grub (<code>info grub2</code>) para detalhes.</p>"
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"Aviso!\n"
-"\n"
-"A MBR atual de %1 será regravada com a MBR\n"
-"salva em %2.\n"
-"\n"
-"Somente o código de inicialização na MBR será regravado.\n"
-"A tabela de partição ficará inalterada.\n"
-"\n"
-"Continuar?\n"
+#~ msgid ""
+#~ "<p><b>Terminal Definition</b></p><br>\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>"
+#~ msgstr ""
+#~ "<p><b>Definição de terminal</b></p><br> Define o tipo de terminal a ser usado. Para um terminal serial (por exemplo, um console serial),\n"
+#~ "especifique <code>serial</code>. Você também pode passar <code>console</code> para o\n"
+#~ "comando, como <code>serial console</code>. Nesse caso, um terminal \n"
+#~ "no qual você pressionar qualquer tecla será selecionado como um terminal GRUB.</p>"
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
-msgid "&Yes, Rewrite"
-msgstr "&Sim, regravar"
+#~ msgid ""
+#~ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
+#~ "that will be used for booting in case the default section is unbootable.</p>"
+#~ msgstr ""
+#~ "<p><b>Seções alternativas se o padrão falhar</b> contém uma lista de números de\n"
+#~ "seção que serão usados para a inicialização se não for possível inicializar a seção padrão.</p>"
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "Devido ao particionamento, o carregador de inicialização não pode ser instalado corretamente."
+#~ msgid "Boot Loader Locations"
+#~ msgstr "Localizações do carregador de inicialização"
-#. Represents dialog for modification of device map
-#: src/lib/bootloader/device_map_dialog.rb:53
-msgid "Device map must contain at least one device"
-msgstr "O mapa de dispositivos deve conter pelo menos um dispositivo"
+#~ msgid "Custom Boot Partition"
+#~ msgstr "Partição de inicialização personalizada"
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
-msgid "Disk order settings"
-msgstr "Configurações de ordem de disco"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "Inicializar da MBR (Master Boot Record)"
-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "D&iscos"
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "Inicializar da partição de inicialização"
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "&Dispositivo"
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "Inicializar da partição estendida"
-#. 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 ""
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "&Parâmetros de conexão serial"
-#. 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 ""
+#~ msgid "Fallback Sections if Default fails"
+#~ msgstr "Seções alternativas se o padrão falhar"
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-msgid "Saving bootloader configuration..."
-msgstr "Salvando a configuração do carregador de inicialização..."
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "&Senha para a interface do menu"
-#. 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 ""
-"\n"
-"Seu sistema será desligado agora. %1\n"
-"Para obter mais informações, consulte o capítulo referente ao tema\n"
-"na documentação.\n"
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "&Indicador de depuração"
-#. 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 "O sistema vai reiniciar agora..."
+#~ msgid "&Password"
+#~ msgstr "S&enha"
-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
-msgid "Booting"
-msgstr "Inicializando"
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "Inicializar da partição &raiz"
-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
-msgid "&Booting"
-msgstr "&Inicializando"
+#~ msgid "Enable Red&undancy for MD Array"
+#~ msgstr "Habilitar red&undância para lista de MD"
-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "Nenhum carregador de inicialização selecionado para instalação. Seu sistema pode não inicializar."
+#~ msgid "Boot Loader Options"
+#~ msgstr "Opções do carregador de inicialização"
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Devido ao particionamento, o carregador de inicialização não pode ser instalado corretamente"
+#~ msgid "Secure Boot"
+#~ msgstr "Inicialização segura"
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
-msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
-msgstr "Instalar o código de inicialização na MBR (<a href=\"disable_boot_mbr\">não instalar</a>)"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "&Localização do carregador de inicialização"
-#: src/modules/BootGRUB2.rb:172
-msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
-msgstr "Não instalar o código de inicialização na MBR (<a href=\"enable_boot_mbr\">instalar</a>)"
+#~ msgid "Choose partition where is boot sequence installed."
+#~ msgstr "Escolha a partição aonde a sequência de instalação está instalada."
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
-msgstr "Instalar o código de inicialização na partição /boot (<a href=\"disable_boot_boot\">não instalar</a>)"
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>Modo VGA</b> define o modo VGA para o <i>console</i> a ser definido pelo kernel na inicialização.</p>"
-#: src/modules/BootGRUB2.rb:189
-msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
-msgstr "Não instalar o código de inicialização na partição /boot (<a href=\"enable_boot_boot\">instalar</a>)"
+#~ msgid "&Vga Mode"
+#~ msgstr "Modo &VGA"
-#: src/modules/BootGRUB2.rb:195
-msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
-msgstr "Instalar o código de inicialização na partição \"/\" (<a href=\"disable_boot_root\">não instalar</a>)"
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2, %3 bits (modo %4)"
-#: src/modules/BootGRUB2.rb:199
-msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
-msgstr "Não instalar o código de inicialização na partição \"/\" (<a href=\"enable_boot_root\">instalar</a>)"
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "Modo de fonte padrão de 8 pixels."
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr "Aviso: Nenhuma localização para o estágio 1 do carregador de inicialização selecionado. A menos que você saiba o que está fazendo, selecione a localização acima."
+#~ msgid "Text Mode"
+#~ msgstr "Modo texto"
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
-msgid "Change Location: %s"
-msgstr "Alterar localização: %s"
+#~ msgid "Unspecified"
+#~ msgstr "Não especificado"
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
-msgid "Boot Loader Type: %1"
-msgstr "Tipo de carregador de inicialização: %1"
+#~ msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
+#~ msgstr "Carregador de inicialização não suportado '%s'. Ajuste seu perfil do AutoYaST de acordo."
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
-msgid " (extended)"
-msgstr " (estendida)"
+#~ msgid "Select File"
+#~ msgstr "Selecionar Arquivo"
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:245
-msgid " (MBR)"
-msgstr " (MBR)"
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "Não há opções a serem definidas para o carregador de inicialização atual."
-#: src/modules/BootGRUB2.rb:252
-msgid "Status Location: %1"
-msgstr "Status da localização: %1"
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "E&ditar arquivos de configuração"
-#: src/modules/BootGRUB2EFI.rb:108
-msgid "Enable Secure Boot: %1"
-msgstr "Habilitar inicialização segura: %1"
+#~ msgid "&Propose New Configuration"
+#~ msgstr "&Propor nova configuração"
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
-msgid "Unknown bootloader: %1"
-msgstr "Carregador de inicialização desconhecido: %1"
+#~ msgid "&Start from Scratch"
+#~ msgstr "Inicia&r do zero"
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr "A combinação da plataforma de hardware %1 e do carregador de inicialização %2 não é suportada"
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "&Reler a configuração do disco"
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: 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 "Inicializar a partir da MBR não funciona bem com o sistema de arquivos btrfs e rótulos de disco GPT sem a partição bios_grub. Para corrigir isto, crie a partição bios_grub ou use qualquer sistema de arquivos ext para a partição de inicialização ou não instale o estágio 1 na MBR."
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "Recuperar MBR do disco rígido"
-#. 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 "O dispositivo de inicialização está no raid tipo: %1. O sistema não irá inicializar."
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "Salvar no disco o código de inicialização do carregador de inicialização"
-#. 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 "O dispositivo de inicialização é um software RAID1. Selecione outra localização do carregador de inicialização, por exemplo, a MBR"
+#~ msgid "Other"
+#~ msgstr "Outro"
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr "Partição ext faltante para a inicialização. Não foi possível instalar o código de inicialização."
+#~ msgid "MBR restored successfully."
+#~ msgstr "MBR restaurada com sucesso."
-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
-msgstr ""
+#~ msgid "Failed to restore MBR."
+#~ msgstr "Falha ao restaurar MBR."
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
-msgstr ""
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "Falha na gravação das configurações do carregador de inicialização."
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
-msgid "Check boot loader"
-msgstr "Verificar o carregador de inicialização"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "Opções do carregador de &inicialização"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
-msgid "Read partitioning"
-msgstr "Ler particionamento"
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "&Detalhes da instalação do carregador de inicialização"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
-msgid "Load boot loader settings"
-msgstr "Carregar as configurações do carregador de inicialização"
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr ""
+#~ "<P>Em <B>Outros</B>,\n"
+#~ "você pode editar manualmente os arquivos de configuração do carregador de\n"
+#~ "inicialização, limpar a configuração atual e propor uma nova, iniciar do zero ou reler\n"
+#~ "a configuração salva no seu disco. %1</P>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
-msgid "Checking boot loader..."
-msgstr "Verificando o carregador de inicialização..."
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr ""
+#~ "<P>Para editar os arquivos de configuração do carregador de inicialização\n"
+#~ "manualmente, clique em <B>Editar arquivos de configuração</B>.</P>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
-msgid "Reading partitioning..."
-msgstr "Lendo particionamento..."
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr ""
+#~ "<P> Na tabela, cada seção representa um item\n"
+#~ "no menu de inicialização.</P>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
-msgid "Loading boot loader settings..."
-msgstr "Carregando as configurações do carregador de inicialização..."
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr ""
+#~ "<P>Clique em <B>Editar</B> para exibir as propriedades da seção \n"
+#~ "selecionada.</P>"
-#. dialog header
-#: src/modules/Bootloader.rb:162
-msgid "Initializing Boot Loader Configuration"
-msgstr "Inicializando a configuração do carregador de inicialização"
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P> Ao pressionar <b>Definir como padrão</b>, marque a seção \n"
+#~ "selecionada como padrão. Ao inicializar, o carregador de inicialização fornecerá \n"
+#~ "um menu de inicialização e aguardará o usuário selecionar o kernel ou a inicialização de outro \n"
+#~ "OS. Se nenhuma tecla for pressionada antes do fim do tempo de espera, o \n"
+#~ "kernel ou o OS padrão será inicializado. A ordem das seções no menu do carregador de inicialização\n"
+#~ "pode ser alterada com o uso dos botões <B>Para cima</B> e <B>Para baixo</B>.</P>"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
-msgid "Create initrd"
-msgstr "Criar initrd"
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>Pressione <B>Adicionar</B> para criar uma nova seção do carregador de inicialização\n"
+#~ "ou <B>Remover</B> para remover a seção selecionada.</P>"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
-msgid "Save boot loader configuration files"
-msgstr "Salvar arquivos de configuração do carregador de inicialização"
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>Localização do carregador de inicialização</b></big><br>\n"
+#~ "O carregador de inicialização (%1) pode ser instalado nas seguintes formas:</p>"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
-msgid "Install boot loader"
-msgstr "Instalar carregador de inicialização"
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- Na <b>MBR (Master Boot Record)</b>.\n"
+#~ "Não é recomendado se houver outro sistema operacional instalado\n"
+#~ "no computador.</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
-msgid "Creating initrd..."
-msgstr "Criando initrd..."
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition. This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- No <b>Setor de inicialização</b> da partição <tt>/boot</tt> ou <tt>/</tt> (raiz)\n"
+#~ "Esta é a opção recomendada sempre que houver uma partição\n"
+#~ "adequada. Defina <b>Ativar partição do carregador de inicialização</b> e\n"
+#~ "<b>Substituir a MBR por código genérico</b> em <b>Detalhes da instalação do carregador de inicialização</b>\n"
+#~ "para atualizar o registro mestre de inicialização (MBR),\n"
+#~ "caso seja necessário ou para configurar o seu outro carregador de inicialização\n"
+#~ "para iniciar o &product;.</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
-msgid "Saving boot loader configuration files..."
-msgstr "Salvando arquivos de configuração do carregador de inicialização..."
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- Em alguma <b>Outra</b> partição. Leve em consideração as restrições do sistema\n"
+#~ "ao selecionar essa opção.</p>"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
-msgid "Installing boot loader..."
-msgstr "Instalando o carregador de inicialização..."
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>Por exemplo, a maioria dos PCs tem um limite de BIOS\n"
+#~ "que restringe a inicialização em \n"
+#~ "cilindros do disco rígido inferiores a 1024. Dependendo do gerenciador de inicialização usado,\n"
+#~ "talvez você consiga ou não iniciar a partir de uma partição lógica.</p>"
-#. progress line
-#: src/modules/Bootloader.rb:299
-msgid "Saving Boot Loader Configuration"
-msgstr "Salvando a configuração do carregador de inicialização"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Digite o nome do dispositivo da partição (por exemplo, <tt>/dev/hda3</tt> ou\n"
+#~ "<tt>/dev/sdb</tt>) no campo de entrada.</p>"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Detalhes da instalação do carregador de inicialização</b><br>\n"
+#~ "Para ajustar as opções avançadas de instalação do carregador de inicialização (por exemplo, o mapeamento do\n"
+#~ "dispositivo), clique em <b>Detalhes da instalação do carregador de inicialização</b>.</p>"
+
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Opções do carregador de inicialização</b><br>\n"
+#~ "Para ajustar as opções do carregador de inicialização, como o tempo de espera, clique em\n"
+#~ "<b>Opções do carregador de inicialização</b>.</p>"
+
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>Configuração manual avançada</B><BR>\n"
+#~ "Aqui você pode editar manualmente a configuração do carregador de inicialização.</P>\n"
+#~ "<P>Observação: o arquivo de configuração final poderá ter recuo diferente.</P>"
+
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b>Nome da seção</b><br>\n"
+#~ "Use <b>Nome da seção</b> para especificar o nome da seção do carregador de\n"
+#~ "inicialização. O nome da seção deve ser exclusivo.</p>"
+
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Tipo da nova seção</b></big><br>\n"
+#~ "Selecione o tipo da nova seção a ser criada.</p>"
+
+#~ 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"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>Selecione <b>Clonar seção selecionada</b> para clonar a seção atualmente\n"
+#~ "selecionada. Em seguida, altere as opções que devem ser diferentes daquelas da\n"
+#~ "seção selecionada.</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr ""
+#~ "<p>Selecione <b>Seção de imagem</b> para adicionar um novo kernel do Linux ou\n"
+#~ "outra imagem a ser carregada e iniciada.</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr ""
+#~ "<p>Selecione <b>Seção do XEN</b> para adicionar um novo kernel do Linux ou outra imagem,\n"
+#~ "mas iniciá-lo em um ambiente do XEN.</p>"
+
+#~ 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"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Selecione <b>Outro sistema (chainloader)</b> para adicionar uma seção que \n"
+#~ "carrega e inicia um setor de inicialização de uma partição do disco. Essa opção é usada para\n"
+#~ "inicializar outros sistemas operacionais.</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Selecione <b>Seção do menu</b> para adicionar uma seção que\n"
+#~ "carregue um arquivo de configuração (a lista de seções de inicializaçõ) de uma partição do disco. Isto é usado para\n"
+#~ "inicializar outros sistemas operacionais.</p>"
+
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "Não instalar nenhum carregador de inicialização"
+
+#~ msgid "Install the default boot loader"
+#~ msgstr "Instalar o carregador de inicialização padrão"
+
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "Instalar carregador de inicialização padrão"
+
+#~ msgid "Boot loader"
+#~ msgstr "Carregador de inicialização"
+
+#~ msgid "Boot Loader"
+#~ msgstr "Carregador de inicialização"
+
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr ""
+#~ "Esta função não estará disponível se o carregador de inicialização\n"
+#~ "não for especificado."
+
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "Realmente deixar a configuração do carregador de inicialização sem salvar?\n"
+#~ "Todas as alterações serão perdidas.\n"
+
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "%1Configurar a localização do carregador de inicialização padrão?\n"
+
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "O nome selecionado está em uso.\n"
+#~ "Use um nome diferente.\n"
+
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "Um erro ocorreu durante instalação do\n"
+#~ "carregador de inicialização. Tentar novamente a configuração?\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "Aviso!\n"
+#~ "\n"
+#~ "A MBR atual de %1 será regravada com a MBR\n"
+#~ "salva em %2.\n"
+#~ "\n"
+#~ "Somente o código de inicialização na MBR será regravado.\n"
+#~ "A tabela de partição ficará inalterada.\n"
+#~ "\n"
+#~ "Continuar?\n"
+
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "&Sim, regravar"
+
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "Carregador de inicialização desconhecido: %1"
+
+#~ msgid "Install boot loader"
+#~ msgstr "Instalar carregador de inicialização"
+
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "Salvando arquivos de configuração do carregador de inicialização..."
+
+#~ msgid "Installing boot loader..."
+#~ msgstr "Instalando o carregador de inicialização..."
+
#~ msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
#~ msgstr "<p><b>Distribuidor</b> especifica o nome do distribuidor do kernel usado para criar a nome da entrada de inicialização. </p>"
@@ -1333,9 +1203,6 @@
#~ msgid "Section name must be specified."
#~ msgstr "O nome da seção deve ser especificado."
-#~ msgid "Disk Order"
-#~ msgstr "Ordem de disco"
-
#~ msgid "Boot Menu"
#~ msgstr "Menu de inicialização"
@@ -1776,9 +1643,6 @@
#~ msgid " (\"/\")"
#~ msgstr " (\"/\")"
-#~ msgid " (default)"
-#~ msgstr " (padrão)"
-
#~ msgid "Sections:<br>%1"
#~ msgstr "Seções:<br>%1"
@@ -2568,9 +2432,6 @@
#~ msgid "image"
#~ msgstr "imagem"
-#~ msgid "Yes"
-#~ msgstr "Sim"
-
#~ msgid "No"
#~ msgstr "Não"
Modified: trunk/yast/pt_BR/po/ca-management.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/ca-management.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/ca-management.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: ca-management\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-10-02 17:03-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -144,8 +144,7 @@
#: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
#: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
#: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
msgid "&Password:"
msgstr "&Senha:"
@@ -217,8 +216,7 @@
#: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
#: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
#: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
msgid "New passwords do not match."
msgstr "As novas senhas não são iguais."
@@ -1929,14 +1927,14 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
msgid "Creating certificate..."
msgstr "Criando certificado..."
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
@@ -1945,28 +1943,27 @@
"módulo de Gerenciamento de CA.\n"
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
msgid "Finish"
msgstr "Concluir"
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
msgid "Really save configuration ?"
msgstr "Realmente salvar a configuração?"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
msgid "Exit"
msgstr "Sair"
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
msgid "Really exit configuration without saving ?"
msgstr "Realmente sair da configuração sem salvar?"
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
msgid "Details"
msgstr "Detalhes"
@@ -2251,8 +2248,7 @@
msgid "LDAP P&assword:"
msgstr "Senh&a LDAP:"
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
#: src/include/ca-management/util.rb:1388
msgid "Certificate &Password:"
msgstr "Senha de cer&tificado:"
@@ -2300,28 +2296,23 @@
msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
msgstr "Ce&rtificado e chave sem criptografia em formato PEM"
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
msgid "C&ertificate and the Key Encrypted in PEM Format"
msgstr "C&ertificado e chave criptografados em formato PEM"
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
msgid "&Certificate in DER Format"
msgstr "&Certificado em formato DER"
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
msgid "Cer&tificate and the Key in PKCS12 Format"
msgstr "Cer&tificado e chave em formato PKCS12"
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
msgid "&Like PKCS12 and Include the CA Chain"
msgstr "Como PKCS12 e inc&lui a CA chain"
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
msgid "&New Password"
msgstr "&Nova senha"
Modified: trunk/yast/pt_BR/po/cio.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/cio.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/cio.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-10-30 10:45-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -49,13 +49,13 @@
msgstr "Usado"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "não"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "yes"
msgstr "sim"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "não"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
msgid "Filter channels"
Modified: trunk/yast/pt_BR/po/cluster.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/cluster.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/cluster.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-02-19 09:07-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -136,7 +136,7 @@
msgstr "Reproduzir som de teste quando a placa for configurada"
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
msgid "The Multicast Address has to be fulfilled"
msgstr "O endereço de multicast tem que ser preenchido"
@@ -162,7 +162,7 @@
msgstr "Associar endereço de rede:"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
msgid "Multicast Address:"
msgstr "Endereço multicast:"
@@ -210,123 +210,123 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
msgid "Enable Security Auth"
msgstr "Habilitar autenticação de segurança"
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr "Para um cluster recém criado, clique no botão abaixo para gerar etc/corosync/authkey."
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr "Para ingressar num cluster existente, copie /etc/corosync/authkey de outros nodos manualmente."
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
msgid "Failed to create /etc/corosync/authkey"
msgstr "Falha ao criar /etc/corosync/authkey"
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
msgid "Create /etc/corosync/authkey succeeded"
msgstr "/etc/corosync/authkey criado com sucesso"
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
msgid "Running"
msgstr "Em execução"
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
msgid "Not running"
msgstr "Não executando"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
msgid "Booting"
msgstr "Inicializando"
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
msgid "On -- Start pacemaker during boot"
msgstr "On -- Iniciar pacemaker durante a inicialização"
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
msgid "Off -- Start pacemaker manually"
msgstr "Off -- Iniciar pacemaker manualmente"
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
msgid "Switch On and Off"
msgstr "Ligar e desligar"
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
msgid "Current Status: "
msgstr "Status atual: "
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
msgid "Start pacemaker Now"
msgstr "Iniciar o pacemaker agora"
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
msgid "Stop pacemaker Now"
msgstr "Parar o pacemaker agora"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
msgid "Sync Host"
msgstr "Sincronizar host"
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Add"
msgstr "Adicionar"
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
msgid "Del"
msgstr "Remover"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Edit"
msgstr "Editar"
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
msgid "Sync File"
msgstr "Sincronizar arquivo"
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
msgid "Add Suggested Files"
msgstr "Adicionar arquivos sugeridos"
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
msgid "Generate Pre-Shared-Keys"
msgstr "Gerar chaves pré-compartilhadas"
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
msgid "Csync2 Status Unknown"
msgstr "Status de sincronização do Csync2 desconhecido"
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
msgid "Turn csync2 ON"
msgstr "Ligar csync2"
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 OFF"
msgstr "Desligar csync2"
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
msgid "Enter a hostname"
msgstr "Digite um nome de máquina"
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
msgid "Edit the hostname"
msgstr "Edite o nome de máquina"
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
msgid "Enter a filename to synchronize"
msgstr "Informe o nome de um arquivo para sincronizar"
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
msgid "Edit the filename"
msgstr "Edite o nome do arquivo"
#. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
@@ -335,12 +335,12 @@
"Você deseja sobrescrevê-lo?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
msgid "Delete key file %1 failed."
msgstr "Falha ao remover arquivo de chave %1."
#. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -348,12 +348,12 @@
"Arquivo de chave %1 gerado.\n"
"Clique em \"Adicionar arquivos sugeridos\" para adicioná-lo à lista de sincronização."
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
msgid "Key generation failed."
msgstr "Falha ao gerar a chave."
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
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"
@@ -363,23 +363,23 @@
"O YaST pode auxiliar na configuração básica do conntrackd.\n"
"É necessário iniciá-lo com ocf:heartbeat:conntrackd."
-#: src/include/cluster/dialogs.rb:1358
+#: src/include/cluster/dialogs.rb:1360
msgid "Dedicated Interface:"
msgstr "Interface dedicada:"
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
msgid "IP:"
msgstr "IP:"
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
msgid "Group Number:"
msgstr "Membro do grupo:"
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr "Gerar /etc/conntrackd/conntrackd.conf"
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
#, fuzzy
#| msgid "The value for pos must be a positive integer."
msgid "The Group Number must be a positive integer"
@@ -519,97 +519,97 @@
msgstr "Inicializando..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
msgid "Initializing cluster Configuration"
msgstr "Inicializando a configuração do cluster"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
msgid "Read the database"
msgstr "Ler o banco de dados"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
msgid "Read the previous settings"
msgstr "Ler as configurações anteriores"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
msgid "Read SuSEFirewall Settings"
msgstr "Ler as configurações do SuSEFirewall"
#. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
msgid "Reading the database..."
msgstr "Lendo o banco de dados..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
msgid "Reading the previous settings..."
msgstr "Lendo as configurações anteriores..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
msgid "Reading SuSEFirewall settings..."
msgstr "Lendo as configurações do SuSEFirewall..."
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
msgid "Finished"
msgstr "Concluído"
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
msgid "Cannot install required package"
msgstr "Não foi possível instalar os pacotes necessários"
#. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
msgid "Cannot load existing configuration"
msgstr "Não foi possível carregar a configuração existente"
#. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
msgid "Cannot read database1."
msgstr "Não foi possível ler o banco de dados 1."
#. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
msgid "Cannot read database2."
msgstr "Não foi possível ler o banco de dados 2."
#. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
msgid "Cannot detect devices."
msgstr "Não foi possível detectar os dispositivos."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
msgid "Saving cluster Configuration"
msgstr "Salvando as configurações do cluster"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
msgid "Write the settings"
msgstr "Salvar as configurações"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
msgid "Save changes to SuSEFirewall"
msgstr "Salvar as alterações no SuSEFirewall"
#. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
msgid "Writing the settings..."
msgstr "Salvando as configurações..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
msgid "Saving changes to SuSEFirewall..."
msgstr "Salvando as alterações no SuSEFirewall..."
#. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "Não foi possível salvar as configurações."
Modified: trunk/yast/pt_BR/po/control.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/control.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/control.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-10-30 10:46-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -27,301 +27,656 @@
"X-Poedit-Country: BRAZIL\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.suse.com/.\n"
+#| "</p>\n"
+#| " "
msgid ""
"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-" "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
msgstr ""
"\n"
-"<p><b>Parabéns!</b></p>\n"
-"<p>A instalação do openSUSE em sua máquina foi completada.\n"
-"Após clicar em <b>Concluir</b>, você pode se logar no sistema.</p>\n"
-"<p>Visite-nos em %1.</p>\n"
-"<p>Divirta-se!<br>Sua equipe de desenvolvimento openSUSE</p>\n"
-" "
+"<p>\n"
+"A instalação foi concluída com sucesso.\n"
+"Seu sistema está pronto para uso.\n"
+"Clique em Concluir para entrar no sistema.\n"
+"</p>\n"
+"<p>\n"
+"Por favor, visite-nos em http://www.suse.com/.\n"
+"</p>\n"
+" "
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments. The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-"O ambiente de área de trabalho em seu computador fornece uma interface gráfica\n"
-"para o usuário, bem como um conjunto de aplicações para\n"
-"email, navegação na Internet, produtividade no escritório, jogos e utilitários para\n"
-"gerenciar seu computador.\n"
-"\n"
-"O openSUSE oferece diversas opções de ambientes de área de trabalho. Os ambientes\n"
-"mais usados são o GNOME o KDE, e eles são igualmente suportados\n"
-"no openSUSE. Ambos são fáceis de usar, altamente integrados\n"
-"e possuem um visual atrativo. Cada ambiente de área de trabalho\n"
-"possui um estilo próprio, logo, preferências pessoais determinam qual\n"
-"é a área de trabalho mais adequada para você."
+#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
+msgid "CIM Server"
+msgstr "Servidor CIM"
-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
-msgstr "Área de trabalho GNOME"
-
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Desktop"
-msgstr "Área de trabalho KDE"
-
-#: control/control.openSUSE.glade.translations.glade:23
-msgid "XFCE Desktop"
-msgstr "Área de trabalho XFCE"
-
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "LXDE Desktop"
-msgstr "Área de trabalho LXDE"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr "Servidor X mínimo"
-
-#: control/control.openSUSE.glade.translations.glade:26
-msgid "Enlightenment Desktop"
-msgstr "Área de trabalho Enlightenment"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr "Seleção de servidor mínimo (modo de texto)"
-
-#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
msgid "Installation Settings"
msgstr "Configurações da instalação"
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
+msgid "Overview"
+msgstr "Resumo"
+
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+msgid "Expert"
+msgstr "Avançado"
+
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
msgid "Live Installation Settings"
msgstr "Configurações da instalação do LiveCD"
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
msgid "Update Settings"
msgstr "Configurações da atualização"
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Network Configuration"
msgstr "Configuração da rede"
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
msgid "Hardware Configuration"
msgstr "Configuração do hardware"
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
msgid "Preparation"
msgstr "Preparação"
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
msgid "Load linuxrc Network Configuration"
msgstr "Carregar a configuração de rede do linuxrc"
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
msgid "Network Autosetup"
msgstr "Configuração automática de rede"
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
msgid "Welcome"
msgstr "Bem-vindo"
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
msgid "Network Activation"
msgstr "Ativação de rede"
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
msgid "Disk Activation"
msgstr "Ativação do disco"
-#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
msgid "System Analysis"
msgstr "Análise do sistema"
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
+#, fuzzy
+#| msgid "Online Update"
+msgid "Installer Update"
+msgstr "Atualização online"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
+msgid "Add-On Products"
+msgstr "Produtos complementares"
+
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
msgid "Disk"
msgstr "Disco"
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:69
msgid "Time Zone"
msgstr "Fuso horário"
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
-msgid "Online Repositories"
-msgstr "Repositórios online"
-
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
-msgid "Add-On Products"
-msgstr "Produtos complementares"
-
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "Seleção da área de trabalho"
-
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
-#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
msgid "User Settings"
msgstr "Configurações do usuário"
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "Instalação"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
msgid "Installation Overview"
msgstr "Resumo da instalação"
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
#: control/control.openSUSE.glade.translations.glade:54
#: control/control.openSUSE.glade.translations.glade:55
#: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
#: control/control.openSUSE.glade.translations.glade:58
#: control/control.openSUSE.glade.translations.glade:59
#: control/control.openSUSE.glade.translations.glade:60
#: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
#: control/control.openSUSE.glade.translations.glade:75
#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
msgid "Perform Installation"
msgstr "Executar a instalação"
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "Instalação"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
+msgid "Installation"
+msgstr "Instalação"
+
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
msgid "System for Update"
msgstr "Sistema a atualizar"
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
msgid "Update"
msgstr "Atualizar"
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
+msgid "Update Summary"
+msgstr "Resumo da atualização"
+
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:122
#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
msgid "Perform Update"
msgstr "Executar atualização"
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "Configuração"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
msgid "Base Installation"
msgstr "Instalação base"
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
msgid "AutoYaST Settings"
msgstr "Configurações do AutoYaST"
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
+msgid "Configuration"
+msgstr "Configuração"
+
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
msgid "System Configuration"
msgstr "Configuração do sistema"
-#~ msgid ""
-#~ "\n"
-#~ "<p>\n"
-#~ "The installation has completed successfully.\n"
-#~ "Your system is ready for use.\n"
-#~ "Click Finish to log in to the system.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ "<p>\n"
-#~ "A instalação foi concluída com sucesso.\n"
-#~ "Seu sistema está pronto para uso.\n"
-#~ "Clique em Concluir para entrar no sistema.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Por favor, visite-nos em http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ " "
+#: control/control.SLES.glade.translations.glade:3
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
+msgstr ""
+"\n"
+"<p>\n"
+"A instalação foi concluída com sucesso.\n"
+"Seu sistema está pronto para uso.\n"
+"Clique em Concluir para entrar no sistema.\n"
+"</p>\n"
+"<p>\n"
+"Por favor, visite-nos em http://www.suse.com/.\n"
+"</p>\n"
+" "
-#~ msgid "CIM Server"
-#~ msgstr "Servidor CIM"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
+#, fuzzy
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "Sistema a atualizar"
-#~ msgid "Overview"
-#~ msgstr "Resumo"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
-#~ msgid "Expert"
-#~ msgstr "Avançado"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
-#~ msgid "Network Services Configuration"
-#~ msgstr "Configuração dos serviços de rede"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
-#~ msgid "Installation Summary"
-#~ msgstr "Resumo da instalação"
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
-#~ msgid "Update Summary"
-#~ msgstr "Resumo da atualização"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
+msgid "KVM Virtualization Host"
+msgstr ""
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+#| msgid "Initialization..."
+msgid "Xen Virtualization Host"
+msgstr "Inicialização..."
+
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:48
+msgid "Network Services Configuration"
+msgstr "Configuração dos serviços de rede"
+
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Load linuxrc Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "Carregar a configuração de rede do linuxrc"
+
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "Resumo da instalação"
+
+#: control/control.openSUSE.glade.translations.glade:3
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+"\n"
+"<p><b>Parabéns!</b></p>\n"
+"<p>A instalação do openSUSE em sua máquina foi completada.\n"
+"Após clicar em <b>Concluir</b>, você pode se logar no sistema.</p>\n"
+"<p>Visite-nos em %1.</p>\n"
+"<p>Divirta-se!<br>Sua equipe de desenvolvimento openSUSE</p>\n"
+" "
+
+#: control/control.openSUSE.glade.translations.glade:10
+#, fuzzy
+#| msgid ""
+#| "The desktop environment on your computer provides the graphical user\n"
+#| "interface for your computer, as well as a suite of applications for\n"
+#| "email, Web browsing, office productivity, games, and utilities to\n"
+#| "manage your computer.\n"
+#| "\n"
+#| "openSUSE offers a choice of desktop environments. The most widely\n"
+#| "used desktop environments are GNOME and KDE, and they are equally\n"
+#| "supported under openSUSE. Both desktop environments are easy to use,\n"
+#| "highly integrated, and have an attractive look and feel. Each desktop\n"
+#| "environment has a distinct style, so personal taste determines which\n"
+#| "is the most appropriate desktop for you."
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"O ambiente de área de trabalho em seu computador fornece uma interface gráfica\n"
+"para o usuário, bem como um conjunto de aplicações para\n"
+"email, navegação na Internet, produtividade no escritório, jogos e utilitários para\n"
+"gerenciar seu computador.\n"
+"\n"
+"O openSUSE oferece diversas opções de ambientes de área de trabalho. Os ambientes\n"
+"mais usados são o GNOME o KDE, e eles são igualmente suportados\n"
+"no openSUSE. Ambos são fáceis de usar, altamente integrados\n"
+"e possuem um visual atrativo. Cada ambiente de área de trabalho\n"
+"possui um estilo próprio, logo, preferências pessoais determinam qual\n"
+"é a área de trabalho mais adequada para você."
+
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "Área de trabalho GNOME"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Plasma Desktop"
+msgstr "Área de trabalho KDE"
+
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+#| msgid "Minimal Server Selection (Text Mode)"
+msgid "Server (Text Mode)"
+msgstr "Seleção de servidor mínimo (modo de texto)"
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+#| msgid "XFCE Desktop"
+msgid "Xfce Desktop"
+msgstr "Área de trabalho XFCE"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "LXDE Desktop"
+msgstr "Área de trabalho LXDE"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr "Servidor X mínimo"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Enlightenment Desktop"
+msgstr "Área de trabalho Enlightenment"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "Seleção de servidor mínimo (modo de texto)"
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+msgid "Online Repositories"
+msgstr "Repositórios online"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "Seleção da área de trabalho"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "Instalação de produto complementar"
@@ -351,9 +706,6 @@
#~ "</p>\n"
#~ "\t"
-#~ msgid "Initialization..."
-#~ msgstr "Inicialização..."
-
#~ msgid "Configuring network..."
#~ msgstr "Configurando a rede..."
@@ -381,9 +733,6 @@
#~ msgid "Customer Center"
#~ msgstr "Atendimento ao cliente"
-#~ msgid "Online Update"
-#~ msgstr "Atualização online"
-
#~ msgid "Release Notes"
#~ msgstr "Notas de lançamento"
Modified: trunk/yast/pt_BR/po/country.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/country.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/country.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-10-31 10:46UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -670,7 +670,9 @@
#. command line help text for 'set hwclock' option
#: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
msgstr "Novo valor para relógio de hardware"
#. summary label
@@ -857,49 +859,49 @@
"Data inválida (DD-MM-AAAA) %1.\n"
"Digite a data correta.\n"
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
msgid "Other &Settings..."
msgstr "Outras &configurações..."
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
msgid "Date and Time (NTP is configured)"
msgstr "Data e hora (o NTP está configurado)"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
msgid "Date and Time"
msgstr "Data e hora"
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
msgid "&Hardware Clock Set to UTC"
msgstr "Relógio de &hardware definido para UTC"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
msgid "&Region"
msgstr "&Região"
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
msgid "Time &Zone"
msgstr "&Fuso horário"
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
msgid "Date and Time:"
msgstr "Data e horário:"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -908,7 +910,7 @@
"<p><b><big>Configurações de fuso horário e do relógio</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -923,7 +925,7 @@
"</p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -934,12 +936,12 @@
"</p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
msgid "Clock and Time Zone"
msgstr "Relógio e fuso horário"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
msgid "Select a valid time zone."
msgstr "Selecione um fuso horário válido."
@@ -1027,181 +1029,188 @@
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "Espanhol (América Latina)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Italian"
msgstr "Italiano"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese"
msgstr "Português"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil)"
msgstr "Português (Brasil)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Portuguese (Brazil -- US accents)"
msgstr "Português (Brasil - acentuação EUA)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Greek"
msgstr "Grego"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Dutch"
msgstr "Holandês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Danish"
msgstr "Dinamarquês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Norwegian"
msgstr "Norueguês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Swedish"
msgstr "Sueco"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Finnish"
msgstr "Finlandês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
msgid "Czech"
msgstr "Checo"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
msgid "Czech (qwerty)"
msgstr "Checo (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
msgid "Slovak"
msgstr "Eslovaco"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
msgid "Slovak (qwerty)"
msgstr "Eslovaco (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
msgid "Slovene"
msgstr "Eslovênio"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "Húngaro"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "Polonês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "Russo"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "Sérvio"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "Estoniano"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "Lituano"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "Turco"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "Croata"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "Japonês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "Belgo"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "Dvorak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "Islandês"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "Ucraniano"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "Khmer"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "Coreano"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "Árabe"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "Tadjique"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "Chinês tradicional"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "Chinês simplificado"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "Romeno"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr "Inglês internacional"
Modified: trunk/yast/pt_BR/po/crowbar.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/crowbar.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/crowbar.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-10-31 10:46UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -27,21 +27,13 @@
msgid "Configuration of crowbar"
msgstr "Configuração do crowbar"
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr "Comum para todos"
-
#. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
+#: src/include/crowbar/complex.rb:94
+#, fuzzy
+#| msgid "SLES 11 SP3"
+msgid "SLES 12 SP1"
msgstr "SLES 11 SP3"
-#. target platform name
-#: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
-msgstr "SLES 12"
-
#. combobox label
#: src/include/crowbar/complex.rb:106
#, fuzzy
@@ -53,11 +45,11 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough 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"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-…</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
@@ -180,30 +172,33 @@
msgstr "Endereço &IP"
#. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
msgid "Name"
msgstr "Nome"
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
msgid "URL"
msgstr "URL"
#. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
msgid "Ask On Error"
msgstr "Perguntar no erro"
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
#, fuzzy
#| msgid "Target Name"
msgid "Target Platform"
msgstr "Nome do destino"
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
#. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
#, fuzzy
#| msgid ""
#| "User '%1' already exists.\n"
@@ -216,82 +211,89 @@
"Escolha um nome diferente."
#. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
#, fuzzy
#| msgid "LDAP Server &URL"
msgid "Server &URL"
msgstr "&URL do servidor LDAP"
#. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
msgid "Repository Name"
msgstr "Nome do repositório"
#. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
msgid "&Ask On Error"
msgstr "Per&guntar no erro"
#. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
msgid "Repository &URL"
msgstr "&URL do repositório"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
#, fuzzy
#| msgid "Add Repository"
msgid "A&dd Repository"
msgstr "Adicionar repositório"
#. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
#, fuzzy
#| msgid "Remote WINS Server"
+msgid "Local SMT Server"
+msgstr "Servidor WINS Remoto"
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
+#, fuzzy
+#| msgid "Remote WINS Server"
msgid "Remote SMT Server"
msgstr "Servidor WINS Remoto"
#. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
#, fuzzy
#| msgid "Finger Server"
msgid "SUSE Manager Server"
msgstr "Servidor Finger"
#. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
msgid "Custom"
msgstr "Personalizado"
#. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
msgid "User Name"
msgstr "Nome de usuário"
#. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
msgid "Password"
msgstr "Senha"
#. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
msgid "Repeat the Password"
msgstr "Repita a senha"
#. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
#, fuzzy
#| msgid "Server name cannot be empty."
msgid "User name cannot be empty."
msgstr "O nome do servidor não pode estar vazio."
#. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -300,7 +302,7 @@
"Tente novamente."
#. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
msgid ""
"User '%1' already exists.\n"
"Choose a different name."
@@ -309,19 +311,19 @@
"Escolha um nome diferente."
#. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
#, fuzzy
#| msgid "The entered URL is not valid."
msgid "The interface format '%1' is not valid"
msgstr "A URL informada não é válida."
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
msgid "disabled"
msgstr "desabilitado"
#. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
msgid ""
"The netmask '%1' is invalid.\n"
"%2"
@@ -331,7 +333,7 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
msgid ""
"The IP address '%1' is invalid.\n"
"%2"
@@ -340,7 +342,7 @@
"%2"
#. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
msgid ""
"The router address '%1' is invalid.\n"
"%2"
@@ -349,17 +351,17 @@
"%2"
#. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
msgid "The router address '%1' is not part of network '%2'."
msgstr "O endereço do roteador '%1' não faz parte da rede '%2'."
#. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
msgid "The IP address '%1' is not part of network '%2'."
msgstr "O endereço IP '%1' não faz parte da rede '%2'."
#. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
msgid ""
"Some address ranges are not part of network '%1'.\n"
"Adapt them using 'Edit ranges' button."
@@ -368,62 +370,62 @@
"Adapte-os usando o botão 'Editar intervalos'."
#. inputfield label
-#: src/include/crowbar/complex.rb:1335
+#: src/include/crowbar/complex.rb:1326
msgid "Min IP Address"
msgstr "Endereço IP mínimo"
#. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
msgid "Max IP Address"
msgstr "Endereço IP máximo"
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
msgid "The address '%1' is not part of network '%2'."
msgstr "O endereço '%1' não faz parte da rede '%2'."
#. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
msgid "The lowest address must be lower than the highest one."
msgstr "O endereço mais baixo deve ser inferior ao mais alto."
#. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
msgid "Ranges '%1' and '%2' are overlapping."
msgstr "Os intervalos '%1' e '%2' se sobrepõem."
#. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
msgid "&User Settings"
msgstr "Configurações do &usuário"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
msgid "N&etwork Mode"
msgstr "Modo de r&ede"
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
#, fuzzy
#| msgid "Bond Network"
msgid "Bastion Network"
msgstr "Rede vinculada"
#. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
msgid "Net&works"
msgstr "&Redes"
#. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
msgid "Re&positories"
msgstr "Re&positórios"
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
#, fuzzy
#| msgid ""
#| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
@@ -442,7 +444,7 @@
"Você pode visitar a interface web do Crowbar em http://%1:3000/"
#. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
msgid "Crowbar Configuration Overview"
msgstr "Resumo da Configuração do Crowbar"
@@ -503,41 +505,47 @@
msgstr "Inicializando..."
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
msgid "Initializing crowbar Configuration"
msgstr "Iniciando a configuração do Crowbar"
#. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
msgid "Read the configuraton"
msgstr "Ler a configuração"
#. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
msgid "Reading the configuration..."
msgstr "Lendo a configuração..."
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
msgid "Finished"
msgstr "Concluído"
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
msgid "Saving crowbar Configuration"
msgstr "Salvando a configuração do Crowbar"
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
msgid "Write the settings"
msgstr "Salvar as configurações"
#. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
msgid "Writing the settings..."
msgstr "Salvando as configurações..."
+#~ msgid "Common for All"
+#~ msgstr "Comum para todos"
+
+#~ msgid "SLES 12"
+#~ msgstr "SLES 12"
+
#~ msgid "Password for Crowbar Administrator"
#~ msgstr "Senha para o administrador do crowbar"
Modified: trunk/yast/pt_BR/po/dhcp-server.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/dhcp-server.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/dhcp-server.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: dhcp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-09-16 13:11-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -68,9 +68,7 @@
msgstr "Gerenciar opções de sub-rede de DHCP"
#. command line help text for an option
-#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
msgid "List all defined hosts with a fixed address"
msgstr "Listar todas as máquinas definidas com um endereço fixo"
@@ -110,242 +108,249 @@
msgstr "O endereço IP (ou nome de máquina) da máquina com endereço fixo"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
msgid "Select the network interface to use"
msgstr "Selecionar interface de rede para usar"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
msgid "Print the currently used interface and list other available interfaces"
msgstr "Exibir a interface atualmente usada e listar outras interfaces disponíveis"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
msgid "Print current options"
msgstr "Exibir opções atuais"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
msgid "Set a global option"
msgstr "Configurar opção global"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
msgid "Option key (for example, ntp-servers)"
msgstr "Chave da opção (por exemplo, ntp-servers)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
msgid "Option value (for example, IP address)"
msgstr "Valor da opção (por exemplo, endereço IP)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
msgid "Lowest IP address of the dynamic address assigning range"
msgstr "Endereço IP mais baixo da faixa de endereços dinâmicos atribuída"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
msgid "Highest IP address of the dynamic address assigning range"
msgstr "Endereço IP mais alto da faixa de endereços dinâmicos atribuída"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
msgid "Default lease time in seconds"
msgstr "Tempo de aluguel padrão em segundos"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
msgid "Maximum lease time in seconds"
msgstr "Tempo de aluguel máximo em segundos"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
msgid "DHCP server is enabled"
msgstr "O servidor DHCP está habilitado"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
msgid "DHCP server is disabled"
msgstr "O servidor DHCP está desabilitado"
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
msgid "Host: %1"
msgstr "Máquina: %1"
#. command-line text output, %1 is hardwarre address
#. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
msgid "Hardware: %1"
msgstr "Hardware: %1"
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
msgid "IP Address: %1"
msgstr "Endereço IP: %1"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
msgid "Hostname not specified."
msgstr "Nome de máquina não especificado."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
msgid "Specified host does not exist."
msgstr "A máquina especificada não existe."
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
msgid "None"
msgstr "Nenhum"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
msgid "Selected Interfaces: %1"
msgstr "Interfaces selecionadas: %1"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
msgid "Other Interfaces: %1"
msgstr "Outras interfaces: %1"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
msgid "Specified interface does not exist."
msgstr "Interface especificada não existe."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
msgid "Operation with the interface not specified."
msgstr "Operação com a interface não foi especificada."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
msgid "Option key must be set."
msgstr "A chave da opção deve ser configurada."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
msgid "Value must be set."
msgstr "O valor deve ser configurado."
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
msgid "Address Range: %1-%2"
msgstr "Faixa de endereço: %1-%2"
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
msgid "Default Lease Time: %1"
msgstr "Tempo padrão de aluguel: %1"
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
msgid "Maximum Lease Time: %1"
msgstr "Tempo máximo de aluguel: %1"
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
msgid "Saving the configuration failed. Change the settings?"
msgstr "Falha ao salvar a configuração. Alterar as configurações?"
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+#| msgid "Saving the configuration failed. Change the settings?"
+msgid "Saving the configuration failed"
+msgstr "Falha ao salvar a configuração. Alterar as configurações?"
+
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
msgid "DHCP Server Configuration"
msgstr "Configuração do servidor DHCP"
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
msgid "Global Options"
msgstr "Opções globais"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
msgid "Subnet Configuration"
msgstr "Configuração de sub-rede"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
msgid "Host with Fixed Address"
msgstr "Máquina com endereço fixo"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
msgid "Shared Network"
msgstr "Rede compartilhada"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
msgid "Pool of Addresses"
msgstr "Pool de endereços"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
msgid "Group-Specific Options"
msgstr "Opções específicas do grupo"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
msgid "Class"
msgstr "Classe"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
msgid "&Subnet"
msgstr "&Sub-rede"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
msgid "&Host"
msgstr "&Máquina"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
msgid "Shared &Network"
msgstr "Rede co&mpartilhada"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
msgid "&Group"
msgstr "&Grupo"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
msgid "&Pool of Addresses"
msgstr "&Pool de endereços"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
msgid "&Class"
msgstr "&Classe"
#. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
msgid "Declaration Types"
msgstr "Tipos de declaração"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
msgid "Declaration Type"
msgstr "Tipo de declaração"
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
msgid "Interface Configuration"
msgstr "Configuração da interface"
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
msgid "TSIG Key Management"
msgstr "Gerenciamento de chave TSIG"
@@ -370,190 +375,150 @@
msgstr "Segundos"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
msgid "DHCP Server: Start-Up"
msgstr "Servidor DHCP: inicialização"
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
msgid "Start-Up"
msgstr "Inicialização"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
msgid "DHCP Server: Card Selection"
msgstr "Servidor DHCP: seleção de placa"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
msgid "Card Selection"
msgstr "Seleção de placa"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
msgid "DHCP Server: Global Settings"
msgstr "Servidor DHCP: configurações globais"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
msgid "Global Settings"
msgstr "Configurações globais"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
msgid "DHCP Server: Dynamic DHCP"
msgstr "Servidor DHCP: DHCP dinâmico"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
msgid "Dynamic DHCP"
msgstr "DHCP dinâmico"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
msgid "DHCP Server: Host Management"
msgstr "Servidor DHCP: gerenciamento de máquina"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
msgid "Host Management"
msgstr "Gerenciamento de máquina"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
msgid "DHCP Server: Expert Settings"
msgstr "Servidor DHCP: configurações avançadas"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
msgid "Expert Settings"
msgstr "Configurações avançadas"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
msgid "When &Booting"
msgstr "Ao &inicializar"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
msgid "&Manually"
msgstr "&Manualmente"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
msgid "When Booting"
msgstr "Ao inicializar"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
msgid "Manually"
msgstr "Manualmente"
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
-msgid "DHCP server is running"
-msgstr "O servidor DHCP está em execução."
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-msgid "DHCP server is not running"
-msgstr "O servidor DHCP não está em execução."
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-msgid "&Start DHCP Server Now"
-msgstr "&Iniciar servidor DHCP agora"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-msgid "S&top DHCP Server Now"
-msgstr "&Parar servidor DHCP agora"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "Salvar as configurações e rei&niciar o servidor DHCP agora"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-msgid "Start DHCP Server Now"
-msgstr "Iniciar servidor DHCP agora"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-msgid "Stop DHCP Server Now"
-msgstr "Parar servidor DHCP agora"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "Salvar as configurações e reiniciar o servidor DHCP agora"
-
-#: src/include/dhcp-server/dialogs2.rb:371
+#: src/include/dhcp-server/dialogs2.rb:334
msgid "DHCP Server Start-up Arguments"
msgstr "Argumentos de inicialização do servidor DHCP"
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
msgid "Network Cards for DHCP Server"
msgstr "Placas de rede do servidor DHCP"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
msgid "Selected"
msgstr "Selecionado"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
msgid "Interface Name"
msgstr "Nome da interface"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
msgid "Device Name"
msgstr "Nome do dispositivo"
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
msgid "IP"
msgstr "IP"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
msgid "&Select"
msgstr "&Selecionar"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
msgid "&Deselect"
msgstr "Desfazer se&leção"
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
msgid "DHCP address"
msgstr "Endereço DHCP"
#. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
msgid "At least one network interface must be selected."
msgstr "No mínimo, uma interface de rede deve ser selecionada."
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
msgid ""
"One or more selected network interfaces is not configured (no assigned IP address \n"
"and netmask)."
@@ -563,60 +528,60 @@
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
msgid "&LDAP Support"
msgstr "Suporte a &LDAP"
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
msgid "DHCP Server &Name (optional)"
msgstr "&Nome do servidor DHCP (opcional)"
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
msgid "&Domain Name"
msgstr "Nome de &domínio"
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
msgid "&Primary Name Server IP"
msgstr "IP do servidor de nomes &principal"
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
msgid "&Secondary Name Server IP"
msgstr "IP do servidor de nomes &secundário"
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
msgid "Default &Gateway (Router) "
msgstr "&Gateway padrão (roteador)"
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
msgid "NTP &Time Server"
msgstr "Servidor de horário N&TP"
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
msgid "&Print Server"
msgstr "Servidor de im&pressão"
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
msgid "&WINS Server"
msgstr "Servidor &WINS"
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
msgid "Default &Lease Time"
msgstr "Tempo padrão de a&luguel"
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
msgid "&Units"
msgstr "&Unidades"
@@ -624,48 +589,48 @@
#. error popup
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
msgid "The specified value is not a valid hostname or IP address."
msgstr "O valor especificado não é um nome de máquina ou endereço IP válido."
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
msgid "Subnet Information"
msgstr "Informação de sub-rede"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
msgid "Current &Network"
msgstr "Rede a&tual"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
msgid "Current Net&mask"
msgstr "&Máscara de rede atual"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
msgid "Netmask Bi&ts"
msgstr "Bi&ts da máscara de rede"
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
#: src/include/dhcp-server/dns-server-dialogs.rb:81
msgid "Min&imum IP Address"
msgstr "Endereço IP mín&imo"
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
#: src/include/dhcp-server/dns-server-dialogs.rb:83
msgid "Ma&ximum IP Address"
msgstr "Endereço IP má&ximo"
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
msgid "IP Address Range"
msgstr "Intervalo de endereços IP"
@@ -673,10 +638,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
msgid "&First IP Address"
msgstr "&Primeiro endereço IP"
@@ -684,61 +649,61 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
msgid "&Last IP Address"
msgstr "Último &endereço IP"
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
msgid "Allow Dynamic &BOOTP"
msgstr "Permitir &BOOTP dinâmico"
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
msgid "Lease Time"
msgstr "Tempo de aluguel"
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
msgid "&Default"
msgstr "Pa&drão"
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
msgid "&Maximum"
msgstr "&Máximo"
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
msgid "Uni&ts"
msgstr "Unida&des"
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
msgid "Create New DNS Zone from Scratch"
msgstr "Criar nova zona DNS do início"
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
msgid "Edit Current DNS Zone"
msgstr "Editar zona DNS atual"
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
msgid "Get Current Zone Information"
msgstr "Obter informações da zona atual"
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
msgid "&Synchronize DNS Server..."
msgstr "&Sincronizar servidor DNS..."
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -748,8 +713,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
msgid "Enter values for both ends of the IP address range."
msgstr "Digite valores para ambas as extremidades da faixa de endereço IP."
@@ -757,8 +722,8 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
msgid ""
"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
@@ -767,127 +732,127 @@
"O IP %1 não corresponde à rede %2/%3."
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
msgid "Registered Host"
msgstr "Máquina registrada"
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
msgid "Name"
msgstr "Nome"
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
msgid "Hardware Address"
msgstr "Endereço de hardware"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
msgid "Type"
msgstr "Tipo"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
msgid "List Setup"
msgstr "Configuração de lista"
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
msgid "&Name"
msgstr "&Nome"
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
msgid "&IP Address"
msgstr "Endereço &IP"
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
msgid "&Hardware Address"
msgstr "Endereço de &hardware"
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
msgid "&Ethernet"
msgstr "&Ethernet"
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
msgid "&Token Ring"
msgstr "&Token Ring"
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
msgid "C&hange in List"
msgstr "Al&terar na lista"
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "Dele&te from List"
msgstr "Remover da lis&ta"
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
msgid "Ethernet"
msgstr "Ethernet"
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
msgid "Token Ring"
msgstr "Token Ring"
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
msgid "The hardware address is invalid.\n"
msgstr "O endereço de hardware é inválido.\n"
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
msgid "The hardware address must be unique."
msgstr "O endereço de hardware deve ser único."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
msgid "The hostname cannot be empty."
msgstr "O nome de máquina não pode estar vazio."
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
msgid "A host named %1 already exists."
msgstr "Uma máquina chamada %1 já existe."
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
msgid "Enter a host IP."
msgstr "Digite um IP da máquina."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
msgid "The hardware address must be defined."
msgstr "O endereço de hardware deve ser definido."
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
msgid "Select a host first."
msgstr "Selecione uma máquina primeiro."
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
msgid "The input value must be defined."
msgstr "O valor de entrada deve ser definido."
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -908,15 +873,15 @@
"Continuar?"
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr "\"-%1\" não é uma opção válida de linha de comando do servidor DHCP"
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr "A opção de linha de comando do servidor DHCP \"-%1\" exige um argumento"
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -935,7 +900,7 @@
"Realmente continuar?\n"
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
msgid "DHCP Server Wizard (%1 of 4)"
msgstr "Assistente do servidor DHCP (%1 de 4)"
@@ -1225,7 +1190,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
msgid "The last IP address must be higher than the first one."
msgstr "O último endereço IP deve ser maior que o primeiro."
@@ -1252,7 +1217,7 @@
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
msgid "Invalid hostname."
msgstr "Nome de máquina inválido."
@@ -1263,9 +1228,9 @@
#. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
#: src/include/dhcp-server/dns-server-dialogs.rb:462
#: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
msgid "Invalid IP address."
msgstr "Endereço IP inválido."
@@ -1283,44 +1248,44 @@
"IP permitidos (%2-%3) definidos no servidor DHCP.\n"
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
msgid "Regenerating DNS zone entries..."
msgstr "Regenerando entradas da zona DNS..."
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
msgid "Adding a New DNS Record"
msgstr "Adicionando um novo registro DNS"
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "Nome de &máquina"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr "Adicionando faixa DHCP %1-%2 ao servidor DNS..."
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
msgid "Removing DNS Records Matching Range"
msgstr "Removendo registros DNS correspondentes à faixa"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr "Removendo registros na faixa %1-%2 do servidor DNS..."
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
@@ -1329,7 +1294,7 @@
"O servidor DNS não pode salvar nenhum registro nela.\n"
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1339,18 +1304,18 @@
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
#: src/include/dhcp-server/dns-server-wizard.rb:1107
msgid "Cannot create zone %1."
msgstr "Não foi possível criar a zona %1."
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
msgid "Synchronizing DNS reverse records..."
msgstr "Sincronizando registros DNS reversos..."
#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
@@ -1359,62 +1324,62 @@
"Realmente cancelar esta operação?\n"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
msgid "&Domain"
msgstr "&Domínio"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
msgid "&Network"
msgstr "Re&de"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "Net&mask"
msgstr "&Máscara de rede"
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
msgid "DNS Zone Records"
msgstr "Registros da zona DNS"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
msgid "Hostname"
msgstr "Nome de máquina"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Assigned IP"
msgstr "IP atribuído"
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
msgid "&Add..."
msgstr "&Adicionar..."
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
msgid "&Special Tasks"
msgstr "&Tarefas especiais"
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
msgid "Add New Range of DNS Records"
msgstr "Adicionar nova faixa de registros DNS"
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr "Executar o assistente para regravar a zona DNS desde o início"
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
msgid "Synchronize with Reverse Zone %1"
msgstr "Sincronizar com a zona reversa %1"
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
msgid "DHCP Server: DNS Server Synchronization"
msgstr "Servidor DHCP: sincronização do servidor DNS"
@@ -1710,8 +1675,7 @@
"Por favor, aguarde...</p>"
#. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1738,20 +1702,9 @@
"Essa opção só estará disponível se o firewall\n"
"estiver habilitado.</p>"
-#. help text 1/5
+#. help text 2/5
#: src/include/dhcp-server/helps.rb:39
msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>Servidor DHCP</big></b></p>\n"
-"<p>Para executar o servidor DHCP sempre que seu computador for iniciado, defina\n"
-"<b>Iniciar servidor DHCP</b>.</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-msgid ""
"<p>\n"
"To run the DHCP server in chroot jail, set\n"
"<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1763,7 +1716,7 @@
"é a forma mais segura e recomendada.</p>"
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1774,7 +1727,7 @@
"habilite <b>Suporte a LDAP</b>.</p>"
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
"To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1789,7 +1742,7 @@
"Para remover uma declaração, selecione-a e clique em <b>Remover</b>.</p>"
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1804,7 +1757,7 @@
"atualizações dinâmicas do DNS.</p>"
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
"Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
@@ -1813,7 +1766,7 @@
"Defina o <b>Endereço de rede</b> e a <b>Máscara de rede</b> da sub-rede.</p>"
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
"Set the name of the host for which to set the fixed address or other\n"
@@ -1824,7 +1777,7 @@
"especiais serão definidas em <b>Nome de máquina</b>.</p>"
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
"Set the name of the group of declarations in <b>Group Name</b>. \n"
@@ -1837,7 +1790,7 @@
"O nome não afeta o comportamento do servidor DHCP.</p>"
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
"Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1850,7 +1803,7 @@
"O nome não afeta o comportamento do servidor DHCP.</p>"
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1863,7 +1816,7 @@
"O nome não afeta o comportamento do servidor DHCP.</p>"
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
@@ -1872,7 +1825,7 @@
"Defina o nome da classe de máquina em <b>Nome de classe</b>.</p>"
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
msgid ""
"<p>\n"
"To edit DHCP options, choose the appropriate\n"
@@ -1887,7 +1840,7 @@
"uma opção, selecione-a e clique em <b>Remover</b>.</p>"
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
@@ -1896,7 +1849,7 @@
"Para ajustar o DNS dinâmico das máquinas desta sub-rede, use <b>DNS dinâmico</b>.</p>"
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1907,7 +1860,7 @@
"<b>Habilitar DNS dinâmico para esta sub-rede</b>.</p>"
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1922,7 +1875,7 @@
"zonas reversa e de encaminhamento.</p>"
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1935,7 +1888,7 @@
"<b>Atualizar as configurações globais de DNS dinâmico</b>.</p>"
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -1948,7 +1901,7 @@
"servidor DHCP, pode deixar os campos em branco.</p>"
#. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
"Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -1961,7 +1914,7 @@
"consulte a página de manual dhcpd. Se estiver em branco, os valores padrão serão usados.</p>"
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
"Select one or more of the listed network cards to use for the DHCP server.</p>\n"
@@ -1970,7 +1923,7 @@
"Selecione uma ou mais algumas das placas de rede listadas a serem usadas para o servidor DHCP.</p>\n"
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
@@ -1979,7 +1932,7 @@
"(o nome do objeto dhcpServer LDAP), se for diferente do nome de máquina.\n"
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1989,7 +1942,7 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
@@ -1998,7 +1951,7 @@
"aluga IPs aos clientes.</p>"
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -2009,7 +1962,7 @@
"Esses valores devem ser endereços IP.</p>"
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
@@ -2018,7 +1971,7 @@
"valor como a rota padrão na tabela de roteamento de clientes.</p>"
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
@@ -2027,12 +1980,12 @@
"para a sincronização de horário.</p>"
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr "<p><b>Servidor de impressão</b> oferece este servidor como servidor de impressão padrão.</p>"
#. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
@@ -2041,7 +1994,7 @@
"WINS (Windows Internet Naming Service).</p>"
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
msgid ""
"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
@@ -2050,7 +2003,7 @@
"alugado vence e o cliente deve pedir outro IP novamente.</p>"
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -2063,7 +2016,7 @@
"</p>\n"
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -2081,7 +2034,7 @@
"atribuído aos clientes BOOTP assim como para os clientes DHCP</p>.\n"
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -2092,7 +2045,7 @@
"que define o melhor tempo de atualização do IP para os clientes.<br></p>"
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
@@ -2101,7 +2054,7 @@
"pelo qual este IP é bloqueado para o cliente do servidor DHCP.</p>"
#. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -2112,7 +2065,7 @@
"<b>Configuração avançada do servidor DHCP</b>.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
"Use this dialog to edit hosts with static address binding.</p>"
@@ -2121,7 +2074,7 @@
"Use este diálogo para editar máquinas com endereço fixo.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -2136,17 +2089,17 @@
"altere os valores e clique em <b>Alterar na lista</b>.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr "<p>Para remover uma máquina, selecione-a e clique em <b>Remover da lista</b>.</p>"
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>Select the type of declaration to add.</p>"
msgstr "<p>Selecione o tipo de declaração a ser adicionado.</p>"
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
@@ -2155,7 +2108,7 @@
"selecione <b>Sub-rede</b>.</p>"
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
@@ -2164,7 +2117,7 @@
"(normalmente um endereço fixo), selecione <b>Máquina</b>.</p>"
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
@@ -2173,7 +2126,7 @@
"múltiplas redes lógicas), selecione <b>Rede compartilhada</b>.</p>"
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
@@ -2182,7 +2135,7 @@
"se elas compartilham configurações), selecione <b>Grupo</b>.</p>"
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2193,7 +2146,7 @@
"selecione <b>Pool de endereços</b>.</p>"
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
msgid ""
"<p>To create a condition class that can be used for\n"
"handling clients differently depending on the class to which they belong,\n"
@@ -2206,23 +2159,23 @@
#. selection box
#. selection box
#. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
msgid "A&ddresses"
msgstr "En&dereços"
#. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
msgid "The entered address is not valid."
msgstr "O endereço digitado não é válido."
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
msgid "At least one address must be specified."
msgstr "No mínimo um endereço deve ser especificado."
@@ -2232,94 +2185,94 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
msgid "&Values"
msgstr "&Valores"
#. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
msgid "The entered addresses are not valid."
msgstr "Os endereços digitados não são válidos."
#. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
msgid "At least one address pair must be specified."
msgstr "No mínimo um par de endereços deve ser especificado."
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
msgid "On"
msgstr "Ligado"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
msgid "Off"
msgstr "Desligado"
#. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
msgid "A value must be specified."
msgstr "Um valor deve ser especificado."
#. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
msgid "&New Address"
msgstr "&Novo endereço"
#. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
msgid "&New Value"
msgstr "&Novo valor"
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
msgid "Separate multiple addresses with spaces."
msgstr "Separe vários endereços com espaços."
#. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
msgid "&Add Address Pair"
msgstr "&Adicionar par de endereços"
#. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
msgid "The lowest address must be lower than the highest one."
msgstr "O endereço mais baixo deve ser inferior ao mais alto."
#. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
msgid "If you change this, also update the syslog configuration."
msgstr "Se alterar isto, também atualize a configuração de syslog."
#. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
msgid "&Hardware Type"
msgstr "Tipo de &hardware"
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
msgid "&MAC Address"
msgstr "Endereço &MAC"
#. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
msgid "&Lowest IP Address"
msgstr "Me&nor endereço IP"
#. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
msgid "&Highest IP Address"
msgstr "Mai&or endereço IP"
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
@@ -2328,7 +2281,7 @@
"todas as alterações serão perdidas. Realmente sair?"
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2339,7 +2292,7 @@
"Continuar?"
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
"%1\n"
@@ -2350,7 +2303,7 @@
"Execute a configuração do firewall do YaST para designar uma zona às interfaces."
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
"Run the YaST firewall configuration to assign it to a zone."
@@ -2360,8 +2313,8 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
@@ -2369,199 +2322,188 @@
"Esta função não está disponível\n"
"durante a preparação da auto-instalação."
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-msgid "Restart DHCP Server"
-msgstr "Reiniciar o servidor DHCP"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-msgid "Save Settings and Restart DHCP Server"
-msgstr "Salvar as configurações e reiniciar o servidor DHCP"
-
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
msgid "&Configured Declarations"
msgstr "Declarações &configuradas"
#. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
msgid "&Dynamic DNS"
msgstr "DNS &dinâmico"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
msgid "Forward Zone TSIG &Key"
msgstr "Chave TSIG para &zona de encaminhamento"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
msgid "Reverse Zone TSIG &Key"
msgstr "&Chave TSIG para zona reversa"
#. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
msgid "Select File with Authentication Key"
msgstr "Selecionar arquivo com chave de autenticação"
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-msgid "&Start DHCP Server"
-msgstr "Iniciar &servidor DHCP"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
msgid "&Run DHCP Server in Chroot Jail"
msgstr "Executa&r servidor DHCP em chroot jail"
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
msgid "Ad&vanced"
msgstr "A&vançado"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
msgid "Display &Log"
msgstr "Exibir &log"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
msgid "&Interface Configuration"
msgstr "Configuração da &interface"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
msgid "&Network Address"
msgstr "E&ndereço de rede"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
msgid "Network &Mask"
msgstr "&Máscara de rede"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
msgid "Group &Name"
msgstr "Nome do &grupo"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
msgid "Pool &Name"
msgstr "Nome de &pool"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
msgid "Shared Network &Name"
msgstr "&Nome de rede compartilhada"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
msgid "Class &Name"
msgstr "&Nome de classe"
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
msgid "Available Interfaces"
msgstr "Interfaces disponíveis"
#. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
msgid "Open &Firewall for Selected Interfaces"
msgstr "Abrir &firewall para interfaces selecionadas"
#. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
msgid "&Enable Dynamic DNS for This Subnet"
msgstr "Habilitar DNS dinâmico para esta sub-r&ede"
#. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
msgid "&Update Global Dynamic DNS Settings"
msgstr "At&ualizar as configurações globais do DNS dinâmico"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
msgid "&Zone"
msgstr "&Zona"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
msgid "&Primary DNS Server"
msgstr "Servidor de DNS &primário"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
msgid "Re&verse Zone"
msgstr "Zona re&versa"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
msgid "Pr&imary DNS Server"
msgstr "Servidor de DNS pr&imário"
#. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
msgid "DHCP Server &Expert Configuration..."
msgstr "Configuração a&vançada do servidor DHCP..."
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
msgid "Initializing DHCP Server Configuration"
msgstr "Inicializando a configuração do servidor DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
msgid "Check the environment"
msgstr "Verificar o ambiente"
#. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
msgid "Read firewall settings"
msgstr "Ler as configurações do firewall"
#. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
msgid "Read DHCP server settings"
msgstr "Ler as configurações do servidor DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
msgid "Read DNS server settings"
msgstr "Ler as configurações do servidor DNS"
#. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
msgid "Checking the environment..."
msgstr "Verificando o ambiente..."
#. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
msgid "Reading firewall settings..."
msgstr "Lendo as configurações do firewall..."
#. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
msgid "Reading DHCP server settings..."
msgstr "Lendo as configurações do servidor DHCP..."
#. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
msgid "Reading DNS server settings..."
msgstr "Lendo as configurações do servidor DNS..."
#. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
msgid "Finished"
msgstr "Concluído"
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2578,7 +2520,7 @@
"Cancelando agora."
#. error report
-#: src/modules/DhcpServer.pm:1475
+#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
@@ -2587,7 +2529,7 @@
"DHCP baseada em LDAP não estará disponível."
#. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
@@ -2596,87 +2538,87 @@
"ainda. Criar nova configuração?"
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
msgid "Saving DHCP Server Configuration"
msgstr "Salvando a configuração do servidor DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
msgid "Write DHCP server settings"
msgstr "Salvar as configurações do servidor DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
msgid "Write firewall settings"
msgstr "Salvar as configurações do firewall"
#. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
msgid "Restart DHCP server"
msgstr "Reiniciar o servidor DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
msgid "Write DNS server settings"
msgstr "Salvar as configurações do servidor DNS"
#. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
msgid "Writing DHCP server settings..."
msgstr "Salvando as configurações do servidor DHCP..."
#. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
msgid "Writing firewall settings..."
msgstr "Salvando as configurações do firewall..."
#. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
msgid "Restarting DHCP server..."
msgstr "Reiniciando servidor DHCP..."
#. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
msgid "Writing DNS server settings..."
msgstr "Salvando as configurações do servidor DNS..."
#. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
msgid "Error occurred while restarting the DHCP daemon."
msgstr "Erro ao reiniciar o daemon DHCP."
#. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
msgid "The DHCP server is started at boot time"
msgstr "O servidor DHCP é iniciado durante a inicialização"
#. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
msgid "The DHCP server is not started at boot time"
msgstr "O servidor DHCP não é iniciado durante a inicialização"
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
msgid "Listen On: %1"
msgstr "Escutar em: %1"
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
msgid "Dynamic Address Range: %1"
msgstr "Intervalo de endereço dinâmico: %1"
#. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "Configuração LDAP inválida. Não foi possível usar o LDAP."
#. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr "Suporte para múltiplos dhcpServiceDN não implementado."
#. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
msgid "DHCP service DN is not defined."
msgstr "Serviço DHCP DN não definido."
@@ -2684,27 +2626,69 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
msgid "Error occurred while creating %1."
msgstr "Ocorreu um erro ao criar %1."
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#: src/modules/DhcpServer.pm:2754
msgid "Error occurred while updating %1."
msgstr "Ocorreu erro ao atualizar %1."
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "Erro ocorreu ao criar cn=%2,ou=DHCP,%1."
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "Erro ocorreu ao salvar o /etc/dhcpd.conf."
+#~ msgid "DHCP server is running"
+#~ msgstr "O servidor DHCP está em execução."
+
+#~ msgid "DHCP server is not running"
+#~ msgstr "O servidor DHCP não está em execução."
+
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "&Iniciar servidor DHCP agora"
+
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "&Parar servidor DHCP agora"
+
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "Salvar as configurações e rei&niciar o servidor DHCP agora"
+
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "Iniciar servidor DHCP agora"
+
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "Parar servidor DHCP agora"
+
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "Salvar as configurações e reiniciar o servidor DHCP agora"
+
#~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Servidor DHCP</big></b></p>\n"
+#~ "<p>Para executar o servidor DHCP sempre que seu computador for iniciado, defina\n"
+#~ "<b>Iniciar servidor DHCP</b>.</p>"
+
+#~ msgid "Restart DHCP Server"
+#~ msgstr "Reiniciar o servidor DHCP"
+
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "Salvar as configurações e reiniciar o servidor DHCP"
+
+#~ msgid "&Start DHCP Server"
+#~ msgstr "Iniciar &servidor DHCP"
+
+#~ msgid ""
#~ "The selected network interface is not configured (no assigned IP address \n"
#~ "and netmask). Using it in the DHCP server configuration may not work.\n"
#~ "Really use this interface?\n"
Modified: trunk/yast/pt_BR/po/dns-server.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/dns-server.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/dns-server.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: dns-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-10-31 10:47UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -309,8 +309,7 @@
#. TRANSLATORS: commandline error message
#. Both Add and Remove defined => Error!
#: 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:999 src/include/dns-server/cmdline.rb:1049
#: src/include/dns-server/cmdline.rb:1108
#: src/include/dns-server/cmdline.rb:1244
#: src/include/dns-server/cmdline.rb:1303
@@ -381,11 +380,10 @@
#. Table header item - ACL-options
#. Table menu item - Records listing
#: 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:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
msgid "Value"
msgstr "Valor"
@@ -403,7 +401,7 @@
#. TRANSLATORS: commandline table header item
#. Textentry - DNS adding zone - Name
#: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
msgid "Name"
msgstr "Nome"
@@ -413,9 +411,9 @@
#. Table header item - DNS listing zones
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
msgid "Type"
msgstr "Tipo"
@@ -428,8 +426,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
#: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
msgid "Forwarders"
msgstr "Encaminhadores"
@@ -459,12 +457,11 @@
#. TRANSLATORS: commandline table header item
#. TRANSLATORS: commandline table header item
#. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: 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:1905
+#: src/include/dns-server/dialog-main.rb:1639
msgid "Zone"
msgstr "Zona"
@@ -493,14 +490,14 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
msgid "Mail Server"
msgstr "Servidor de e-mail"
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
msgid "Priority"
msgstr "Prioridade"
@@ -562,8 +559,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:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
msgid "DNS Zones"
msgstr "Zonas DNS"
@@ -585,7 +582,7 @@
#. check box
#. TRANSLATORS: checkbox label, turning LDAP support on or off
#: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
msgid "&LDAP Support Active"
msgstr "Suporte &LDAP ativo"
@@ -610,131 +607,88 @@
msgstr "Configuração a&vançada do servidor DNS..."
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
msgid "DNS Server"
msgstr "Servidor DNS"
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-msgid "Apply Changes"
-msgstr "Aplicar alterações"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-msgid "Start-Up"
-msgstr "Inicialização"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-msgid "Basic Options"
-msgstr "Opções básicas"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "Log"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: 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"
-msgstr "ACLs"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-msgid "TSIG Keys"
-msgstr "Chaves TSIG"
-
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
msgid "Local DNS Resolution &Policy"
msgstr "&Política de resolução DNS local"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
msgid "Merging forwarders is disabled"
msgstr "A combinação de encaminhadores está desabilitada"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
msgid "Automatic merging"
msgstr "Combinação automática"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
msgid "Merging forwarders is enabled"
msgstr "A combinação de encaminhadores está habilitada"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
msgid "Custom configuration"
msgstr "Configuração personalizada"
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
msgid "Custom policy"
msgstr "Política personalizada"
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
msgid "Local DNS Resolution &Forwarder"
msgstr "&Encaminhador de resolução DNS local"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
msgid "Using system name servers"
msgstr "Utilizando servidores de nome do sistema"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
msgid "This name server (bind)"
msgstr "Este servidor de nome (bind)"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
msgid "Local dnsmasq server"
msgstr "Servidor dnsmasq local"
#. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
msgid "Add IP Address"
msgstr "Adicionar endereço IP"
#. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
msgid "IPv4 or IPv6 A&ddress"
msgstr "&Endereço IPv4 ou IPv6"
#. Selectionbox for listing current DNS-Forwarders
#. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
msgid "Forwarder &List"
msgstr "&Lista de encaminhadores"
#. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
msgid "Cannot set local forwarder to %{forwarder}"
msgstr "Não foi possível configurar o encaminhador local para %{forwarder}"
#. An error message, %1 is replaced with a variable IP
-#: src/include/dns-server/dialog-main.rb:877
+#: src/include/dns-server/dialog-main.rb:611
msgid "Cannot find local equivalent for IP %1."
msgstr "Não foi possível encontrar um equivalente local para o IP %1."
#. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
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"
@@ -745,11 +699,11 @@
"alterado para seu equivalente local %2."
#. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
msgid "Invalid IPv4 or IPv6 address."
msgstr "Endereço IPv4 ou IPv6 inválido."
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
msgid ""
"A valid IPv6 address consists of letters a-f, numbers,\n"
"and colons."
@@ -758,46 +712,46 @@
"e dois-pontos."
#. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
msgid "The specified forwarder is already present."
msgstr "O encaminhador selecionado já está presente."
#. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
msgid "Add or Change Option"
msgstr "Adicionar ou alterar opção"
#. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
msgid "O&ption"
msgstr "O&pção"
#. Textentry for setting the basic-option value
#. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
msgid "&Value"
msgstr "&Valor"
#. Pushbutton for changing the basic-option
#. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
msgid "C&hange"
msgstr "A<erar"
#. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
msgid "Current Options"
msgstr "Opções atuais"
#. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
msgid "Option"
msgstr "Opção"
#. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
msgid ""
"Really set this\n"
"option without any value?\n"
@@ -806,7 +760,7 @@
"esta opção sem valor?\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:1173
+#: src/include/dns-server/dialog-main.rb:907
msgid ""
"Option %1 can only have a yes or no value set.\n"
"Really set it to %2?\n"
@@ -815,7 +769,7 @@
"Realmente defini-la como %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:1190
+#: src/include/dns-server/dialog-main.rb:924
msgid ""
"Option %1 can only be a number.\n"
"Really set it to %2?\n"
@@ -824,7 +778,7 @@
"Realmente defini-la como %2?\n"
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
msgid ""
"Quotes are not used correctly in this option.\n"
"Really set it to %1?\n"
@@ -833,7 +787,7 @@
"Realmente defini-la como %1?\n"
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
msgid ""
"Brackets are not used correctly in this option.\n"
"Really set it to %1?\n"
@@ -842,7 +796,7 @@
"Realmente defini-la como %1?\n"
#. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
msgid ""
"Option %1 should be set only once.\n"
"Really add another one?\n"
@@ -851,77 +805,77 @@
"Realmente adicionar outra?\n"
#. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
msgid "Log Type"
msgstr "Tipo de log"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
msgid "&System Log"
msgstr "Log do &sistema"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
msgid "&File"
msgstr "&Arquivo"
#. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
msgid "Maximum &Size (MB)"
msgstr "Tamanho má&ximo (MB)"
#. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
msgid "Maximum &Versions"
msgstr "Máximo de &versões"
#. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
msgid "Additional Logging"
msgstr "Log adicional"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
msgid "Log All DNS &Queries"
msgstr "Registrar todas as &consultas de DNS"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
msgid "Log Zone &Updates"
msgstr "At&ualizações de zonas de log"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
msgid "Log Zone &Transfers"
msgstr "&Transferências de zona de log"
#. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
msgid "Select File for Log"
msgstr "Selecionar arquivo para log"
#. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
msgid "Option Setup"
msgstr "Opção de configuração"
#. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
msgid "&Name"
msgstr "&Nome"
#. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
msgid "Current ACL List"
msgstr "Lista ACL atual"
#. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
msgid "ACL"
msgstr "ACL"
#. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
msgid ""
"This ACL is used by %1 zones.\n"
"Really remove it?\n"
@@ -930,12 +884,12 @@
"Você realmente quer removê-la?\n"
#. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
msgid "The specified ACL entry already exists."
msgstr "A entrada de ACL especificada já existe."
#. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
msgid "Add New Zone "
msgstr "Adicionar nova zona"
@@ -944,8 +898,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:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
msgid "Master"
msgstr "Mestre"
@@ -955,9 +909,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:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
msgid "Slave"
msgstr "Escravo"
@@ -966,34 +920,34 @@
#. TRANSLATORS: Table item - Server type
#. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-#
#. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
msgid "Forward"
msgstr "Encaminhar"
#. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
msgid "Configured DNS Zones"
msgstr "Zonas DNS configuradas"
#. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
msgid "A zone with the specified name is already configured."
msgstr "Já existe uma zona com o nome especificado configurada."
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
msgid "Saving the configuration failed. Change the settings?"
msgstr "Falha ao salvar a configuração. Alterar as configurações?"
#. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
+#: src/include/dns-server/dialog-main.rb:1903
msgid "Saving the configuration failed"
msgstr "Falha ao salvar a configuração"
#. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
msgid ""
"All changes will be lost.\n"
"Really leave the DNS server configuration without saving?"
@@ -1001,40 +955,83 @@
"Todas as alterações serão perdidas.\n"
"Realmente sair da configuração do servidor DNS sem salvar?"
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+msgid "Apply Changes"
+msgstr "Aplicar alterações"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+msgid "Start-Up"
+msgstr "Inicialização"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+msgid "Basic Options"
+msgstr "Opções básicas"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "Log"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr "ACLs"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+msgid "TSIG Keys"
+msgstr "Chaves TSIG"
+
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
msgid "A&llow Dynamic Updates"
msgstr "Permitir atua&lizações dinâmicas"
#. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
msgid "TSIG &Key"
msgstr "&Chave TSIG"
#. check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
msgid "Enable &Zone Transport"
msgstr "Habilitar transporte de &zona"
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
msgid "A&utomatically Generate Records From"
msgstr "Gerar registros a&utomaticamente a partir de"
#. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
msgid "Zon&e"
msgstr "Zo&na"
#. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
msgid "Connected Reverse Zones"
msgstr "Zonas reversas conectadas"
#. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
msgid ""
"This function is not available during\n"
"preparation for autoinstallation.\n"
@@ -1043,34 +1040,34 @@
"durante a preparação da auto-instalação.\n"
#. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
msgid "No TSIG key is defined."
msgstr "Nenhuma chave TSIG está definida."
#. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
msgid "&Name Server to Add"
msgstr "Servidor de &nomes para adicionar"
#. Selectionbox - listing current nameservers
#. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
msgid "Na&me Server List"
msgstr "Lista de servidores de no&mes"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
msgid "The specified name server already exists."
msgstr "O servidor de nomes especificado já existe."
#. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
msgid "Mail Server to Add"
msgstr "Servidor de e-mail para adicionar"
#. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
msgid "&Address"
msgstr "End&ereço"
@@ -1078,116 +1075,116 @@
#. IntField - zone settings - Record Value
#. IntField - zone settings - Record Value
#. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
#: src/include/dns-server/options.rb:435
msgid "&Priority"
msgstr "&Prioridade"
#. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
msgid "Mail Relay List"
msgstr "Lista de retransmissões de e-mail"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
msgid "The specified value is not a valid hostname or IP address."
msgstr "O valor especificado não é um nome de máquina ou endereço IP válido."
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
msgid "The specified mail server already exists."
msgstr "O servidor de e-mail especificado já existe."
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
msgid "Seconds"
msgstr "Segundos"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
msgid "Minutes"
msgstr "Minutos"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
msgid "Hours"
msgstr "Horas"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
msgid "Days"
msgstr "Dias"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
msgid "Weeks"
msgstr "Semanas"
#. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
msgid "Seri&al"
msgstr "Seri&al"
#. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
msgid "TT&L"
msgstr "TT&L"
#. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
msgid "&Unit"
msgstr "&Unidade"
#. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
msgid "Re&fresh"
msgstr "&Atualizar"
#. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
msgid "Un&it"
msgstr "Un&idade"
#. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
msgid "Retr&y"
msgstr "Tentar &novamente"
#. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
msgid "Ex&piration"
msgstr "&Vencimento"
#. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
msgid "U&nit"
msgstr "U&nidade"
#. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
msgid "&Minimum"
msgstr "&Mínimo"
#. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
msgid "Uni&t"
msgstr "&Unidade"
#. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
msgid "The serial number of the zone must be specified."
msgstr "O número de série da zona deve ser especificado."
#. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
msgid "The serial number must be no more than %1 digits long."
msgstr "O número de série não deve ter mais de %1 dígitos."
#. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
msgid ""
"The expiration time-out is higher than the time period\n"
"of zone refreshes. The zone will not be reachable\n"
@@ -1202,104 +1199,104 @@
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
msgid "&Record Key"
msgstr "Chave de ®istro"
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
msgid "T&ype"
msgstr "&Tipo"
#. Textentry - zone settings - Record Value
#. IntField - zone settings - Record Value
#. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
msgid "Val&ue"
msgstr "Va&lor"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
msgid "&Service"
msgstr "&Serviço"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
msgid "&Protocol"
msgstr "&Protocolo"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
msgid "&Weight"
msgstr "&Peso"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
msgid "&Port"
msgstr "&Porta"
#. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
msgid "A: IPv4 Domain Name Translation"
msgstr "A: tradução do nome de domínio IPv4"
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
msgid "AAAA: IPv6 Domain Name Translation"
msgstr "AAAA: tradução do nome de domínio IPv6"
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
msgid "CNAME: Alias for Domain Name"
msgstr "CNAME: apelido do nome de domínio"
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
msgid "NS: Name Server"
msgstr "NS: servidor de nomes"
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
msgid "MX: Mail Relay"
msgstr "MX: retransmissão de e-mail"
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
msgid "PTR: Reverse Translation"
msgstr "PTR: tradução reversa"
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
msgid "SRV: Services Record"
msgstr "SRV: registro de serviços"
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
msgid "TXT: Text Record"
msgstr "TXT: registro de texto"
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
msgid "SPF: Sender Policy Framework"
msgstr "SPF: Sender Policy Framework"
#. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
msgid "Record Settings"
msgstr "Configurações do log"
#. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
msgid "Configured Resource Records"
msgstr "Registros de recurso configurados"
#. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
msgid "Record Key"
msgstr "Chave de registro"
#. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
msgid ""
"Invalid IPv6 reverse IP.\n"
"\n"
@@ -1312,13 +1309,13 @@
"ou na forma relativa à zona atual."
#. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
msgid "Invalid IPv6 address."
msgstr "Endereço IPv6 inválido."
#. TRANSLATORS: Error message
#. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
msgid ""
"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
"and must be at least one character long."
@@ -1330,7 +1327,7 @@
#. %{type} - replaced with record type (TXT or SPF)
#. %{max} - replaced with the maximal length
#. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
msgid ""
"Maximal length of a %{type} record is %{max} characters.\n"
"This message is %{current} characters long."
@@ -1339,72 +1336,66 @@
"Esta mensagem possui %{current} caracteres."
#. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
msgid "CNAME cannot point to itself."
msgstr "CNAME não pode apontar para si mesmo."
#. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
msgid "An internal error has occurred."
msgstr "Erro interno."
#. Dialog Caption - Expert Settings - Zone Editor
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
msgid "Zone Editor"
msgstr "Editor de zona"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
msgid "&Basics"
msgstr "&Básico"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
msgid "NS Recor&ds"
msgstr "Re&gistros NS"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
msgid "&SOA"
msgstr "&SOA"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
msgid "R&ecords"
msgstr "R&egistros"
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
msgid "M&X Records"
msgstr "Registros M&X"
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
msgid "Settings for Zone"
msgstr "Configurações de zona"
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "A&vançado"
-
#. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
msgid "At least one NS server must be set."
msgstr "É necessário definir ao menos um servidor NS."
@@ -1412,7 +1403,7 @@
#.
#. Automatically Generate Records From is a feature that makes YaST to generate
#. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
msgid ""
"Current zone records are automatically generated from %1 zone.\n"
"To change records manually disable the Automatically Generate Records From feature."
@@ -1421,17 +1412,17 @@
"Para mudar os registros manualmente desabilite o recurso 'Gerar registros automaticamente a partir de'."
#. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
msgid "&Master DNS Server IP"
msgstr "IP do servidor DNS &mestre"
#. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
msgid "Missing Master Server"
msgstr "Servidor mestre ausente"
#. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
msgid ""
"Every slave zone must have its master server IP defined.\n"
"Configuration of a DNS server without a master server would fail.\n"
@@ -1442,32 +1433,32 @@
"Se você continuar, a zona atual será removida."
#. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
msgid "No master DNS server defined."
msgstr "Nenhum servidor DNS mestre definido."
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
msgid "The specified master name server is not a valid IP address."
msgstr "O servidor de nomes mestre especificado não é um endereço IP válido."
#. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
msgid "New &Forwarder IP Address"
msgstr "Endereço IP do novo &encaminhador"
#. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
msgid "Current &Zone Forwarders"
msgstr "Encaminhadores de &zona atuais"
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
msgid "Forward Zone Editor"
msgstr "Editor de zona de encaminhamento"
#. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
msgid ""
"This forward zone has no forwarders defined, which means\n"
"that all DNS queries for this zone are denied.\n"
@@ -2505,56 +2496,56 @@
msgstr "Retransmissão de &e-mail"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
msgid "Initializing DNS Server Configuration"
msgstr "Inicializando a configuração do servidor DNS"
#. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
msgid "Check the environment"
msgstr "Verificar o ambiente"
#. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
msgid "Flush caches of the DNS daemon"
msgstr "Descarregar os caches do daemon DNS"
#. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
msgid "Read the firewall settings"
msgstr "Ler as configurações do firewall"
#. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
msgid "Read the settings"
msgstr "Ler as configurações"
#. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
msgid "Checking the environment..."
msgstr "Verificando o ambiente..."
#. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
msgid "Flushing caches of the DNS daemon..."
msgstr "Descarregando os caches do daemon DNS..."
#. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
msgid "Reading the firewall settings..."
msgstr "Lendo as configurações do firewall..."
#. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
msgid "Reading the settings..."
msgstr "Lendo as configurações..."
#. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
msgid "Finished"
msgstr "Concluído"
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
msgid ""
"Error occurred while calling netconfig.\n"
"Error: "
@@ -2563,72 +2554,72 @@
"Erro:"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
msgid "Saving DNS Server Configuration"
msgstr "Salvando a configuração do servidor DNS"
#. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
msgid "Save configuration files"
msgstr "Salvar arquivos de configuração"
#. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
msgid "Restart the DNS daemon"
msgstr "Reiniciar o daemon DNS"
#. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
msgid "Update zone files"
msgstr "Atualizar arquivos de zonas"
#. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
msgid "Adjust the DNS service"
msgstr "Ajustar serviço DNS"
#. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
msgid "Call netconfig"
msgstr "Iniciar o netconfig"
#. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
msgid "Write the firewall settings"
msgstr "Salvar as configurações do firewall"
#. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
msgid "Saving configuration files..."
msgstr "Salvando arquivos de configuração..."
#. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
msgid "Restarting the DNS daemon..."
msgstr "Reiniciando o daemon DNS..."
#. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
msgid "Updating zone files..."
msgstr "Atualizando os arquivos de zonas..."
#. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
msgid "Adjusting the DNS service..."
msgstr "Ajustando o serviço DNS..."
#. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
msgid "Calling netconfig..."
msgstr "Iniciando o netconfig..."
#. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
msgid "Writing the firewall settings..."
msgstr "Salvando as configurações do firewall..."
#. Cannot start service 'named', because of error that follows Error:. Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
msgid ""
"Error occurred while starting service named.\n"
"\n"
@@ -2637,43 +2628,43 @@
"\n"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
msgid "Stub"
msgstr "Stub"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
msgid "Hint"
msgstr "Dica"
#. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
msgid "The DNS server starts when booting the system."
msgstr "O servidor DNS inicia no boot do sistema."
#. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
msgid "The DNS server does not start when booting the system."
msgstr "O servidor DNS não inicia no boot do sistema."
#. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
#, perl-format
msgid "Configured Zones: %s"
msgstr "Zonas configuradas: %s"
#. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "Configuração LDAP inválida. Não foi possível usar o LDAP."
#. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
msgid "Enable LDAP support?"
msgstr "Habilitar suporte LDAP?"
#. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
msgid ""
"Installation of required packages failed.\n"
"LDAP support will not be active."
@@ -2682,30 +2673,33 @@
"O suporte ao LDAP não estará ativo."
#. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
msgid "Unknown LDAP initialization error."
msgstr "Erro desconhecido de inicialização do LDAP."
#. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
msgid "Error occurred while creating %1."
msgstr "Ocorreu erro ao criar %1."
#. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
msgstr "Ocorreu erro durante criação de cn=defaultDNS,%1. O LDAP não será usado."
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
msgid "Error occurred while updating %1."
msgstr "Ocorreu erro ao atualizar %1."
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
msgid "Error occurred while creating %1. Not using LDAP."
msgstr "Ocorreu erro ao criar %1. O LDAP não será usado."
+#~ msgid "Ad&vanced"
+#~ msgstr "A&vançado"
+
#~ msgid "When &Booting"
#~ msgstr "Ao &inicializar"
Modified: trunk/yast/pt_BR/po/docker.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/docker.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/docker.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:48UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -21,6 +21,118 @@
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Lokalize 2.0\n"
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid "&Kill Container"
+msgid "Changes in Container"
+msgstr "&Matar o container"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "Status"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+msgid "&Exit"
+msgstr "&Sair"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid "&Stop Container"
+msgid "Commit Container"
+msgstr "&Parar o container"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+msgid "Repository"
+msgstr "Repositório"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+#, fuzzy
+#| msgid "Tab"
+msgid "Tag"
+msgstr "Tab"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Terminals"
+msgid "Inject Shell"
+msgstr "Terminais"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
#. 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."
@@ -84,16 +196,6 @@
msgid "Running Docker Containers"
msgstr "Executando o teste de conexão com a Internet"
-#: src/lib/ydocker/main_dialog.rb:217
-msgid "Repository"
-msgstr "Repositório"
-
-#: src/lib/ydocker/main_dialog.rb:218
-#, fuzzy
-#| msgid "Tab"
-msgid "Tag"
-msgstr "Tab"
-
#: src/lib/ydocker/main_dialog.rb:219
msgid "Image ID"
msgstr "ID da imagem"
@@ -114,15 +216,11 @@
msgid "Image"
msgstr "Imagem"
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
msgid "Command"
msgstr "Comando"
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "Status"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
msgid "Ports"
msgstr "Portas"
@@ -162,10 +260,63 @@
msgid "&Commit"
msgstr "Comentário"
-#: src/lib/ydocker/main_dialog.rb:304
-msgid "&Exit"
-msgstr "&Sair"
-
#: src/lib/ydocker/main_dialog.rb:315
msgid "Do you really want to delete image \"%s\"?"
msgstr "Deseja realmente remover a imagem \"%s\"?"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid " Container"
+msgid "Run Container"
+msgstr " Container"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid " Container"
+msgid "Container"
+msgstr " Container"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""
Modified: trunk/yast/pt_BR/po/drbd.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/drbd.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/drbd.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: drbd\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-08-20 09:07-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -230,7 +230,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>Configuração de recurso do DRBD</big></b></p>"
@@ -247,11 +247,12 @@
msgid ""
"\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>\"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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. 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"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
"\n"
@@ -263,7 +264,7 @@
"\t\t<p>\"Meta-disco\": interno. Isso significa que a última parte do dispositivo de backup é utilizada para armazenar os meta-dados.</p>\n"
"\t\t"
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -289,13 +290,13 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:112
+#: src/include/drbd/helps.rb:113
#, fuzzy
#| msgid "<p><b><big>s390 reIPL Configuration</big></b></p>"
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr "<p><b><big>Configuração do reipl s390</big></b></p>"
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -304,20 +305,22 @@
"\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"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
"\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
+"\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>Configuração global do DRBD</big></b></p>"
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr "<p>Selecione <b>\"Desabilitar verificação do IP\"</b> para desabilitar uma das verificações de integridade do drbdadm</p>"
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
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"
@@ -333,7 +336,7 @@
" O diálogo irá exibir a contagem a cada 'atualização de diálogo' segundos.\n"
" Defina-o para 0 a fim de desabilitar a atualização completamente. </p>"
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -348,7 +351,7 @@
" de dispositivos configurados neste arquivo. </p>"
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
"Configure drbd here.<br></p>\n"
@@ -357,7 +360,7 @@
"Configure aqui o DRBD.<br></p>\n"
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Choose an drbd from the list of detected drbds.\n"
@@ -369,7 +372,7 @@
"detectado, use <b>Outro (não detectado)</b>. Após, clique <b>Configurar</b>.</p>\n"
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
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"
@@ -380,7 +383,7 @@
"no qual você pode alterar a configuração.</p>\n"
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
"Obtain an overview of installed drbds. Additionally\n"
@@ -391,7 +394,7 @@
"edite suas configurações.<br></p>\n"
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Press <b>Add</b> to configure a drbd.</p>"
@@ -400,7 +403,7 @@
"Pressione <b>Adicionar</b> para configurar um drbd.</p>"
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"Choose a drbd to change or remove.\n"
@@ -411,7 +414,7 @@
"clique em <b>Editar</b> ou <b>Remover</b> conforme desejado.</p>\n"
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -423,7 +426,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -434,7 +437,7 @@
"</p>"
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -445,58 +448,138 @@
"<br></p>\n"
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
#, fuzzy
#| msgid "Configuration of DRBD"
msgid "LVM Filter Configuration of DRBD"
msgstr "Configuração do DRBD"
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
#, fuzzy
#| msgid "Device type"
msgid "Device Filter"
msgstr "Tipo de dispositivo"
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
#, fuzzy
#| msgid "Writing the SCPM database..."
msgid "Writing the LVM cache"
msgstr "Salvando o banco de dados do SCPM..."
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
#, fuzzy
#| msgid "Enable Microphone."
msgid "Enable LVM Cache"
msgstr "Habilitar o microfone."
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning! Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning! Should not use lvmetad for cluster."
+msgstr ""
+
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:144
msgid "Resource Name"
msgstr "Nome do recurso"
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:151
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:156
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:188
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:336
msgid "Protocol"
msgstr "Protocolo"
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
-msgid "Node names must be different."
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:560
+msgid "OK"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:561
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:575
+#, fuzzy
+#| msgid "Node names must be different."
+msgid "Node name can not be empty."
msgstr "Os nomes de nós devem ser diferentes."
-#: src/include/drbd/resource_conf.rb:578
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:719
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:739
msgid "Please fill out all fields."
msgstr "Por favor, preencha todos os campos."
+#: src/include/drbd/resource_conf.rb:754
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:789
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:795
+#, fuzzy
+#| msgid "Node names must be different."
+msgid "Node name must be different."
+msgstr "Os nomes de nós devem ser diferentes."
+
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar <mlazar(a)suse.cz>
@@ -602,77 +685,77 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:114
#, fuzzy
msgid "Failed to merge separated DRBD conf files\n"
msgstr "Falha ao combinar arquivos de configuração diferentes para DRBD\n"
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:136
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr "Falha ao escrever drbd.conf.YaST2prepare"
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:191
msgid "Initializing DRBD Configuration"
msgstr "Inicializando a configuração do DRBD"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:199
msgid "Read global settings"
msgstr "Ler as configurações globais"
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:200
msgid "Read resources"
msgstr "Ler recursos"
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:201
#, fuzzy
#| msgid "Read configurations"
msgid "Read LVM configurations"
msgstr "Ler as configurações"
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:202
msgid "Read daemon status"
msgstr "Ler o status do daemon"
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
#, fuzzy
#| msgid "Read Firewall Settings."
msgid "Read SuSEFirewall Settings"
msgstr "Ler as configurações do firewall"
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:206
msgid "Reading global settings..."
msgstr "Lendo as configurações globais..."
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:207
msgid "Reading resources..."
msgstr "Lendo recursos..."
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:208
#, fuzzy
#| msgid "Reading the configurations..."
msgid "Reading LVM configurations..."
msgstr "Lendo as configurações..."
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:209
msgid "Reading daemon status..."
msgstr "Lendo o status do daemon..."
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
msgid "Finished"
msgstr "Concluído"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:514
msgid "Failed to backup drbd.conf"
msgstr "Falha ao realizar backup do drbd.conf"
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:523
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr "Falha ao limpar drbd.conf para drbdadm test"
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:547
msgid ""
"Invalid configuration of resource %1\n"
"%2"
@@ -680,12 +763,12 @@
"Configuração inválida do recurso %1\n"
"%2"
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:566
msgid "Failed to bring drbd.conf back"
msgstr "Falha ao recuperar drdb.conf"
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:637
msgid "Writing DRBD Configuration"
msgstr "Salvando a configuração do DRBD"
@@ -693,55 +776,55 @@
#. 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:617
+#: src/modules/Drbd.rb:649
msgid "Write global settings"
msgstr "Salvar as configurações globais"
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:650
msgid "Write resources"
msgstr "Salvar recursos"
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:651
#, fuzzy
#| msgid "Write configuration"
msgid "Write LVM configurations"
msgstr "Salvar a configuração"
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:652
msgid "Set daemon status"
msgstr "Definir o status do daemon"
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:653
#, fuzzy
#| msgid "Write the firewall settings"
msgid "Write the SuSEfirewall settings"
msgstr "Salvar as configurações do firewall"
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:656
msgid "Writing global settings..."
msgstr "Salvando as configurações globais..."
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:657
msgid "Writing resources..."
msgstr "Salvando recursos..."
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:658
#, fuzzy
#| msgid "Writing configuration..."
msgid "Writing LVM configurations..."
msgstr "Salvando a configuração..."
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:659
msgid "Setting daemon status..."
msgstr "Definindo o status do daemon..."
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:660
#, fuzzy
#| msgid "Writing the firewall settings..."
msgid "Writing the SuSEFirewall settings"
msgstr "Salvando as configurações do firewall..."
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:671
msgid "Failed to make directory /etc/drbd.d"
msgstr "Falha ao criar diretório /etc/drbd.d"
Modified: trunk/yast/pt_BR/po/fcoe-client.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/fcoe-client.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/fcoe-client.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-06-11 14:06-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -534,33 +534,33 @@
msgstr "<p>Instalá-lo agora?</p>"
#. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
msgid "Cannot start service 'lldpad'"
msgstr "Não foi possível iniciar o serviço 'lldpad'"
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
msgid "Cannot start service 'fcoe'"
msgstr "Não foi possível iniciar o serviço 'fcoe'"
#. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
msgid "Cannot start lldpad systemd socket"
msgstr "Não foi possível iniciar o socket lldpad systemd"
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
msgid "Cannot start lldpad service."
msgstr "Não foi possível iniciar o serviço lldpad."
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
msgid "Cannot start fcoemon systemd socket."
msgstr "Não foi possível iniciar o socket fcoemon systemd."
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
msgid "Cannot start fcoe service."
msgstr "Não foi possível iniciar o serviço fcoe."
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -571,112 +571,112 @@
"VLAN FCoE para obter uma configuração válida."
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
msgid "Initializing fcoe-client Configuration"
msgstr "Inicializando a configuração do fcoe-client"
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
msgid "Check installed packages"
msgstr "Verificar pacotes instalados"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
msgid "Check services"
msgstr "Verificar serviços"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
msgid "Detect network cards"
msgstr "Detectar as placas de rede..."
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
msgid "Read /etc/fcoe/config"
msgstr "Ler /etc/fcoe/config"
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
msgid "Checking for installed packages..."
msgstr "Verificando pelos pacotes instalados..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
msgid "Checking for services..."
msgstr "Verificando por serviços..."
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
msgid "Detecting network cards..."
msgstr "Detectando as placas de rede..."
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
msgid "Reading /etc/fcoe/config"
msgstr "Lendo /etc/fcoe/config"
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
msgid "Finished"
msgstr "Concluído"
#. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
msgid "Starting of services failed."
msgstr "Falha ao iniciar os serviços."
#. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
msgid "Cannot detect devices."
msgstr "Não foi possível detectar os dispositivos."
#. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
msgid "Cannot read /etc/fcoe/config."
msgstr "Não foi possível ler /etc/fcoe/config."
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
msgid "Saving fcoe-client Configuration"
msgstr "Salvando a configuração do fcoe-client"
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
msgid "Write the settings"
msgstr "Salvar as configurações"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
msgid "Restart FCoE service"
msgstr "Reiniciar os serviços FCoE"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
msgid "Adjust start of services"
msgstr "Ajustando a inicialização dos serviços"
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
msgid "Writing the settings..."
msgstr "Salvando as configurações..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
msgid "Restarting FCoE service..."
msgstr "Reiniciando o serviço FCoE..."
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
msgid "Adjusting start of services..."
msgstr "Ajustando a inicialização dos serviços..."
#. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
msgid "Cannot write settings to /etc/fcoe/config."
msgstr "Não foi possível gravar as configurações em /etc/fcoe/config."
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
@@ -685,43 +685,43 @@
"Para detalhes veja /var/log/YaST2/y2log"
#. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
msgid "Restarting of service fcoe failed."
msgstr "Falha ao iniciar os serviços."
#. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr "Não foi possível gravar em /etc/sysconfig/network/ifcfg-files"
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
msgid "<b>General FCoE configuration</b>"
msgstr "<b>Configuração global do FCoE</b>"
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
msgid "<b>Interfaces</b>"
msgstr "<b>Interfaces</b>"
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
msgid "<i>Netcard</i>:"
msgstr "<i>Placa de rede</i>:"
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
msgid "<b>Starting of services</b>"
msgstr "<b>Inicialização dos serviços</b>"
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
msgid "enabled"
msgstr "habilitado"
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
msgid "disabled"
msgstr "desabilitado"
Modified: trunk/yast/pt_BR/po/firewall.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/firewall.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/firewall.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-09-05 09:07-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -26,6 +26,16 @@
"X-Poedit-Country: BRAZIL\n"
"X-Poedit-SourceCharset: utf-8\n"
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
#. TRANSLATORS: message popup
#: src/clients/firewall_proposal.rb:113
msgid ""
@@ -186,7 +196,7 @@
#. TRANSLATORS: tree menu item
#: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
#: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
msgid "Logging Level"
msgstr "Nível de log"
@@ -707,7 +717,7 @@
#: src/include/firewall/subdialogs.rb:349
#: src/include/firewall/subdialogs.rb:509
#: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
msgid "Source Network"
msgstr "Rede de origem"
@@ -718,8 +728,8 @@
#: src/include/firewall/subdialogs.rb:351
#: src/include/firewall/subdialogs.rb:511
#: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
msgid "Protocol"
msgstr "Protocolo"
@@ -773,28 +783,28 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
msgid "Req. IP"
msgstr "IP solicitado"
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
msgid "Req. Port"
msgstr "Porta requisitada"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
msgid "Redir. to IP"
msgstr "Redirecionar para IP"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
msgid "Redir. to Port"
msgstr "Redirecionar para porta"
@@ -914,10 +924,10 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
msgid "Zone"
msgstr "Zona"
@@ -1417,217 +1427,219 @@
msgstr "Selecione um item para remover."
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
msgid "Firewall configuration"
msgstr "Configuração do firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
msgid "Start-up settings"
msgstr "Configurações de inicialização"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
msgid "Known firewall zones"
msgstr "Zonas do firewall conhecidas"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
msgid "Network interfaces configuration"
msgstr "Configuração das interfaces de rede"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
msgid "Allowed services, ports, and protocols"
msgstr "Serviços permitidos, portas e protocolos"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
msgid "Broadcast packet settings"
msgstr "Configurações do pacote de broadcast"
#. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
msgid "Masquerading settings"
msgstr "Configurações de mascaramento"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
msgid "Redirect requests to masqueraded IP"
msgstr "Redirecionar solicitações para IP mascarado"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
msgid "Logging settings"
msgstr "Configurações do log"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
msgid "Firewall configuration summary"
msgstr "Resumo das configurações do firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
msgid "Enables firewall"
msgstr "Habilita o firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
msgid "Disables firewall"
msgstr "Desabilita o firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
msgid "Show current settings"
msgstr "Exibir as configurações atuais"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
msgid "Start firewall in the boot process"
msgstr "Iniciar o firewall durante a inicialização"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
msgid "Start firewall manually"
msgstr "Iniciar o firewall manualmente"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
msgid "List configured entries"
msgstr "Listar as entradas configuradas"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
msgid "Zone short name"
msgstr "Nome curto de zona"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
msgid "Add a new record"
msgstr "Adicionar um novo registro"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
msgid "Remove a record"
msgstr "Remover um registro"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
msgid "Network interface configuration name"
msgstr "Nome da configuração de interface de rede"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
msgid "Logging accepted packets (all|crit|none)"
msgstr "Log de pacotes aceitos (todos|críticos|nenhum)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
msgid "Logging not accepted packets (all|crit|none)"
msgstr "Log de pacotes não aceitos (todos|críticos|nenhum)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
msgid "Logging broadcast packets (yes|no)"
msgstr "Log de pacotes de broadcast (sim|não)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
msgid "Set value"
msgstr "Configurar valor"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
msgid "Port name or number; comma-separate multiple ports"
msgstr "Nome de porta ou número; múltiplas portas separadas por vírgulas"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
msgid "Known firewall service; comma-separate multiple services"
msgstr "Serviço do firewall conhecido; múltiplos serviços separados por vírgula"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
msgid "TCP port name or number; comma-separate multiple ports"
msgstr "Nome de porta TCP ou número; múltiplas portas separadas por vírgula"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
msgid "UDP port name or number; comma-separate multiple ports"
msgstr "Nome de porta UDP ou número; múltiplas portas separadas por vírgulas"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
msgid "RPC port name; comma-separate multiple ports"
msgstr "Nome de porta RPC; múltiplas portas separadas por vírgulas"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
msgid "IP protocol name; comma-separate multiple protocols"
msgstr "Nome de protocolo IP; múltiplos protocolos separados por vírgulas"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
msgid "Set zone protection (yes|no)"
msgstr "Configurar proteção de zona (sim|não)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
msgid "Detailed information"
msgstr "Informação detalhada"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
msgid "Enable option"
msgstr "Opção de habilitar"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
msgid "Disable option"
msgstr "Opção de desabilitar"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
msgstr "Rede de origem, como 0/0 ou 145.12.35.0/255.255.255.0"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
msgid "Protocol (tcp|udp)"
msgstr "Protocolo (tcp|udp)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
msgid "Requested external IP (optional)"
msgstr "IP externo solicitado (opcional)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
msgid "Requested port name or number"
msgstr "Nome de porta solicitada ou número"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
msgid "Redirect to internal IP"
msgstr "Redirecionar para IP interno"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
msgid "Redirect to port on internal IP (optional)"
msgstr "Redirecionar para porta no IP interno (opcional)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
msgid "Record number"
msgstr "Número de registro"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
msgid "Use port names instead of port numbers"
msgstr "Usar nomes de portas ao invés de números de portas"
#. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
msgid "Unknown zone %1."
msgstr "Zona desconhecida %1."
@@ -1640,180 +1652,180 @@
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
msgid "Parameter %1 must be set."
msgstr "O parâmetro %1 deve ser definido."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
msgid "Listing Known Firewall Zones:"
msgstr "Listando as zonas conhecidas do firewall:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
msgid "Shortcut"
msgstr "Atalho"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
msgid "Zone Name"
msgstr "Nome da zona"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
msgid "Summary:"
msgstr "Resumo:"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
msgid "Only one parameter is allowed."
msgstr "Somente um parâmetro é permitido."
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
msgid "Start-Up:"
msgstr "Inicialização:"
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
msgid "Enabling firewall in the boot process..."
msgstr "Habilitando o firewall durante a inicialização..."
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
msgid "Removing firewall from the boot process..."
msgstr "Removendo o firewall durante a inicialização..."
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
msgid "Firewall is enabled in the boot process"
msgstr "O firewall está habilitado durante a inicialização"
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
msgid "Firewall needs manual starting"
msgstr "O firewall necessita de ativação manual"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
msgid "Network Interfaces in Firewall Zones:"
msgstr "Interfaces de rede em zonas do firewall:"
#. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
msgid "Special firewall string"
msgstr "String especial do firewall"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
msgid "Interface"
msgstr "Interface"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
msgid "Device Name"
msgstr "Nome do dispositivo"
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
msgid "Adding special string %1 into zone %2..."
msgstr "Adicionando a string especial %1 à zona %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
msgid "Adding interface %1 into zone %2..."
msgstr "Adicionando a interface %1 à zona %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
msgid "Removing special string %1 from zone %2..."
msgstr "Removendo a string especial %1 da zona %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
msgid "Removing interface %1 from zone %2..."
msgstr "Removendo a interface %1 da zona %2..."
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
msgid "Log all"
msgstr "Registrar tudo"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
msgid "Log only critical"
msgstr "Registrar apenas críticos"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
msgid "Do not log any"
msgstr "Não registrar nenhum"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
msgid "Global Logging Settings:"
msgstr "Configurações de log globais:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
msgid "Rule Type"
msgstr "Tipo de regra"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
msgid "Value"
msgstr "Valor"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
msgid "Accepted"
msgstr "Aceito"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
msgid "Not accepted"
msgstr "Não aceito"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
msgid "Logging Broadcast Packets:"
msgstr "Log de pacotes de broadcast:"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
msgid "Logging enabled"
msgstr "Log habilitado"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
msgid "Logging disabled"
msgstr "Log desabilitado"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
msgid "Short"
msgstr "Pequeno"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
msgid "Logging Status"
msgstr "Status do log"
@@ -1822,168 +1834,181 @@
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
msgid "Value %1 is not allowed for option %2."
msgstr "O valor %1 não é permitido para a opção %2."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
msgid "Allowed Broadcast Ports:"
msgstr "Portas de broadcast permitidas:"
#. TRANSLATORS: CommandLine header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
msgid "Port"
msgstr "Porta"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
msgid "Only one action command is allowed here."
msgstr "Somente um comando de ação é permitido aqui."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
msgid "Defined Firewall Services:"
msgstr "Serviços do firewall definidos:"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
msgid "ID"
msgstr "ID"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
msgid "Service Name"
msgstr "Nome do serviço"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
msgid "TCP port"
msgstr "Porta TCP"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
msgid "UDP port"
msgstr "Porta UDP"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
msgid "RPC port"
msgstr "Porta RPC"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
msgid "IP protocol"
msgstr "Protocolo IP"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
msgid "Allowed Services in Zones:"
msgstr "Serviços permitidos nas zonas:"
#. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
msgid "All services"
msgstr "Todos os serviços"
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
msgid "Entire zone unprotected"
msgstr "Zona inteira desprotegida"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
msgid "Service ID"
msgstr "ID do serviço"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
msgid "Additional Allowed Ports:"
msgstr "Portas adicionais permitidas:"
#. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
msgid "All ports"
msgstr "Todas as portas"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
msgid "Allowed Additional IP Protocols in Zones:"
msgstr "Protocolos IP adicionais permitidos nas zonas:"
#. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
msgid "All IP protocols"
msgstr "Todos os protocolos IP"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
msgid "IP Protocol"
msgstr "Protocolo IP"
#. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
msgid "Unknown service %1."
msgstr "Serviço desconhecido %1."
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
msgid "Protection can only be set for internal zones."
msgstr "A proteção só pode ser configurada para zonas internas."
#. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
msgid "At least one of %1 must be set."
msgstr "Pelo menos uma das opções (%1) deve ser definida."
#. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
msgid "At least one action command from %1 must be set."
msgstr "Pelo menos um comando de ação de %1 deve ser definido."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
msgid "Redirect Requests to Masqueraded IP:"
msgstr "Redirecionar solicitações para IP mascarado:"
#. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
msgid "Unknown port name %1."
msgstr "Nome de porta desconhecido %1."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
msgid "Masquerading Settings:"
msgstr "Configurações de mascaramento:"
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
#. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
msgstr "O mascaramento está %1"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
msgid "enabled"
msgstr "habilitado"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
msgid "disabled"
msgstr "desabilitado"
Modified: trunk/yast/pt_BR/po/firstboot.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/firstboot.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/firstboot.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-04-20 22:17-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -125,13 +125,13 @@
msgstr "Rótulo"
#: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "Status"
+
+#: src/clients/firstboot_config.rb:68
msgid "Module Name"
msgstr "Nome do módulo"
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "Status"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
@@ -303,7 +303,7 @@
"</p>\n"
#. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
msgid "There is not enough space to install all additional packages."
msgstr "Não existe espaço suficiente para instalar todos os pacotes adicionais."
Modified: trunk/yast/pt_BR/po/fonts.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/fonts.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/fonts.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:49UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -24,63 +24,63 @@
#. 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
+#: src/lib/fonts/fonts-config-state.rb:59
#, fuzzy
#| msgid "Bitmap Editors"
msgid "Bitmap Fonts"
msgstr "Editores bitmap"
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
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
+#: src/lib/fonts/fonts-config-state.rb:107
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
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
+#: src/lib/fonts/fonts-config-state.rb:127
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
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
+#: src/lib/fonts/fonts-config-state.rb:147
msgid "Default"
msgstr "Padrão"
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
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
+#: src/lib/fonts/fonts-config-state.rb:167
#, fuzzy
#| msgid "Fonts"
msgid "CFF Fonts"
msgstr "Fontes"
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
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
+#: src/lib/fonts/fonts-config-state.rb:210
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
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
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: trunk/yast/pt_BR/po/geo-cluster.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/geo-cluster.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/geo-cluster.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:49UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -64,10 +64,8 @@
#.
#. $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:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
msgid "Geo Cluster Configuration"
msgstr "Configuração do Geo Cluster"
@@ -121,17 +119,17 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:819
msgid "Add"
msgstr "Adicionar"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:820
msgid "Edit"
msgstr "Editar"
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:821
msgid "Delete"
msgstr "Remover"
@@ -139,27 +137,26 @@
msgid "site"
msgstr "site"
-#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
msgid "ticket"
msgstr "ticket"
#: src/include/geo-cluster/dialogs.rb:106
#, fuzzy
#| msgid "Authentication"
-msgid "Authentification"
+msgid "Authentication"
msgstr "Autenticação"
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
msgid "Ca&ncel"
msgstr "Ca&ncelar"
#. 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
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
msgid "OK"
msgstr "OK"
@@ -172,193 +169,196 @@
#: src/include/geo-cluster/dialogs.rb:128
#, fuzzy
#| msgid "Authentication Key"
-msgid "Authentification file"
+msgid "Authentication file"
msgstr "Chave de autenticação"
#: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:146
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:151
#, fuzzy
#| msgid "Authentication Key"
-msgid "Generate Authentification Key File"
+msgid "Generate Authentication Key File"
msgstr "Chave de autenticação"
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:159
#, fuzzy
#| msgid "&Basics"
msgid "Basic"
msgstr "&Básico"
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
msgid "Cancel"
msgstr "Cancelar"
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
#, fuzzy
#| msgid "Please enter a password"
msgid "Please enter a valid ip address"
msgstr "Por favor, digite uma senha"
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
msgid "timeout"
msgstr "tempo de espera"
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
msgid "retries"
msgstr "tentativas"
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
msgid "weights"
msgstr "pesos"
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
#, fuzzy
#| msgid "Expired"
msgid "expire"
msgstr "Expirar"
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
#, fuzzy
#| msgid "Required patterns"
msgid "acquire-after"
msgstr "Padrões obrigatórios"
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
#, fuzzy
#| msgid "' is not valid."
msgid "timeout is invalid"
msgstr "' não é válido."
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
#, fuzzy
#| msgid "' is not valid."
msgid "expire is invalid"
msgstr "' não é válido."
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
#, fuzzy
#| msgid "URL entered is not valid"
msgid "acquireafter is invalid"
msgstr "O URL informado não é válido."
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
#, fuzzy
#| msgid "URL entered is not valid"
msgid "retries is invalid"
msgstr "O URL informado não é válido."
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
#, fuzzy
#| msgid "' is not valid."
msgid "weights is invalid"
msgstr "' não é válido."
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
#, fuzzy
#| msgid "Port field cannot be empty"
msgid "ticket can not be empty"
msgstr "O campo da porta não pode estar vazio"
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407
-#: src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr "Configuração do firewall"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:569
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Enter an IP address of your arbitrator"
msgstr "Endereço IP &Local da sua máquina"
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:580
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Edit IP address of your arbitrator"
msgstr "Endereço IP &Local da sua máquina"
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:596
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Enter an IP address of your site"
msgstr "Endereço IP &Local da sua máquina"
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:607
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Edit IP address of your site"
msgstr "Endereço IP &Local da sua máquina"
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:629
#, fuzzy
#| msgid "The target already exists"
msgid "Ticket name already exist!"
msgstr "O destino já existe"
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:661
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be empty."
msgstr "O nome da configuração não pode estar vazio."
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:664
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be duplicated."
msgstr "O nome da configuração não pode estar vazio."
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:672
#, fuzzy
#| msgid "Key is invalid."
msgid "port is invalid!"
msgstr "A chave é inválida."
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:678
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:684
#, fuzzy
#| msgid "Software to be installed:"
msgid "arbitrator have to be filled!"
msgstr "Softwares a serem instalados:"
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:689
#, fuzzy
#| msgid "Software to be installed:"
msgid "site have to be filled!"
msgstr "Softwares a serem instalados:"
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:694
#, fuzzy
#| msgid "Software to be installed:"
msgid "ticket have to be filled!"
@@ -366,20 +366,24 @@
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
+#: src/include/geo-cluster/dialogs.rb:748
#, fuzzy
#| msgid "Failed to create the installation RAM disk."
-msgid "Failed to create authentification file "
+msgid "Failed to create authentication file "
msgstr "Falha ao criar o disco RAM de instalação."
-#: src/include/geo-cluster/dialogs.rb:736
+#: src/include/geo-cluster/dialogs.rb:751
#, fuzzy
-#| msgid "Set the authentication for proxy"
-msgid "Succeed to created authentification file "
-msgstr "Configurar a autenticação do proxy"
+#| msgid "Authentication Key"
+msgid "Authentication file "
+msgstr "Chave de autenticação"
+#: src/include/geo-cluster/dialogs.rb:751
+msgid " created successfully."
+msgstr ""
+
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:810
#, fuzzy
#| msgid "Host Configuration Summary:"
msgid "GeoCluster Configuration Select"
@@ -387,7 +391,7 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:816
#, fuzzy
#| msgid "Read configuration file"
msgid "Choose configuration file:"
@@ -396,7 +400,7 @@
#: src/include/geo-cluster/wizards.rb:47
#, fuzzy
#| msgid "Autoinstallation - Configuration"
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
msgstr "Instalação automática - configuração"
#. Initialization dialog contents
@@ -559,6 +563,11 @@
msgstr "Resumo da configuração..."
#, fuzzy
+#~| msgid "Set the authentication for proxy"
+#~ msgid "Succeed to created authentification file "
+#~ msgstr "Configurar a autenticação do proxy"
+
+#, fuzzy
#~| msgid "Software to be installed:"
#~ msgid "site have to be filled"
#~ msgstr "Softwares a serem instalados:"
Modified: trunk/yast/pt_BR/po/installation.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/installation.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/installation.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: installation.pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:50UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -49,7 +49,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
msgid "Initializing..."
msgstr "Inicializando..."
@@ -126,29 +126,29 @@
"serão um pouco diferentes daquelas do manual.\n"
#. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
msgid "Start service %1"
msgstr "Iniciar o serviço %1"
#. TRANSLATORS: progress stage, %1 stands for service name
#. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
#: src/lib/installation/clients/inst_restore_settings.rb:47
msgid "Starting service %1..."
msgstr "Iniciando o serviço %1..."
#. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
msgid "Adjusting Network Settings"
msgstr "Ajustando as configurações de rede"
#. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
msgid "Network settings are being adjusted."
msgstr "As configurações de rede estão sendo ajustadas."
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
msgid ""
"The previous installation has failed.\n"
"Would you like it to continue?\n"
@@ -161,7 +161,7 @@
"Nota: poderá ser preciso digitar algumas informações novamente."
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
msgid ""
"The previous installation has been aborted.\n"
"Would you like it to continue?\n"
@@ -176,7 +176,7 @@
#. popup headline (#x1)
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
#: src/lib/installation/clients/inst_doit.rb:60
msgid "Starting Installation..."
msgstr "Iniciando a instalação..."
@@ -219,28 +219,28 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:133
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>Volte e verifique as configurações se você não tem certeza.</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
+#: src/lib/installation/proposal_runner.rb:121
msgid "Confirm Update"
msgstr "Confirmar a atualização"
#. 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
+#: src/lib/installation/proposal_runner.rb:125
msgid "<p>Information required to perform an update is now complete.</p>"
msgstr "<p>Todas as informações necessárias para fazer a atualização estão completas.</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
+#: src/lib/installation/proposal_runner.rb:127
msgid ""
"\n"
"<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -253,7 +253,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:136
msgid "Start &Update"
msgstr "Iniciar a at&ualização"
@@ -290,51 +290,7 @@
msgstr "Colocando os dispositivos na lista negra..."
#. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr "Gerando o perfil AutoYaST se necessário..."
-
-#. TRANSLATORS: help text
-#: src/lib/installation/clients/clone_proposal.rb:39
-msgid ""
-"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"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 <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-"<p>Use <b>Clonar configuração do sistema</b> se você quiser criar um perfil do AutoYaST.\n"
-"O AutoYaST é um modo de fazer uma instalação completa do openSUSE sem a interação do\n"
-"usuário. O AutoYaST necessita de um perfil para saber como o sistema instalado deverá parecer.\n"
-"Se esta opção for selecionada, será armazenado um perfil do sistema atual em <tt>/root/autoinst.xml</tt>.</p>"
-
-#: src/lib/installation/clients/clone_proposal.rb:60
-msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
-msgstr "Gravar o perfil do AutoYaST em /root/autoinst.xmlat no final da instalação?"
-
-#. this is a heading
-#: src/lib/installation/clients/clone_proposal.rb:71
-msgid "Clone System Configuration"
-msgstr "Clonar configuração do sistema"
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-msgid "&Clone System Configuration"
-msgstr "&Clonar configuração do sistema"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
-msgstr "O perfil do AutoYaST será gravado em /root/autoinst.xml (<a href=\"%1\">não gravá-lo</a>)."
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
-msgstr "O perfil do AutoYaST não será salvo (<a href=\"%1\">gravá-lo</a>)."
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:83
msgid "Copying files to installed system..."
msgstr "Copiando os arquivos para o sistema instalado..."
@@ -532,7 +488,7 @@
msgstr "Atualizações para %1 %2"
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:321
msgid "Unknown Product"
msgstr "Produto desconhecido"
@@ -561,52 +517,26 @@
"Defina se deseja executar uma atualização online agora.\n"
"Você pode ignorar esta etapa e executar uma atualização online depois.\n"
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
msgid "Language, Keyboard and License Agreement"
msgstr "Idioma, teclado e contrato de licença"
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: 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 "&Idioma"
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:319
+msgid "Re&lease Notes..."
+msgstr "Notas de &lançamento..."
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "Layout de &teclado"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
-msgid "I &Agree to the License Terms."
-msgstr "Eu &aceito os termos da licença."
-
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
-msgid "K&eyboard Test"
-msgstr "&Teste de teclado"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "Contrato de licença"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-msgid "License &Translations..."
-msgstr "&Traduções da licença..."
-
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -620,7 +550,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -633,7 +563,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -644,7 +574,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -657,7 +587,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
msgid ""
"<p>\n"
"Select <b>Abort</b> to abort the\n"
@@ -669,22 +599,55 @@
"a instalação a qualquer momento.\n"
"</p>\n"
-#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: 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
-msgid "Re&lease Notes..."
-msgstr "Notas de &lançamento..."
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
+msgid "License Agreement"
+msgstr "Contrato de licença"
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:429
+msgid "&Language"
+msgstr "&Idioma"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
+msgid "&Keyboard Layout"
+msgstr "Layout de &teclado"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
+msgid "I &Agree to the License Terms."
+msgstr "Eu &aceito os termos da licença."
+
+#. Report error about missing license acceptance
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
msgid "You must accept the license to install this product"
msgstr "Você deve aceitar a licença para instalar este produto"
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "Verificando o sistema instalado..."
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
+msgid "K&eyboard Test"
+msgstr "&Teste de teclado"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
+msgid "License &Translations..."
+msgstr "&Traduções da licença..."
+
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
msgid "&Disable ZMD Service"
@@ -787,7 +750,7 @@
msgstr "O pacote autoyast2 não está instalado. A clonagem está desabilitada."
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
msgid "The system will reboot now..."
msgstr "O sistema vai reiniciar agora..."
@@ -796,16 +759,16 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
#: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
msgid "Deploying Images..."
msgstr "Implantando as imagens..."
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:168
msgid ""
"Deploying images has failed.\n"
"Aborting the installation...\n"
@@ -814,7 +777,7 @@
"Cancelando a instalação...\n"
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:200
msgid ""
"Debugging has been turned on.\n"
"YaST will open a software manager for you to check the current status of packages."
@@ -823,20 +786,20 @@
"O YaST abrirá um gerenciador de software para que você verifique o status atual dos pacotes."
#. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:376
msgid "Downloading image at speed %1/s"
msgstr "Baixando a imagem na velocidade de %1/s"
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:381
msgid "Downloading image %1 at speed %2/s"
msgstr "Baixando a imagem %1 na velocidade de %2/s"
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:441
msgid "Deploying image..."
msgstr "Implantando a imagem..."
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:444
msgid "Deploying image %1..."
msgstr "Implantando a imagem %1..."
@@ -853,42 +816,45 @@
msgid "&Disk to Use"
msgstr "&Disco a usar"
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
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 "Selecione o disco no qual a imagem será implantada. Todos os dados no disco serão perdidos e o disco será particionado como definido na imagem."
-#: src/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
msgid "Hard Disk for Image Deployment"
msgstr "Disco rígido para implantação de imagem"
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
msgid "Detecting Available Controllers"
msgstr "Detectando os controladores disponíveis"
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
msgid "Disk Activation"
msgstr "Ativação do disco"
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
msgid "Configure &DASD Disks"
msgstr "Configurar os discos &DASD"
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
msgid "Configure &ZFCP Disks"
msgstr "Configurar os discos &ZFCP"
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
msgid "Configure &FCoE Interfaces"
msgstr "Configurar Interfaces &FCoE"
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
msgid "Configure &iSCSI Disks"
msgstr "Configurar os discos &iSCSI"
-#: src/lib/installation/clients/inst_disks_activate.rb:111
-msgid "Change Net&work Configuration"
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
+#, fuzzy
+#| msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
msgstr "Alterar a configuração da &rede"
#. TRANSLATORS: dialog caption
@@ -907,7 +873,7 @@
#. bug #302384
#: 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
+#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "Inicializando"
@@ -932,71 +898,74 @@
msgid "Show &package updates"
msgstr "Exibir atualizações de &pacotes"
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+msgid "Calling step %1..."
+msgstr "Chamando o passo %1..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr " * %1"
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "Erro na instalação"
+
#. Adjust a SlideShow dialog if not configured
#. kilobytes
#. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
msgid "Finishing Basic Installation"
msgstr "Concluindo a instalação básica"
#. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
msgid "Creating list of finish scripts to call..."
msgstr "Criando a lista de scripts de finalização a serem chamados..."
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "Concluído"
+
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:456
msgid "Copy files to installed system"
msgstr "Copiar os arquivos para o sistema instalado"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:463
msgid "Save configuration"
msgstr "Salvar a configuração"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:470
msgid "Save installation settings"
msgstr "Salvar as configurações da instalação"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:479
msgid "Install boot manager"
msgstr "Instalar o carregador de inicialização"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:486
msgid "Prepare system for initial boot"
msgstr "Preparar o sistema para a inicialização inicial"
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
msgid "Checking stage: %1..."
msgstr "Verificando o estágio: %1..."
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
-msgid "Calling step %1..."
-msgstr "Chamando o passo %1..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
-msgid " * %1"
-msgstr " * %1"
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
-msgid "Finished"
-msgstr "Concluído"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
-msgid "Installation Error"
-msgstr "Erro na instalação"
-
#. Button to accept a license agreement
#: src/lib/installation/clients/inst_info.rb:63
msgid "I &Agree"
@@ -1018,27 +987,27 @@
msgstr "Preparando a configuração inicial do sistema..."
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
msgid "Installation Options"
msgstr "Opções de instalação"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
msgid "&Add Online Repositories Before Installation"
msgstr "&Adicionar repositórios online antes da instalação"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
msgid "In&clude Add-on Products from Separate Media"
msgstr "In&cluir produtos complementares de outra mídia"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
msgid "<p><big><b>Installation Options</b></big></p>"
msgstr "<p><big><b>Opções de instalação</b></big></p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1049,7 +1018,7 @@
"<b>Adicionar repositórios online antes da instalação</b>.</p>"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
msgid ""
"<p>\n"
"To install an add-on product from separate media together with &product;, select\n"
@@ -1060,7 +1029,7 @@
" <b>In&cluir Produtos Acessórios de Outra Mídia</b>.</p>\n"
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr "<p>Se você precisa de drivers de hardware específicos para instalação, veja o site <i>http://drivers.suse.com</i>.</p>"
@@ -1187,7 +1156,7 @@
#. Use 'zero' if image installation is not used
#. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
msgid "Installing Packages..."
msgstr "Instalando os pacotes..."
@@ -1221,7 +1190,7 @@
"das novas funções e alterações.</p>\n"
#. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
msgid "<p>No release notes have been installed.</p>"
msgstr "<p>Nenhuma nota de lançamento foi instalada.</p>"
@@ -1246,88 +1215,88 @@
#. This dialog in not interactive
#. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
msgid "Analyzing the Computer"
msgstr "Analisando o computador"
#. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
msgid "Probe USB devices"
msgstr "Testar os dispositivos USB"
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
msgid "Probing USB devices..."
msgstr "Testando os dispositivos USB..."
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
msgid "Probe FireWire devices"
msgstr "Testar os dispositivos FireWire"
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
msgid "Probing FireWire devices..."
msgstr "Testando os dispositivos FireWire..."
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
msgid "Probe floppy disk devices"
msgstr "Testar os dispositivos de disquete"
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
msgid "Probing floppy disk devices..."
msgstr "Testando os dispositivos de disquete..."
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
msgid "Probe hard disk controllers"
msgstr "Testar os controladores de disco rígido"
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
msgid "Probing hard disk controllers..."
msgstr "Testando os controladores de disco rígido..."
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
msgid "Load kernel modules for hard disk controllers"
msgstr "Carregar os módulos do kernel para os controladores de disco rígido"
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
msgid "Loading kernel modules for hard disk controllers..."
msgstr "Carregando os módulos do kernel para os controladores de disco rígido..."
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
msgid "Probe hard disks"
msgstr "Testar os discos rígidos"
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
msgid "Probing hard disks..."
msgstr "Testando os discos rígidos..."
#. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
msgid "Search for system files"
msgstr "Procurar por sistema de arquivos"
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
msgid "Searching for system files..."
msgstr "Procurando por sistemas de arquivos..."
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
msgid "Initialize software manager"
msgstr "Inicializar o gerenciador de software"
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
msgid "Initializing software manager..."
msgstr "Inicializando o gerenciador de software..."
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
msgid "System Probing"
msgstr "Testando o sistema"
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
msgid "YaST is probing computer hardware and installed systems now."
msgstr "O YaST está testando o hardware do computador e dos sistemas instalados."
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:257
msgid ""
"\n"
"Check 'drivers.suse.com' if you need specific hardware drivers for installation."
@@ -1336,7 +1305,7 @@
"Verifique 'drivers.suse.com' se você precisa de drivers de hardware específicos para a instalação."
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:271
msgid ""
"No hard disks were found for the installation.\n"
"Please check your hardware!\n"
@@ -1346,7 +1315,7 @@
"Por favor verifique seu hardware!\n"
"%1\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:281
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1357,7 +1326,7 @@
"(especialmente em sistemas S/390 ou iSCSI)\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:292
msgid ""
"No hard disks and no hard disk controllers were\n"
"found for the installation.\n"
@@ -1370,7 +1339,7 @@
"%1\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:337
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
@@ -1378,6 +1347,52 @@
"Falha ao inicializar os repositórios de software.\n"
"Cancelando a instalação."
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:187
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:193
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:265
+msgid ""
+"Downloading the optional installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
+msgstr ""
+
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
msgid "Removed"
@@ -1431,8 +1446,8 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
msgid "&Change..."
msgstr "A<erar..."
@@ -1648,7 +1663,7 @@
"configuração básica do sistema.</p>\n"
#. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
msgid "No workflow defined for this kind of installation."
msgstr "Nenhum fluxo de trabalho definido para este modo de instalação."
@@ -1668,7 +1683,7 @@
msgstr "Configurando o cache do Linker..."
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
msgid "Saving network configuration..."
msgstr "Salvando a configuração da rede..."
@@ -1722,6 +1737,26 @@
msgid "Saving hardware configuration..."
msgstr "Salvando a configuração do hardware..."
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+#| msgid "Clone System Configuration"
+msgid "Import SSH Host Keys and Configuration"
+msgstr "Clonar configuração do sistema"
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+#| msgid "&Clone System Configuration"
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "&Clonar configuração do sistema"
+
#. progress step title
#: src/lib/installation/clients/ssh_settings_finish.rb:64
msgid "Copying SSH settings to installed system..."
@@ -1789,39 +1824,56 @@
msgid "Copying log files to installed system..."
msgstr "Copiando os arquivos de log para o sistema instalado..."
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "Dispositivo"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Export Configuration"
+msgid "Import SSH Configuration"
+msgstr "&Exportar configuração"
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
msgstr "Diminuindo a partição PREP..."
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
msgid "Really reset everything to default values?"
msgstr "Realmente restaurar tudo para os valores padrões?"
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
msgid "You will lose all changes."
msgstr "Você perderá todas as alterações."
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-msgid "Location of Stored Configuration"
-msgstr "Localização da configuração armazenada"
-
-#. 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 "Falha ao armazenar a configuração. Os detalhes podem ser vistos no log."
-
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
msgid "Skipping configuration upon user request"
msgstr "Ignorando a configuração a pedido do usuário"
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
@@ -1830,25 +1882,25 @@
"resolvido antes de continuar.\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
msgid "Adapting the proposal to the current settings..."
msgstr "Adaptando a proposta às configurações atuais..."
#. 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
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
msgid "Analyzing your system..."
msgstr "Analisando o seu sistema..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
msgid "ERROR: No proposal"
msgstr "ERRO: sem proposta"
#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1861,42 +1913,36 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
msgid "&Skip Configuration"
msgstr "&Ignorar a configuração"
#. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
msgid "&Use Following Configuration"
msgstr "&Usar a seguinte configuração"
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-msgid "&Export Configuration"
-msgstr "&Exportar configuração"
-
#. 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
+#: src/lib/installation/proposal_runner.rb:693
msgid "Click a headline to make changes or use the \"Change...\" menu below."
msgstr "Clique em qualquer título para alterá-lo ou use o menu \"Alterar...\" abaixo."
-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
msgid "Click a headline to make changes."
msgstr "Clique no título para alterá-lo."
#. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
msgid "&Reset to defaults"
msgstr "&Restaurar para o padrão"
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Update"
msgstr "At&ualizar"
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Install"
msgstr "&Instalar"
@@ -1931,7 +1977,7 @@
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
msgid ""
"<p>\n"
"Select <b>Install</b> to perform a new installation with the values displayed.\n"
@@ -1944,7 +1990,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:434
msgid ""
"<p>\n"
"Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1956,7 +2002,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:443
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1968,7 +2014,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:451
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -1980,7 +2026,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -1991,12 +2037,12 @@
"</p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr "<P><B>Proposta de instalação UML</B></P>"
#. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -2007,7 +2053,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:482
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2024,6 +2070,11 @@
msgid "Enabling remote administration..."
msgstr "Habilitando a administração remota..."
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:79
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
#. Writes configuration
#.
#. It creates a snapshot when no second stage is required and
@@ -2031,19 +2082,111 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
msgid "Creating root filesystem snapshot..."
msgstr "Criando o snapshot do sistema de arquivo raiz..."
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+msgid "No previous Linux installation found"
+msgstr ""
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. 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/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. 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/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+#| msgid "Unknown Product"
+msgid "Unknown protocol %1."
+msgstr "Produto desconhecido"
+
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
msgid "Failed to read information about installation images"
msgstr "Falha ao ler as informações sobre as imagens de instalação"
#. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
msgid "Deploying..."
msgstr "Implantando..."
@@ -2051,19 +2194,19 @@
#.
#. @see #all_supported_types
#. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
msgid "Storing user preferences..."
msgstr "Armazenando as preferências do usuário..."
#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
#.
#. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
msgid "Restoring user preferences..."
msgstr "Restaurando as preferências do usuário..."
#. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
msgid ""
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
@@ -2071,6 +2214,35 @@
"A instalação não conseguiu resolver as dependências de pacote automaticamente.\n"
"O gerenciador de software será aberto para que você as resolva manualmente."
+#~ msgid "Generating AutoYaST profile if needed..."
+#~ msgstr "Gerando o perfil AutoYaST se necessário..."
+
+#~ msgid ""
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "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 <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgstr ""
+#~ "<p>Use <b>Clonar configuração do sistema</b> se você quiser criar um perfil do AutoYaST.\n"
+#~ "O AutoYaST é um modo de fazer uma instalação completa do openSUSE sem a interação do\n"
+#~ "usuário. O AutoYaST necessita de um perfil para saber como o sistema instalado deverá parecer.\n"
+#~ "Se esta opção for selecionada, será armazenado um perfil do sistema atual em <tt>/root/autoinst.xml</tt>.</p>"
+
+#~ msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
+#~ msgstr "Gravar o perfil do AutoYaST em /root/autoinst.xmlat no final da instalação?"
+
+#~ msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
+#~ msgstr "O perfil do AutoYaST será gravado em /root/autoinst.xml (<a href=\"%1\">não gravá-lo</a>)."
+
+#~ msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
+#~ msgstr "O perfil do AutoYaST não será salvo (<a href=\"%1\">gravá-lo</a>)."
+
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "Localização da configuração armazenada"
+
+#~ msgid "Failed to store configuration. Details can be found in log."
+#~ msgstr "Falha ao armazenar a configuração. Os detalhes podem ser vistos no log."
+
#~ msgid "ERROR: Missing Title"
#~ msgstr "ERRO: título não encontrado"
@@ -2197,9 +2369,6 @@
#~ msgid "Network Card"
#~ msgstr "Placa de rede"
-#~ msgid "Device"
-#~ msgstr "Dispositivo"
-
#~ msgid "Hardware Information of the Selected Network Card"
#~ msgstr "Informação de hardware da placa de rede selecionada"
Modified: trunk/yast/pt_BR/po/iscsi-client.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/iscsi-client.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/iscsi-client.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: iscsi-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:50UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -117,7 +117,6 @@
msgid "Add"
msgstr "Adicionar"
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
#: src/include/iscsi-client/dialogs.rb:160
msgid "Edit"
msgstr "Editar"
@@ -175,47 +174,64 @@
msgid "Startup"
msgstr "Inicialização"
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "Manualmente"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr "Endereço IP"
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
msgid "Port"
msgstr "Porta"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Key"
msgstr "Chave"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Value"
msgstr "Valor"
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
msgid "Service"
msgstr "Serviço"
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
msgid "Connected Targets"
msgstr "Destinos conectados"
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
msgid "Discovered Targets"
msgstr "Destinos descobertos"
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
msgid "iSCSI Initiator Overview"
msgstr "Resumo do iniciador iSCSI"
#. discovery new target
#. 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/dialogs.rb:407
#: 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>"
@@ -224,9 +240,9 @@
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
msgid "iSCSI Initiator Discovery"
msgstr "Descoberta do iniciador iSCSI"
@@ -454,29 +470,27 @@
msgid "Error occurred while logging out from the selected target."
msgstr "Erro ao efetuar logoff do destino selecionado."
-#. toggle all 3 possible values (bnc#457252)
#: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
msgid "No record found."
msgstr "Nenhum registro encontrado."
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
msgid "No valid IP address"
msgstr "Nenhum endereço IP válido"
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
msgid "Port field cannot be empty"
msgstr "O campo da porta não pode estar vazio"
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:393
#, fuzzy
#| msgid "Initiator Name"
msgid "Incorrect Initiator Name"
msgstr "Nome do iniciador"
-#: src/include/iscsi-client/widgets.rb:429
+#: src/include/iscsi-client/widgets.rb:394
#, fuzzy
#| msgid ""
#| "Incorrect InitiatorName.\n"
@@ -505,13 +519,18 @@
"Exemplo:\n"
"iqn.2007-04.cz.server:storage.disk.sdb\n"
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
msgid "Insert the IP address."
msgstr "Digite o endereço IP."
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
#. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:596
msgid "Insert the port."
msgstr "Digite a porta."
@@ -519,36 +538,36 @@
#. ******************* 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:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
msgid "True"
msgstr "Verdadeiro"
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
msgid "False"
msgstr "Falso"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr "O destino com este TargetName já está conectado. Verifique se o recurso de caminhos múltiplos está habilitado para evitar a corrupção dos dados."
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Continue"
msgstr "Continuar"
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
msgid "Cancel"
msgstr "Cancelar"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:869
msgid "The target is already connected."
msgstr "O destino já está conectado."
@@ -637,7 +656,7 @@
msgstr "todos"
#. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:730
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -648,15 +667,16 @@
"O nome antigo do iniciador será substituído pelo valor em iBFT e será criado um backup.\n"
"Se desejar usar um nome de iniciador diferente, você poderá alterá-lo na BIOS.\n"
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
#, fuzzy
#| msgid "Image creation failed."
msgid "Target connection failed.\n"
msgstr "Falha na criação da imagem."
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1208
msgid "Configuration summary..."
msgstr "Resumo da configuração..."
Modified: trunk/yast/pt_BR/po/iscsi-lio-server.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/iscsi-lio-server.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/iscsi-lio-server.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-10-30 10:49-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -42,15 +42,14 @@
msgstr "Serviço"
#. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73
-#: src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
msgid "Global"
msgstr "Global"
#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#: src/modules/IscsiLioServer.rb:443
msgid "Targets"
msgstr "Destinos"
@@ -67,7 +66,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
msgid "Portal group"
msgstr "Grupo de portal"
@@ -88,7 +87,7 @@
msgstr "Utilizar autenticação"
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
msgid "LUN"
msgstr "LUN"
@@ -101,153 +100,163 @@
msgstr "Caminho"
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/widgets.rb:453
msgid "Add"
msgstr "Adicionar"
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
msgid "Edit"
msgstr "Editar"
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
+#: src/include/iscsi-lio-server/widgets.rb:454
msgid "Delete"
msgstr "Remover"
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Client"
-msgstr "Cliente"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
+msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+#, fuzzy
+#| msgid "Lun Mapping"
+msgid "LUN Mapping"
msgstr "Mapeamentos Lun"
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
msgid "Auth"
msgstr "Autenticação"
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
msgid "Edit LUN"
msgstr "Editar LUN"
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
msgid "Edit Auth"
msgstr "Editar autenticação"
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
msgid "Copy"
msgstr "Copiar"
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "Sem autenticação"
-#: src/include/iscsi-lio-server/dialogs.rb:225
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/widgets.rb:229
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "Autenticação recebida"
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:721
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
msgid "Username"
msgstr "Nome de usuário"
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:722
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
msgid "Password"
msgstr "Senha"
-#: src/include/iscsi-lio-server/dialogs.rb:248
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/widgets.rb:242
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "Autenticação enviada"
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
msgid "When &Booting"
msgstr "Ao &inicializar"
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
msgid "&Manually"
msgstr "&Manualmente"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "Ao inicializar"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "Manualmente"
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Key"
msgstr "Chave"
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Value"
msgstr "Valor"
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
msgid "iSCSI LIO Target Overview"
msgstr "Resumo do destino do iSCSI LIO"
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
msgid "<h1>iSCSI Target</h1>"
msgstr "<h1>Destino do iSCSI</h1>"
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
msgid "Add iSCSI Target"
msgstr "Adicionar destino do iSCSI"
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
-msgstr "Alterar configuração do cliente de destino do iSCSI"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+#, fuzzy
+#| msgid "Modify iSCSI Target Lun Setup"
+msgid "Modify iSCSI Target Initiator Setup"
+msgstr "Alterar configuração do Lun de destino do iSCSI"
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
msgid "Modify iSCSI Target Lun Setup"
msgstr "Alterar configuração do Lun de destino do iSCSI"
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
msgid "iSCSI Target Expert Settings"
msgstr "Configurações avançadas de destino do iSCSI"
@@ -405,19 +414,30 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+#, fuzzy
+#| msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
msgstr "<p>Utilize <b>Adicionar</b> para conceder acesso a um cliente vindo de um LUN importado de um grupo de portal de destino. Especifique quais clientes podem acessá-lo (o nome do cliente é <i>InitiatorName</i> em '/etc/iscsi/initiatorname.iscsi' no inicializador iscsi). <b>Remover</b> removerá o acesso do cliente ao LUN.</p>"
#: src/include/iscsi-lio-server/helps.rb:130
-msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+#, fuzzy
+#| msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+msgid ""
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgstr "<p>É possível alterar os LUNs acessíveis ao cliente com <b>Editar LUN</b>. Por favor, observe que o número do LUN de destino deve ser único. Após pressionar <b>Editar autenticação</b>, selecione o tipo da autenticação. Utilize <b>Recebido</b>, <b>Enviado</b> ou ambos. Depois informe o <b>Usuário</b> e a <b>Senha</b>. Se <b>Utilizar autenticação</b> estiver desabilitado no diálogo anterior, <b>Editar autenticação</b> estará desabilitado aqui.</p>"
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+#, fuzzy
+#| msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
msgstr "<p><b>Copiar</b> oferece a possibilidade de dar a um cliente adicional acesso ao LUN.</p>"
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
msgid ""
"List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</b>."
@@ -427,12 +447,12 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr "<h1>IP/porta e configuração do LUN do destino do iSCSI</h1>"
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
msgid ""
"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -446,8 +466,8 @@
"O nome deve ser único dentro do grupo de portal de destino. Se o usuário \n"
"não fornecer um nome para o LUN, ele será gerado automaticamente."
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
msgid ""
"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
"and port the service will be available. Default for port number is 3260.\n"
@@ -457,11 +477,11 @@
"e porta o serviço estará disponível. O valor padrão para a porta é 3260.\n"
"É possível utilizar somente endereços atribuídos a uma das placas de rede."
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
msgid "Create a new target. Replace template values with the correct values."
msgstr "Criar novo destino. Substitua os valores do gabarito pelos valores corretos."
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
msgid ""
"It is possible to make arbitary block devices or files available under a lun.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -475,11 +495,11 @@
"O nome deve ser único dentro do grupo de portal de destino. Se o usuário \n"
"não fornecer um nome para o LUN, ele será gerado automaticamente."
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr "É possível <b>adicionar</b>, <b>editar</b> ou <b>remover</b> todas as opções de configuração adicionais."
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
msgid ""
"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
@@ -488,191 +508,217 @@
"Se Tipo=fileio, defina <b>Caminho</b> como o arquivo ou o dispositivo de disco.<b>ID de SCSI</b> e <b>Setores</b> são opcionais."
#. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
msgid "Problem changing authentication"
msgstr "Erro ao alterar autenticação"
#. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
msgid "Invalid Username"
msgstr "Nome de usuário inválido"
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
msgid "Invalid Password."
msgstr "Senha inválida."
-#: src/include/iscsi-lio-server/widgets.rb:251
-msgid "Selected Lun is already in use!"
+#: src/include/iscsi-lio-server/widgets.rb:262
+#, fuzzy
+#| msgid "Selected Lun is already in use!"
+msgid "Selected LUN is already in use!"
msgstr "O Lun selecionado já está em uso!"
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
msgid "Selected Name is already in use!"
msgstr "O nome selecionado já está em uso!"
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected Path must be either block device or normal file!"
msgstr "O caminho selecionado deve ser de um dispositivo em bloco ou de um arquivo normal!"
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
msgid "Selected Path is already in use!"
msgstr "O caminho selecionado já está em uso!"
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
msgid "Path:"
msgstr "Caminho:"
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
msgid "Browse"
msgstr "Navegar"
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
msgid "Select file or device"
msgstr "Selecione o arquivo ou dispositivo"
-#: src/include/iscsi-lio-server/widgets.rb:436
-msgid "Client Lun"
-msgstr "Lun cliente"
+#: src/include/iscsi-lio-server/widgets.rb:447
+msgid "Initiator LUN"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
msgid "Target LUN"
msgstr "LUN de destino"
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
msgid "Change:"
msgstr "Alteração:"
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
msgid "Target LUN %1 used more than once!"
msgstr "O LUN de destino %1 é utilizado mais de uma vez!"
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
msgid "Need to enable at least one Authentification!"
msgstr "Você deve especificar pelo menos um mecanismo de autenticação!"
-#: src/include/iscsi-lio-server/widgets.rb:619
-msgid "Client name:"
-msgstr "Nome do cliente:"
+#: src/include/iscsi-lio-server/widgets.rb:630
+msgid "Initiator name:"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
msgid "Import LUNs from TPG"
msgstr "Importar LUNs do TPG"
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
-msgid "Client name must not be empty!"
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
+#, fuzzy
+#| msgid "Client name must not be empty!"
+msgid "Initiator name must not be empty!"
msgstr "O nome do cliente não deve estar vazio!"
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. 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:701
-msgid "Client name already exists!"
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
+#, fuzzy
+#| msgid "Client name already exists!"
+msgid "Initiator name already exists!"
msgstr "O nome do cliente já existe!"
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
-msgid "New client name:"
+#: src/include/iscsi-lio-server/widgets.rb:689
+#, fuzzy
+#| msgid "New client name:"
+msgid "New initiator name:"
msgstr "Nome do novo cliente:"
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
msgid "OK"
msgstr "OK"
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
msgid "Cancel"
msgstr "Cancelar"
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:796
+#, fuzzy
+#| msgid "Disabled"
+msgid "Enabled"
+msgstr "Desabilitado"
+
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
+msgid "Disabled"
+msgstr "Desabilitado"
+
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
msgid "Really delete the selected item?"
msgstr "Realmente remover o item selecionado?"
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1015
msgid "Problem creating target %1 with tpg %2"
msgstr "Erro ao criar destino %1 com tpg %2"
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1037
msgid "Problem setting network portal to %1"
msgstr "Erro ao configurar portal de rede para %1"
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1058
msgid "Problem removing lun %1"
msgstr "Erro ao remover lun %1"
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1083
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr "Erro ao configurar lun %1 (name: %2) para o caminho %3"
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1097
msgid "Problem setting auth on %1:%2 to %3"
msgstr "Erro ao configurar a autenticação em %1:%2 para %3"
#. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1198
+#: src/include/iscsi-lio-server/widgets.rb:1211
msgid "The target cannot be empty."
msgstr "O destino não pode estar vazio."
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1215
msgid "The target portal group cannot be empty."
msgstr "O grupo de portal de destino não pode estar vazio."
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1226
msgid "The target already exists."
msgstr "O destino já existe."
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1246
msgid "Incoming"
msgstr "Recebido"
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1249
msgid "Outgoing"
msgstr "Enviado"
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1251
msgid "None"
msgstr "Nenhum"
-#: 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 "Desabilitado"
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1463
msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator 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?"
+"Really want to continue without initiator access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1477
+#, fuzzy
+#| msgid "Problem removing lun %4 for client %3 in %1:%2"
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr "Erro ao remover lun %4 para cliente %3 em %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1492
+#, fuzzy
+#| msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr "Erro ao adicionar lun %4:%5 para cliente %3 em %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1513
+#, fuzzy
+#| msgid "Problem removing client %3 from %1:%2"
+msgid "Problem removing initiator %3 from %1:%2"
msgstr "Erro ao remover cliente %3 de %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1524
-msgid "Problem creating client %3 for %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1537
+#, fuzzy
+#| msgid "Problem creating client %3 for %1:%2"
+msgid "Problem creating initiator %3 for %1:%2"
msgstr "Erro ao criar cliente %3 para %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1572
+#, fuzzy
+#| msgid "Problem changing auth for client %3 in %1:%2"
+msgid "Problem changing auth for initiator %3 in %1:%2"
msgstr "Erro ao alterar autenticação para cliente %3 em %1:%2"
#. Initialization dialog caption
@@ -686,11 +732,11 @@
msgstr "Inicializando..."
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save lio setup"
msgstr "Não foi possível salvar a configuração do lio"
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
msgid "Cannot save tcm setup"
msgstr "Não foi possível salvar a configuração do tcm"
@@ -791,6 +837,18 @@
msgid "Configuration summary..."
msgstr "Resumo da configuração..."
+#~ msgid "Client"
+#~ msgstr "Cliente"
+
+#~ msgid "Modify iSCSI Target Client Setup"
+#~ msgstr "Alterar configuração do cliente de destino do iSCSI"
+
+#~ msgid "Client Lun"
+#~ msgstr "Lun cliente"
+
+#~ msgid "Client name:"
+#~ msgstr "Nome do cliente:"
+
#~ msgid "Write the settings"
#~ msgstr "Salvar as configurações"
Modified: trunk/yast/pt_BR/po/kdump.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/kdump.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/kdump.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: kdump\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:53UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -374,10 +374,8 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
msgid "To apply changes a reboot is necessary."
msgstr "Para aplicar estas alterações é necessário reiniciar."
@@ -1216,154 +1214,169 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
#, fuzzy
#| msgid "Kernel option includes several ranges. Rewrite it?"
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr "A opção do kernel inclui vários intervalos. Reescrevê-la?"
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
msgid "Use &Firmware-Assisted Dump"
msgstr ""
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:511
msgid "Initializing kdump Configuration"
msgstr "Inicializando a configuração do kdump"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
msgid "Reading the config file..."
msgstr "Lendo o arquivo de configuração..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:522
msgid "Reading kernel boot options..."
msgstr "Lendo opções de inicialização do kernel..."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:524
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:530
msgid "Reading partitions of disks..."
msgstr "Lendo particionamento..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:532
#, fuzzy
#| msgid "Reading available memory..."
msgid "Reading available memory and calibrating usage..."
msgstr "Lendo memória disponível..."
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:544
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "Não foi possível ler o arquivo '/etc/sysconfig/kdump'."
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:552
msgid "Cannot read kernel boot options."
msgstr "Não foi possível ler as configurações de inicialização do kernel."
#. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:560
msgid "Cannot read available memory."
msgstr "Não foi possível ler memória disponível."
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:586
msgid "Saving kdump Configuration"
msgstr "Salvando a configuração do kdump"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:615
msgid "Write the settings"
msgstr "Salvar as configurações"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:617
msgid "Update boot options"
msgstr "Atualizar as opções de inicialização"
#. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:621
msgid "Writing the settings..."
msgstr "Salvando as configurações..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:623
msgid "Updating boot options..."
msgstr "Atualizando as opções de inicialização..."
#. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:625
msgid "Finished"
msgstr "Concluído"
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:635
msgid "Cannot write settings."
msgstr "Não foi possível salvar as configurações."
#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:644
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "Falha ao adicionar o parâmetro crashkernel ao carregador de inicialização"
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:764
msgid "Kdump status: %1"
msgstr "Status do kdump: %1"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "enabled"
msgstr "habilitado"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "disabled"
msgstr "desabilitado"
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:772
#, fuzzy
#| msgid "Value of crashkernel option: %1"
msgid "Value(s) of crashkernel option: %1"
msgstr "Valor para a opção crashkernel: %1."
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:779
msgid "Dump format: %1"
msgstr "Formato do dump: %1"
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:786
msgid "Target of dumps: %1"
msgstr "Destino dos dumps: %1"
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:793
msgid "Number of dumps: %1"
msgstr "Número de 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:879
+#: src/modules/Kdump.rb:885
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:974
+#: src/modules/Kdump.rb:972
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/pt_BR/po/live-installer.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/live-installer.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/live-installer.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: live-installer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-04-26 13:54-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -47,27 +47,27 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
msgid "Evaluating filesystems to copy..."
msgstr "Avaliando o sistema de arquivos a copiar..."
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
msgid "Copying root filesystem..."
msgstr "Copiando o sistema de arquivos raiz..."
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
msgid "Copying live image..."
msgstr "Copiando a imagem do live..."
#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
msgid "Copying %1..."
msgstr "Copiando %1..."
#. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -82,71 +82,53 @@
"partição maior para a instalação do sistema."
#. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
msgid "Copying the live image to hard disk failed."
msgstr "Falha ao copiar a imagem do LiveCD para o disco rígido"
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
msgid "Installation Settings"
msgstr "Configurações da instalação"
#. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
msgid "Analyzing the system..."
msgstr "Analisando o sistema..."
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
msgid "Use %1%% of disk %2 for Linux"
msgstr "Use %1%% do disco %2 para o Linux"
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
msgid "Do not use disk %1"
msgstr "Não use o disco %1"
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
msgid "Partitioning"
msgstr "Particionamento"
#. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-msgid "System start-up"
-msgstr "Inicialização do sistema"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr "Perguntar se o Linux ou outro sistema existente deve ser inicializado"
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr "Iniciar somente o Linux"
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr "Tempo de espera para o início do sistema: %1 segundos"
-
-#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
msgid "Keyboard"
msgstr "Teclado"
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
msgid "Time Zone"
msgstr "Fuso horário"
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
msgid "Change Installation Settings"
msgstr "Alterar as configurações da instalação"
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
msgid ""
"<p>\n"
"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
@@ -155,7 +137,7 @@
"Use <b>Aceitar</b> para fazer uma nova instalação com os valores exibidos.</p>"
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
msgid ""
"<p>\n"
"To change the values, click the respective headline\n"
@@ -166,7 +148,7 @@
"ou selecione <b>Alterar as configurações da instalação</b>.</p>\n"
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
msgid ""
"<p>\n"
"Your hard disk has not been modified, you can still safely abort.\n"
@@ -281,7 +263,7 @@
"o botão 'Reset' para reiniciá-lo."
#. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
msgid "Copying files to installed system..."
msgstr "Copiando os arquivos para o sistema instalado..."
@@ -305,6 +287,18 @@
msgid "Saving time zone..."
msgstr "Salvando o fuso horário..."
+#~ msgid "System start-up"
+#~ msgstr "Inicialização do sistema"
+
+#~ msgid "Ask whether to boot Linux or existing system"
+#~ msgstr "Perguntar se o Linux ou outro sistema existente deve ser inicializado"
+
+#~ msgid "Boot only Linux"
+#~ msgstr "Iniciar somente o Linux"
+
+#~ msgid "System start time-out: %1 seconds"
+#~ msgstr "Tempo de espera para o início do sistema: %1 segundos"
+
#~ msgid "Installation settings"
#~ msgstr "Configurações da instalação"
Modified: trunk/yast/pt_BR/po/mail.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/mail.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/mail.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: mail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-10-30 10:49-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -318,69 +318,76 @@
#. Translators: dialog caption
#. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
msgid "Outgoing Mail"
msgstr "Saída de e-mails"
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+#, fuzzy
+#| msgid "You cannot define local domains for the mail server."
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr "Você não pode definir domínios locais para o servidor de e-mail."
+
#. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
msgid "TLS encryption"
msgstr "Criptografia TLS"
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
msgid "No"
msgstr "Não"
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
msgid "Use"
msgstr "Usar"
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
msgid "Enforce"
msgstr "Forçar"
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
msgid "&Masquerading"
msgstr "&Mascaramento"
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
msgid "&Authentication"
msgstr "&Autenticação"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
msgid "Incoming Mail"
msgstr "Entrada de e-mail"
#. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
msgid "&Details..."
msgstr "&Detalhes..."
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
msgid "Start &fetchmail"
msgstr "Iniciar o &fetchmail"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
msgid "manual"
msgstr "manual"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
msgid "daemon"
msgstr "daemon"
#. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
msgid "&Downloading"
msgstr "&Baixando"
#. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
msgid "&Aliases..."
msgstr "&Apelidos..."
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
msgid "&Virtual domains..."
msgstr "Domínios &virtuais..."
@@ -388,7 +395,7 @@
#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
#. %2: file name (eg. /etc/sysconfig/postfix)
#. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
msgid ""
"To be able to deliver mail to your local MTA,\n"
"the value of %1 in %2 will be set to\n"
@@ -402,7 +409,7 @@
#. correct and complete. The login name may contain only
#. certain characters and must begin with a letter.
#. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
msgid ""
"The user login may contain only\n"
"lower case letters, digits, \"-\" and \"_\"\n"
@@ -415,39 +422,39 @@
"Favor repetir a entrada.\n"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
msgid "Sender address rewriting"
msgstr "Regravação do endereço do remetente"
#. Translators: text entry label
#. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
#: src/include/mail/widgets.rb:269
msgid "&Local user"
msgstr "Usuário &local"
#. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
msgid "&Display as"
msgstr "&Exibir como"
#. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
msgid "The address for this user is already defined."
msgstr "O endereço para este usuário já está definido."
#. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
msgid "The mail address format is incorrect."
msgstr "O endereço de e-mail está incorreto."
#. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
msgid "Masquerading"
msgstr "Mascaramento"
#. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
msgid "Masquerade &local domains"
msgstr "Mascarar domínios &locais"
@@ -457,23 +464,23 @@
#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
#. ),
#. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
msgid "Ma&squerade other domains"
msgstr "Ma&scarar outros domínios"
#. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
msgid "Do&mains to masquerade"
msgstr "Do&mínios a mascarar"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
msgid "Local user"
msgstr "Usuário local"
#. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
msgid "Display as"
msgstr "Exibir como"
@@ -482,23 +489,23 @@
#. ["holly", "jane", "tarzan"])),
#. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly(a)red.dwarf"))
#. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
msgid "A&dd"
msgstr "A&dicionar"
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
msgid "&Edit"
msgstr "&Editar"
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
msgid "Dele&te"
msgstr "Remov&er"
#. Translators: error popup
#. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
msgid "The domain name is incorrect"
msgstr "O nome de domínio está incorreto"
@@ -506,106 +513,106 @@
#. list<string> lmod = [];
#. list<map> mu = Mail::masquerade_users;
#. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
msgid "Outgoing Server Authentication"
msgstr "Autenticação do servidor de saída"
#. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
msgid "Outgoing &Server"
msgstr "&Servidor de saída de e-mails"
#. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
msgid "&User name"
msgstr "Nome de &usuário"
#. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
msgid "&Password"
msgstr "S&enha"
#. Translators: popup dialog heading
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
msgid "Mail downloading"
msgstr "Download de e-mails"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
msgid "Server"
msgstr "Servidor"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
msgid "Protocol"
msgstr "Protocolo"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
msgid "User"
msgstr "Usuário"
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
msgid "De&lete"
msgstr "Remov&er"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
msgid "Incoming mail redirection"
msgstr "Redirecionamento de e-mail recebido"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
msgid "&Alias"
msgstr "&Apelido"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
msgid "&Destinations"
msgstr "&Destinos"
#. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
msgid "The alias format is incorrect."
msgstr "O formato do apelido está incorreto."
#. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
msgid "The destinations for this alias are already defined."
msgstr "Os destinos para este apelido já estão definidos."
#. Translators: dialog caption
#. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
msgid "Aliases"
msgstr "Apelidos"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
msgid "Alias"
msgstr "Apelido"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
msgid "Destinations"
msgstr "Destinos"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
msgid "Virtual domains"
msgstr "Domínios virtuais"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
msgid "Mail configuration"
msgstr "Configuração de e-mail"
#. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
msgid "Initializing..."
msgstr "Inicializando..."
@@ -889,12 +896,12 @@
msgstr "Para o servidor IMAP"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr "AMaViS, um scanner de vírus, será instalado.\n"
#. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
msgid ""
"AMaViS needs a virus scanner such as ClamAV\n"
"to do the actual scanning, but ClamAV was not found.\n"
@@ -905,56 +912,56 @@
"Configure um scanner manualmente."
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr "Fetchmail, um utilitário de download de e-mails, será instalado.\n"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
msgid "Dovecot IMAP server, will be installed.\n"
msgstr "O servidor IMAP Dovecot, será instalado.\n"
#. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
msgid "Initializing mail configuration"
msgstr "Inicializando a configuração de e-mail"
#. Translators: progress label
#. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
msgid "Determining Mail Transport Agent (MTA)"
msgstr "Determinando o Agente de Transporte de Mensagens (MTA)"
#. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
msgid "Reading general settings"
msgstr "Lendo as configurações gerais"
#. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
msgid "Reading masquerading settings"
msgstr "Lendo as configurações de mascaramento"
#. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
msgid "Reading downloading settings"
msgstr "Lendo as configurações de download"
#. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
msgid "Reading alias tables"
msgstr "Lendo a tabela de apelidos"
#. Translators: progress label
#. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
msgid "Reading authentication settings..."
msgstr "Lendo as configurações de autenticação..."
#. Translators: error message,
#. %1 is a file name,
#. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
msgid ""
"Error reading file %1. The file must have\n"
"a fixed format to be readable by YaST. For details, see\n"
@@ -965,161 +972,161 @@
"%2"
#. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
msgid "Error writing the fetchmail configuration."
msgstr "Erro ao salvar a configuração do fetchmail."
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
msgid "Error writing file %1"
msgstr "Erro ao salvar o arquivo %1"
#. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
msgid "Error running config.postfix"
msgstr "Erro ao executar config.postfix"
#. Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
msgid "Error starting service %1."
msgstr "Erro ao iniciar o serviço %1."
#. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
msgid "Writing general settings"
msgstr "Salvando as configurações gerais"
#. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
msgid "Writing masquerading settings"
msgstr "Salvando as configurações de mascaramento"
#. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
msgid "Writing alias tables"
msgstr "Salvando as tabelas de apelidos"
#. Write them unconditionally, because it is now possible to
#. enter them also in the Permanent mode. Bug #17417.
#. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
msgid "Writing downloading settings"
msgstr "Salvando as configurações de download"
#. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
msgid "Writing authentication settings..."
msgstr "Salvando as configurações de autenticação..."
#. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
msgid "Finishing writing configuration files"
msgstr "Concluindo o salvamento dos arquivos de configuração"
#. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
msgid "Running Config Postfix"
msgstr "Executando a configuração do Postfix"
#. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
msgid "Restarting services"
msgstr "Reiniciando os serviços"
#. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
msgid "Saving mail configuration"
msgstr "Salvando a configuração de e-mail"
#. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
msgid "Other"
msgstr "Outro"
#. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
msgid "Permanent"
msgstr "Permanente"
#. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
msgid "Dial-up"
msgstr "Conexão discada"
#. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
msgid "None"
msgstr "Nenhum"
#. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
msgid "MTA"
msgstr "MTA"
#. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
msgid "Connection Type"
msgstr "Tipo de conexão"
#. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
msgid "Outgoing Mail Server"
msgstr "Servidor de saída de e-mail"
#. summary header; the "From: foo(a)bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
msgid "From Header"
msgstr "Cabeçalho de"
#. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
msgid "Local Domains"
msgstr "Domínios locais"
#. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
msgid "Masquerade Other Domains"
msgstr "Mascarar outros domínios"
#. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
msgid "Masquerade Users"
msgstr "Mascarar usuários"
#. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
msgid "Accept remote SMTP connections"
msgstr "Aceitar conexões SMTP remotas"
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
msgid "Yes"
msgstr "Sim"
#. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
msgid "Use AMaViS"
msgstr "Usar AMaViS"
#. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
msgid "Use DKIM"
msgstr "Usar DKIM"
#. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
msgid "Fetchmail"
msgstr "Fetchmail"
#. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
msgid "Virtual Users"
msgstr "Usuários virtuais"
#. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
msgid "Authentication"
msgstr "Autenticação"
@@ -1592,9 +1599,6 @@
#~ "As senhas não são iguais.\n"
#~ "Tente novamente."
-#~ msgid "You cannot define local domains for the mail server."
-#~ msgstr "Você não pode definir domínios locais para o servidor de e-mail."
-
#~ msgid "Defined Domains"
#~ msgstr "Domínios definidos"
Modified: trunk/yast/pt_BR/po/network.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/network.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/network.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:54UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -224,7 +224,7 @@
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
msgid "Host Configuration Summary:"
msgstr "Resumo da configuração da máquina:"
@@ -345,13 +345,13 @@
msgstr "Falha na instalação de notas de lançamento baixadas."
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
msgid "Opening of Connection"
msgstr "Abrindo a conexão"
#. popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
@@ -360,13 +360,13 @@
"os logs para mais detalhes.\n"
#. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
+#: src/clients/inst_do_net_test.rb:870
msgid "No URL for the release notes defined. Internet test cannot be performed."
msgstr "Não existe URL para as notas da versão. O teste de Internet não pode ser executado."
#. popup informing user about the failure to retrieve release notes
#. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
msgid ""
"Download of latest release notes failed due to server-side error. \n"
"This does not necessarily imply a faulty network configuration.\n"
@@ -383,7 +383,7 @@
"clique em 'Cancelar'.\n"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
msgid ""
"Download of latest release notes failed. View\n"
"the logs for details."
@@ -392,12 +392,12 @@
"Veja os logs para mais detalhes."
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
msgid "Check for Patches"
msgstr "Verificar correções"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
@@ -406,7 +406,7 @@
"Veja os logs para mais detalhes.\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
msgid "Closing of Connection"
msgstr "Fechando a conexão"
@@ -496,7 +496,7 @@
#. 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
+#: src/clients/lan_auto.rb:108
msgid "Configuration Error: uninitialized interface."
msgstr "Erro na configuração: interface não inicializada."
@@ -585,7 +585,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
msgid "Routing Configuration"
msgstr "Configuração de roteamento"
@@ -671,7 +671,7 @@
msgstr "Gateway"
#. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
msgid "Netmask"
msgstr "Máscara de rede"
@@ -689,76 +689,76 @@
#. Handler for action "list"
#. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
msgid "No entry for destination '%1' in routing table"
msgstr "Não há entrada para o destino '%1' na tabela de roteamento"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
msgid "%s forwarding is enabled"
msgstr "O encaminhamento %s está habilitado"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
msgid "%s forwarding is disabled"
msgstr "O encaminhamento %s está desabilitado"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
msgid "Enabling %s forwarding..."
msgstr "Habilitando o encaminhamento %s..."
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
msgid "Disabling %s forwarding..."
msgstr "Desabilitando o encaminhamento %s..."
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
msgid "IPv4 Forwarding:"
msgstr "Encaminhamento IPv4:"
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
msgid "IPv6 Forwarding:"
msgstr "Encaminhamento IPv6:"
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
msgid "IPv4 and IPv6 Forwarding:"
msgstr "Encaminhamento IPv4 e IPv6:"
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
msgid "At least destination and gateway IP addresses must be specified."
msgstr "Pelo menos o endereço IP do destino e do gateway devem ser especificados."
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
msgid "Adding '%1' destination to routing table ..."
msgstr "Adicionando o destino '%1' na tabela de roteamento..."
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
msgid "Destination IP address must be specified."
msgstr "O endereço IP de destino deve ser especificado."
-#: src/clients/routing.rb:348
+#: src/clients/routing.rb:349
msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
msgstr "Pelo menos um dos seguintes parâmetros (gateway, máscara de rede, dispositivo, opções) deve ser especificado"
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
msgid "Updating '%1' destination in routing table ..."
msgstr "Atualizando o destino '%1' na tabela de roteamento..."
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
msgid "Deleting '%1' destination from routing table ..."
msgstr "Removendo o destino '%1' da tabela de roteamento..."
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
msgid "Warning: no encryption is used."
msgstr "Aviso: nenhuma criptografia foi usada."
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
msgid "Change."
msgstr "Alterar."
@@ -859,70 +859,70 @@
msgstr "Placa de rede sem fio USB"
#. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
msgid "Unknown Network Device"
msgstr "Dispositivo de rede desconhecido"
#. Modem status (%1 is device)
#. ISDN device status (%1 is device)
#. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
msgid "Configured as %1"
msgstr "Configurado como %1"
#. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
msgid "Configured as %1 with provider %2"
msgstr "Configurado como %1 com o provedor %2"
#. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
msgid "Configured as %1 with provider %2 (protocol %3)"
msgstr "Configurado como %1 com o provedor %2 (protocolo %3)"
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
msgid "Configured without address (NONE)"
msgstr "Configurado sem endereço (NENHUM)"
#. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
msgid "Configured without an address"
msgstr "Configurado sem endereço"
#. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
msgid "Configured with address %1"
msgstr "Configurado com endereço %1"
#. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
msgid "Configured with address %1 (remote %2)"
msgstr "Configurado com endereço %1 (remoto %2)"
#. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
msgid "Configured with %1"
msgstr "Configurado como %1"
#. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
msgid "Configured as %1 with address %2"
msgstr "Configurado como %1 com o endereço %2"
#. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
msgid "Configured as %1 with address %2 (remote %3)"
msgstr "Configurado como %1 com o endereço %2 (remoto %3)"
#. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
msgid "Configured as %1 with %2"
msgstr "Configurado como %1 com %2"
#. Abbreviation for "The interface is Managed by NetworkManager"
#. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
msgid "Managed"
msgstr "Gerenciado"
@@ -1061,27 +1061,27 @@
msgstr "&Selecionar o log:"
#. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
msgid "Additional Addresses"
msgstr "Endereços adicionais"
#. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
msgid "IPv4 Address Label"
msgstr "Rótulo do endereço IPv4"
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "Endereço IP"
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/lan/address.rb:108
+#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "A&dicionar"
@@ -1090,8 +1090,8 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/lan/address.rb:110
+#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1101,156 +1101,156 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/lan/address.rb:112
+#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
msgstr "Remo&ver"
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
msgid "&Name of Interface"
msgstr "&Nome da interface"
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
msgid "<p>TODO kind of vague!</p>"
msgstr "<p>TODO é relativamente vago!</p>"
#. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
msgid "Assign Interface to Firewall &Zone"
msgstr "Atribuir interface para &zonas do firewall"
#. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
msgid "&Mandatory Interface"
msgstr "Interface &obrigatória"
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
#: src/include/network/lan/hardware.rb:351
msgid "&Device Type"
msgstr "Tipo de &dispositivo"
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
#: src/include/network/lan/hardware.rb:337
msgid "&Configuration Name"
msgstr "Nome da &configuração"
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
msgid "Tunnel owner"
msgstr "Proprietário do encapsulamento"
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
msgid "Tunnel group"
msgstr "Grupo de encapsulamento "
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
msgid "Bridged Devices"
msgstr "Dispositivos bridged"
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
msgid "Real Interface for &VLAN"
msgstr "Interface &real para VLAN"
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
msgid "VLAN ID"
msgstr "ID da VLAN"
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
msgid "Bond Slaves and Order"
msgstr "Escravos vinculados e ordem"
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
msgid "Up"
msgstr "Para cima"
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
msgid "Down"
msgstr "Para baixo"
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
msgid "Bond &Slaves"
msgstr "&Escravos vinculados"
#. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
msgid "&Bond Driver Options"
msgstr "&Opções do driver vinculado"
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr "<p>Selecione as opções do driver vinculado e edite-as, se necessário. </p>"
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr "Sem configuração de link e IP (escravos associados)"
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
msgid "Use iBFT Values"
msgstr "Usar valores iBFT"
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
msgid "Dynamic Address"
msgstr "Endereço dinâmico"
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
msgid "DHCP both version 4 and 6"
msgstr "Ambos DHCP versão 4 e 6"
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
msgid "DHCP version 4 only"
msgstr "Apenas DHCP versão 4"
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
msgid "DHCP version 6 only"
msgstr "Apenas DHCP versão 6"
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
msgid "Statically Assigned IP Address"
msgstr "Endereço IP atribuído estaticamente"
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
msgid "&IP Address"
msgstr "Endereço &IP"
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
msgid "&Subnet Mask"
msgstr "Máscara de subrede"
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
msgid "&Hostname"
msgstr "Nome de &máquina"
#. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
msgid "R&emote IP Address"
msgstr "Endereço IP r&emoto"
#. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
msgid "The remote IP address is invalid."
msgstr "O endereço IP remoto é inválido."
#. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
msgid "&S/390"
msgstr "&S/390"
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1030
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1261,13 +1261,13 @@
"você souber que a detecção está errada."
#. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1050
msgid "Configuration %1 already present."
msgstr "A configuração %1 já existe."
#. 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:1062
+#: src/include/network/lan/address.rb:1074
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1281,20 +1281,20 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1094
msgid "No valid IP address."
msgstr "Endereço IP inválido."
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1101
msgid "No valid netmask or prefix length."
msgstr "Máscara de rede ou comprimento do prefixo inválido. "
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1109
msgid "Invalid hostname."
msgstr "Nome de máquina inválido."
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1116
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1309,7 +1309,7 @@
"Realmente deixar o nome de máquina em branco?\n"
#. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1134
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1319,60 +1319,60 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1187
msgid "&General"
msgstr "&Geral"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1198
msgid "Device Activation"
msgstr "Ativação do dispositivo"
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1202
msgid "Firewall Zone"
msgstr "Zona do firewall"
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1207
msgid "Maximum Transfer Unit (MTU)"
msgstr "Unidade máxima de transferência (MTU)"
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1217
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>Defina aqui as configurações detalhadas da placa de rede.</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1284
msgid "&Address"
msgstr "End&ereço"
#. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1287
msgid "<p>Configure your IP address.</p>"
msgstr "<p>Configure o seu endereço IP.</p>"
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1293
msgid "&Hardware"
msgstr "&Hardware"
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1300
msgid "&Bond Slaves"
msgstr "&Escravos vinculados"
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1314
msgid "&Wireless"
msgstr "&Sem fio"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1398
msgid "Ifplugd Priority"
msgstr "Prioridade ifplugd"
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1404
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"
@@ -1387,12 +1387,23 @@
"definir a prioridade de cada interface.</p>\n"
#. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1486
msgid "Network Card Setup"
msgstr "Configuração da placa de rede"
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
msgid ""
"At least one selected device is already configured.\n"
"Adapt the configuration for bridge?\n"
@@ -1588,23 +1599,23 @@
#. @param [Hash{String => String}] options action options
#. Handler for action "edit"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
msgid "Impossible value for bootproto."
msgstr "Valor impossível para o protocolo de inicialização."
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
msgid "Impossible value for startmode."
msgstr "Valor impossível para o modo de inicialização."
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
msgid "For static configuration, the \"ip\" option is needed."
msgstr "Para configuração estática, a opção \"ip\" é necessária."
#. Handler for action "delete"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
msgid "The device was deleted."
msgstr "O dispositivo foi removido."
@@ -1666,7 +1677,7 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
msgid ""
"Firmware is needed. Install it from \n"
"the add-on CD.\n"
@@ -1678,7 +1689,7 @@
"Primeiro, adicione o CD de Complementos aos seus repositórios de software do YaST\n"
"e então volte a este diálogo de configuração.\n"
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
msgid ""
"The device needs a firmware to function properly. Usually, it can be\n"
"downloaded from your driver vendor's Web page. \n"
@@ -1696,20 +1707,20 @@
#. - kernel modules (InstallKernel): before loaded
#. - wlan firmware: here, just because it is copied from modems
#. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
msgid "Installing firmware"
msgstr "Instalando o firmware..."
-#: src/include/network/lan/complex.rb:233
+#: src/include/network/lan/complex.rb:232
msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
msgstr "Para uma instalação de firmware bem-sucedida, o script 'install_bcm43xx_firmware' deve ser executado. Deseja executá-lo agora?"
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
msgid "An error occurred during firmware installation."
msgstr "Ocorreu um erro durante a instalação do firmware."
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -1724,12 +1735,12 @@
"ela não será mais gerenciada pelo NetworkManager.\n"
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:453
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr "O dispositivo selecionado possui STARTMODE=nfsroot. Realmente remover?"
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
msgid "Network Setup Method"
msgstr "Método de configuração da rede"
@@ -1738,7 +1749,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:519
+#: src/include/network/lan/complex.rb:515
msgid "Network Settings"
msgstr "Configurações da rede"
@@ -1924,7 +1935,7 @@
#. Selection box label
#. Selection box title
#: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
msgid "&Network Card"
msgstr "Placa de re&de"
@@ -1934,7 +1945,7 @@
msgstr "P&esquisar"
#. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
msgid ""
"Configuration name %1 already exists.\n"
"Choose a different one."
@@ -1943,7 +1954,7 @@
"Escolha um nome diferente."
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
msgid "S/390 Network Card Configuration"
msgstr "Configuração da placa de rede S/390"
@@ -1951,131 +1962,131 @@
#. Frame label
#. Frame label
#. Frame label
-#: 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
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
msgid "S/390 Device Settings"
msgstr "Configurações do dispositivo S/390"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
msgid "&Port Name"
msgstr "Nome da &porta"
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
msgid "Port Number"
msgstr "Número da porta"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
msgid "&Enable IPA Takeover"
msgstr "Habilitar tak&eover IPA"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
msgid "Enable &Layer 2 Support"
msgstr "Habilitar suporte á &camada 2"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
msgid "Layer2 &MAC Address"
msgstr "Endereço &MAC da camada 2"
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
msgid "Read Channel"
msgstr "Canal de leitura"
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
msgid "Write Channel"
msgstr "Canal de gravação"
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
msgid "Control Channel"
msgstr "Canal de controle"
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr "<p>Informe o <b>Nome da porta</b> para esta interface (diferencia maiúsculas de minúsculas).</p>"
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:950
msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
msgstr "<p>Digite quaisquer <b>Opções</b> adicionais para esta interface (separadas por espaços).</p>"
-#: src/include/network/lan/hardware.rb:954
+#: src/include/network/lan/hardware.rb:953
msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
msgstr "<p>Selecione <b>Habilitar takeover IPA</b> se o endereço IP takeover deve estar habilitado para esta interface.</p>"
-#: src/include/network/lan/hardware.rb:957
+#: src/include/network/lan/hardware.rb:956
msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>Selecione <b>Habilitar suporte à camada 2</b> se esta placa tiver sido configurada com suporte à camada 2.</p>"
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:959
msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>Digite o <b>Endereço MAC da camada 2</b> se esta placa tiver sido configurada com suporte à camada 2.</p>"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
msgid "&Port Number"
msgstr "Número da &porta"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
msgid "&LANCMD Time-Out"
msgstr "Tempo de espera &LANCMD"
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr "<p>Escolha o <b>Número da porta</b> para esta interface.</p>"
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr "<p>Especifique o <b>Tempo de espera LANCMD</b> desta interface.</p>"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
msgid "Compatibility Mode"
msgstr "Modo de compatibilidade"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
msgid "Extended Mode"
msgstr "Modo estendido"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr "tty baseado em CTC (conexões Linux a Linux)"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr "Modo compatibilidade com OS/390 e z/OS"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
msgid "&Protocol"
msgstr "&Protocolo"
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr "<p>Escolha o <b>Protocolo</b> para esta interface.</p>"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
msgid "&Peer Name"
msgstr "Nome do &par"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
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"
@@ -2083,8 +2094,7 @@
"<p>Informe o nome do par IUCV,\n"
"por exemplo, o nome de usuário z/VM com o qual conectar (diferencia maiúsculas de minúsculas).</p>\n"
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
msgid ""
"An error occurred while creating device.\n"
"See YaST log for details."
@@ -2094,7 +2104,7 @@
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
msgid "Hardware Dialog"
msgstr "Diálogo de hardware"
@@ -2741,29 +2751,29 @@
"'wireless' no mesmo diretório para todas as opções disponíveis.</p>"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
msgid "IPv4 &Address Label"
msgstr "&Rótulo do endereço IPv4"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
msgid "Net&mask"
msgstr "&Máscara de rede"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
msgid "Label is too long."
msgstr "O rótulo é muito longo."
#. Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
msgid "The IP address is invalid."
msgstr "O endereço IP é inválido."
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
msgid "The subnet mask is invalid."
msgstr "A máscara de subrede é inválida."
@@ -2943,127 +2953,127 @@
#. Wireless authentication modes:
#. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
msgid "No Encryption"
msgstr "Sem criptografia"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
msgid "WEP - Open"
msgstr "WEP - aberto"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
msgid "WEP - Shared Key"
msgstr "WEP - chave compartilhada"
#. ComboBox item
#. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
msgid "WPA-PSK (WPA version 1 or 2)"
msgstr "WPA-PSK (WPA versão 1 ou 2)"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
msgid "WPA-EAP (WPA version 1 or 2)"
msgstr "WPA-EAP (WPA versão 1 ou 2)"
#. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
msgid "Wireless Network Card Configuration"
msgstr "Configuração da placa de rede sem fio"
#. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
msgid "Wireless Device Settings"
msgstr "Configurações do dispositivo sem fio"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
msgid "O&perating Mode"
msgstr "Modo de o&peração"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
msgid "Ad-Hoc"
msgstr "Ad-hoc"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
msgid "Master"
msgstr "Mestre"
#. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
msgid "Ne&twork Name (ESSID)"
msgstr "Nome da &rede (ESSID)"
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
msgid "Scan Network"
msgstr "Procurar rede"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
msgid "&Authentication Mode"
msgstr "Modo de &autenticação"
#. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
msgid "&Encryption Key"
msgstr "Chav&e de criptografia"
#. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
msgid "E&xpert Settings"
msgstr "Configurações a&vançadas"
#. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
msgid "&WEP Keys"
msgstr "Chaves &WEP"
#. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:558
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr "O modo de autenticação WPA só é possível no modo de operação gerenciado."
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:569
msgid "Specify the network name for this mode."
msgstr "Especifique o nome da rede para esse modo."
#. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:576
msgid "The network name must be shorter than 32 characters."
msgstr "O nome de rede deve ter menos que 32 caracteres."
#. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:596
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "A frase secreta deve ter entre 8 e 63 caracteres (inclusive)."
#. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:607
msgid "The key must have %1 hexadecimal digits."
msgstr "A chave deve ter %1 dígitos hexadecimais."
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:619
+#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "A chave de criptografia é inválida."
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:627
msgid "The encryption key must be specified for this authentication mode."
msgstr "A chave de criptografia deve ser especificada para este modo de autenticação."
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:634
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3161,27 +3171,27 @@
msgstr "&Modo de Pesquisa AP"
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
msgid "Enter Encryption Key"
msgstr "Digite a chave de criptografia"
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
msgid "&Key"
msgstr "&Chave"
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
msgid "Help"
msgstr "Ajuda"
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
msgid "Wireless Keys"
msgstr "Chaves de redes sem fio"
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
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"
@@ -3196,7 +3206,7 @@
"somente uma chave.</p>"
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
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"
@@ -3211,43 +3221,43 @@
"configurar este parâmetro com o valor 64.</p>"
#. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
msgid "WEP Keys"
msgstr "Chaves WEP"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
msgid "&Key Length"
msgstr "Tamanho da c&have"
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
msgid "No."
msgstr "Nº"
#. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
msgid "Key"
msgstr "Chave"
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
msgid "Default"
msgstr "Padrão"
#. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
msgid "&Set as Default"
msgstr "&Definir como padrão"
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1214
msgid "Choose a Certificate"
msgstr "Escolher um certificado"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1257
msgid ""
"Not using a Certificate Authority (CA) certificate can result in connections\n"
"to insecure, rogue wireless networks. Continue without CA ?"
@@ -3256,7 +3266,7 @@
"a redes sem fio inseguras. Continuar sem CA?"
#. error popup text
-#: src/include/network/lan/wireless.rb:1283
+#: src/include/network/lan/wireless.rb:1285
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
@@ -3265,47 +3275,47 @@
"ou o certificado do cliente."
#. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1331
msgid "WPA-EAP"
msgstr "WPA-EAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1353
msgid "Any"
msgstr "Qualquer"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1357
msgid "MD5"
msgstr "MD5"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1359
msgid "GTC"
msgstr "GTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1361
msgid "CHAP"
msgstr "CHAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1363
msgid "PAP"
msgstr "PAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv1"
msgstr "MSCHAPv1"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1369
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1392
msgid "WPA-EAP Details"
msgstr "Detalhes do WPA-EAP"
@@ -3320,24 +3330,44 @@
#. RadioButton label
#: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
msgstr "Permitir &administração remota"
#. RadioButton label
#: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "Permitir &administração remota"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
msgid "&Do Not Allow Remote Administration"
msgstr "Não permitir a&dministração remota"
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Remote Administration Settings</big></b></p>\n"
+#| "<p>If this feature is enabled, you can\n"
+#| "administer this machine remotely from another machine. Use a VNC\n"
+#| "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
+#| "a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
+#| "This form of remote administration is less secure than using SSH.</p>\n"
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
"administer this machine remotely from another machine. Use a VNC\n"
"client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
msgstr ""
"<p><b><big>Configurações da administração remota</big></b></p>\n"
"<p>Se esta propriedade estiver habilitada, você poderá\n"
@@ -3347,17 +3377,17 @@
"Esta forma de administração remota é menos segura do que o SSH.</p>\n"
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
msgid "Remote Administration Settings"
msgstr "Configurações da administração remota"
#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
msgid "These packages need to be installed:"
msgstr "Estes pacotes necessitam ser instalados:"
#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3369,78 +3399,28 @@
"\n"
"Tentar novamente?\n"
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
msgid "Unknown"
msgstr "Desconhecido"
-#. Popup headline
-#: src/include/network/routines.rb:279
-msgid "Configuration Successfully Saved"
-msgstr "A configuração foi salva com sucesso"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "A configuração do DNS foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "A configuração DSL foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "A configuração de máquinas foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "A configuração ISDN foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "A configuração da placa de rede foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "A configuração do modem foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "A configuração do proxy foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "A configuração do provedor foi salva com sucesso."
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "A configuração de roteamento foi salva com sucesso."
-
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "Configurar o e-mail agora?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "Executar a configuração de %1?"
-
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:829
msgid ""
"Network is currently handled by NetworkManager\n"
"or completely disabled. YaST is unable to configure some options."
@@ -3449,33 +3429,33 @@
"ou está completamente desabilitada. O YaST não consegue configurar algumas opções."
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1064
+#: src/include/network/routines.rb:889
msgid "Network Cards"
msgstr "Placas de rede"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:893
msgid "Modems"
msgstr "Modems"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:897
msgid "ISDN Cards"
msgstr "Placas ISDN"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:901
msgid "DSL Devices"
msgstr "Dispositivos DSL"
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:906
msgid "All Network Devices"
msgstr "Todos os dispositivos de rede"
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:387
msgid "The hostname is invalid."
msgstr "O nome de máquina é inválido."
@@ -3547,8 +3527,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
msgid "Hostname and Domain Name"
msgstr "Nome de máquina e nome de domínio"
@@ -3574,28 +3554,28 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
msgstr "Não é recomendado o uso de .local como nome de domínio devido ao DNS multicast. Usá-lo por conta e risco?"
#. Popup::Error text
-#: src/include/network/services/dns.rb:520
+#: src/include/network/services/dns.rb:513
msgid "The search list can have at most %1 domains."
msgstr "A lista de pesquisa pode ter no máximo %1 domínios."
#. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
msgid "The search list can have at most %1 characters."
msgstr "A lista de pesquisa pode ter no máximo %1 caracteres."
#. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
msgid "The search domain '%1' is invalid."
msgstr "O domínio de pesquisa '%1' é inválido."
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
msgid "Hostname and Name Server Configuration"
msgstr "Configuração do nome de máquina e servidor de nome"
@@ -3629,27 +3609,27 @@
"um <b>Apelido de máquina</b> separados por espaços.</p>\n"
#. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
msgid "Current Hosts"
msgstr "Máquinas atuais"
#. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
msgid "Hostnames"
msgstr "Nomes de máquina"
#. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
msgid "Host Aliases"
msgstr "Apelidos de máquina"
#. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:340
msgid "Hos&t Aliases"
msgstr "Apelidos de má&quina"
#. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:403
msgid "Alias name \"%1\" is invalid."
msgstr "O nome de apelido \"%1\" é inválido."
@@ -3685,40 +3665,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
msgid "&Destination"
msgstr "&Destino"
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:171
msgid "Ge&nmask"
msgstr "Ge&nmask"
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:180
msgid "&Gateway"
msgstr "&Gateway"
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:188
msgid "De&vice"
msgstr "Dis&positivo"
#. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:247
msgid "Destination is invalid."
msgstr "O destino é inválido."
#. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:255
msgid "Gateway IP address is invalid."
msgstr "O endereço IP do gateway é inválido."
#. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:263
msgid "Subnetmask is invalid."
msgstr "A máscara de subrede é inválida."
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:422
msgid "The default gateway is invalid."
msgstr "O gateway padrão é inválido."
@@ -3965,35 +3945,35 @@
"para o GNOME).Tenha certeza de que ele está em execução. Caso contrário,\n"
"inicie-o manualmente."
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
msgid "General Network Settings"
msgstr "Configurações gerais da rede "
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
msgid "IPv6 Protocol Settings"
msgstr "Configurações do protocolos IPv6"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
msgid "Enable IPv6"
msgstr "Habilitar o IPv6"
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
msgid "Unknown device"
msgstr "Dispositivo desconhecido"
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
msgid "DHCP address"
msgstr "Endereço DHCP"
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
msgid "No IP address assigned"
msgstr "Nenhum endereço IP atribuído"
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
msgid ""
"%1 \n"
"%2 - %3"
@@ -4002,12 +3982,12 @@
"%2 - %3"
#. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
msgid "&Change Device"
msgstr "&Alterar dispositivo"
#. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
msgid "Network Device Select"
msgstr "Selecionar dispositivo de rede"
@@ -4016,7 +3996,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
msgid "configured"
msgstr "configurado"
@@ -4065,7 +4045,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
msgid "Update configuration"
msgstr "Atualizar a configuração"
@@ -4088,7 +4068,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
msgid "Updating configuration..."
msgstr "Atualizando a configuração..."
@@ -4100,100 +4080,100 @@
msgstr "Atualizando o /etc/resolv.conf..."
#. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
msgid "Hostname: Set by DHCP"
msgstr "Nome de máquina: definido por DHCP"
#. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
msgid "Hostname: %1"
msgstr "Nome de máquina: %1"
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
msgid "Hostname will not be written to /etc/hosts"
msgstr "O nome de máquina não será salvo em /etc/hosts"
#. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
msgid "Name Servers: %1"
msgstr "Servidores de nomes: %1"
#. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
msgid "Search List: %1"
msgstr "Lista de busca: %1"
#. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
msgid "Update /etc/hosts"
msgstr "Atualizar o /etc/hosts"
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
msgid "Saving Hostname Configuration"
msgstr "Salvando a configuração do nome de máquina"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
msgid "Updating /etc/hosts ..."
msgstr "Atualizando o /etc/hosts..."
#. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:276
msgid "Initializing Network Configuration"
msgstr "Inicializando a configuração da rede"
#. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:289
msgid "Detect network devices"
msgstr "Detectar os dispositivos de rede"
#. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:291
msgid "Read driver information"
msgstr "Ler as informações do driver"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:293
msgid "Read device configuration"
msgstr "Ler a configuração do dispositivo"
#. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:295
msgid "Read network configuration"
msgstr "Ler a configuração da rede"
#. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:297
msgid "Read firewall settings"
msgstr "Ler as configurações do firewall"
#. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:299
msgid "Read hostname and DNS configuration"
msgstr "Ler a configuração do nome de máquina e DNS"
#. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:301
msgid "Read installation information"
msgstr "Ler as informações de instalação"
#. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:303
msgid "Read routing configuration"
msgstr "Ler a configuração de roteamento"
#. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:305
msgid "Detect current status"
msgstr "Detectar o status atual"
#. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:319
msgid "Detecting ndiswrapper..."
msgstr "Detectando o ndiswrapper..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:338
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
@@ -4203,7 +4183,7 @@
"mas o módulo do kernel não foi ativado.\n"
"Deseja ativar o módulo do ndiswrapper?\n"
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:346
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
@@ -4212,282 +4192,275 @@
"Verifique a configuração manualmente.\n"
#. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:360
msgid "Detecting network devices..."
msgstr "Detectando os dispositivos de rede..."
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:368
msgid "Reading device configuration..."
msgstr "Lendo a configuração do dispositivo..."
#. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:374
msgid "Reading network configuration..."
msgstr "Lendo a configuração da rede..."
#. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:383
msgid "Reading firewall settings..."
msgstr "Lendo as configurações do firewall..."
#. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:391
msgid "Reading hostname and DNS configuration..."
msgstr "Lendo a configuração do nome de máquina e DNS..."
#. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:398
msgid "Reading installation information..."
msgstr "Lendo as informações da instalação..."
#. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:404
msgid "Reading routing configuration..."
msgstr "Lendo a configuração de roteamento..."
#. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:410
msgid "Detecting current status..."
msgstr "Detectando o status atual..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
msgid "Finished"
msgstr "Concluído"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:441
msgid "To apply this change, a reboot is needed."
msgstr "Para aplicar esta alteração, uma reinicialização é necessária."
#. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:509
msgid "Saving Network Configuration"
msgstr "Salvando a configuração da rede"
#. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:516
msgid "Write drivers information"
msgstr "Salvar a informação do driver"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:518
msgid "Write device configuration"
msgstr "Salvar a configuração do dispositivo"
#. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:520
msgid "Write network configuration"
msgstr "Salvar a configuração da rede"
#. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:522
msgid "Write routing configuration"
msgstr "Salvar a configuração de roteamento"
#. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:524
msgid "Write hostname and DNS configuration"
msgstr "Salvar a configuração de nome de máquina e DNS"
#. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:526
msgid "Set up network services"
msgstr "Configurar os serviços de rede"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr "Salvar as configurações do firewall"
#. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:534
msgid "Activate network services"
msgstr "Ativar os serviços de rede"
#. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:550
msgid "Writing /etc/modprobe.conf..."
msgstr "Salvando o /etc/modprobe.conf..."
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:555
msgid "Writing device configuration..."
msgstr "Salvando a configuração do dispositivo..."
#. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:561
msgid "Writing network configuration..."
msgstr "Salvando a configuração da rede..."
#. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:567
msgid "Writing routing configuration..."
msgstr "Salvando a configuração de roteamento..."
#. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:575
msgid "Writing hostname and DNS configuration..."
msgstr "Salvando a configuração de nome de máquina e DNS..."
#. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:588
msgid "Setting up network services..."
msgstr "Configurando os serviços de rede..."
#. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr "Salvando as configurações do firewall..."
#. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:606
msgid "Activating network services..."
msgstr "Ativando os serviços de rede..."
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:642
msgid "No network running"
msgstr "Nenhuma rede em execução"
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: 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:782
+#: src/modules/Lan.rb:759
msgid "Network Mode"
msgstr "Modo de rede"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:764
msgid "Interfaces controlled by NetworkManager"
msgstr "Interfaces controladas pelo NetworkManager"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:766
msgid "Disable NetworkManager"
msgstr "Desabilitar o NetworkManager"
#. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:770
msgid "Traditional network setup with NetControl - ifup"
msgstr "Configuração tradicional de rede com NetControl - ifup"
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:773
msgid "Enable NetworkManager"
msgstr "Habilitar o NetworkManager"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:779
msgid "Support for IPv6 protocol is enabled"
msgstr "O suporte para o protocolo IPv6 está habilitado"
#. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:781
msgid "Disable IPv6"
msgstr "Desabilitar o IPv6"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:785
msgid "Support for IPv6 protocol is disabled"
msgstr "O suporte para o protocolo IPv6 está desabilitado"
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:198
msgid "connected"
msgstr "conectado"
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:199
msgid "datagram"
msgstr "datagrama"
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
msgid "Started automatically at boot"
msgstr "Iniciado automaticamente na inicialização"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1280
msgid "Started automatically on cable connection"
msgstr "Iniciado automaticamente ao conectar o cabo"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1284
msgid "Managed by NetworkManager"
msgstr "Gerenciado pelo NetworkManager"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1288
msgid "Will not be started at all"
msgstr "Não será iniciado"
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1294
msgid "Started manually"
msgstr "Iniciado manualmente"
#. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1306
msgid "IP address assigned using"
msgstr "Endereço IP atribuído usando"
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1310
msgid "IP address: %s/%s"
msgstr "Endereço IP: %s/%s"
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1313
msgid "IP address: %s, subnet mask %s"
msgstr "Endereço IP: %s, máscara de subrede %s"
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1337
msgid "Not configured"
msgstr "Não configurado"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
msgid "Device Name: %s"
msgstr "Nome do dispositivo: %s"
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1380
msgid "Bonding slaves"
msgstr "Escravos vinculados"
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1394
msgid "enslaved in %s"
msgstr "escravizado em %s"
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1395
msgid "Bonding master"
msgstr "Vinculando mestre"
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1409
msgid "Not connected"
msgstr "Não conectado"
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1410
msgid "No hwinfo"
msgstr "Não há informações de hardware (hwinfo)"
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1427
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 "Não foi possível configurar a placa de rede porque o módulo do kernel (eth0, wlan0) não está presente. Isto normalmente ocorre quando está faltando o firmware (para dispositivos sem fio). Veja a saída do comando dmesg para obter mais detalhes."
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1433
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
@@ -4495,17 +4468,17 @@
"O dispositivo não está configurado. Clique em <b>Editar</b>\n"
"para configurar.\n"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "Needed firmware"
msgstr "Firmware necessário"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "unknown"
msgstr "desconhecido"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:158
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
@@ -4514,35 +4487,40 @@
"as configurações do firewall serão desabilitadas."
#. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:203
msgid "Configure display manager"
msgstr "Configurar o gerenciador de janelas"
#. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:208
msgid "Restart the services"
msgstr "Reiniciar os serviços"
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:211
msgid "Saving Remote Administration Configuration"
msgstr "Salvando a configuração de administração remota"
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:220
msgid "Configuring display manager..."
msgstr "Configurando o gerenciador de janelas..."
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:224
msgid "Restarting the service..."
msgstr "Reiniciando o serviço..."
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#. Install required packages
+#: src/modules/Remote.rb:261
msgid "Enabling service %{service} has failed"
msgstr "Falha ao habilitar o serviço %{service}"
+#: src/modules/Remote.rb:267
+#, fuzzy
+#| msgid "Enabling service %{service} has failed"
+msgid "Disabling service %{service} has failed"
+msgstr "Falha ao habilitar o serviço %{service}"
+
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:295
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4550,30 +4528,30 @@
msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is enabled."
msgstr "A administração remota está habilitada."
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is disabled."
msgstr "A administração remota está desabilitada."
#. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
msgid "Write IP forwarding settings"
msgstr "Salvar as configurações de encaminhamento IP"
#. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
msgid "Write routing settings"
msgstr "Salvar as configurações de roteamento"
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
msgid "Saving Routing Configuration"
msgstr "Salvando a configuração de roteamento"
#. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
msgid "Writing IP forwarding settings..."
msgstr "Salvando as configurações de encaminhamento IP..."
@@ -4582,22 +4560,22 @@
#. 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:281
+#: src/modules/Routing.rb:284
msgid "Writing routing settings..."
msgstr "Salvando as configurações do roteamento..."
#. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
msgid "Gateway: %s"
msgstr "Gateway: %s"
#. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
msgid "IP Forwarding for IPv4: %s"
msgstr "Encaminhamento IP para o IPv4: %s"
#. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
msgid "IP Forwarding for IPv6: %s"
msgstr "Encaminhamento IP para o IPv6: %s"
@@ -4616,6 +4594,42 @@
msgid "(Unprotected)"
msgstr "(Não protegido)"
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "A configuração foi salva com sucesso"
+
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "A configuração do DNS foi salva com sucesso."
+
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "A configuração DSL foi salva com sucesso."
+
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "A configuração de máquinas foi salva com sucesso."
+
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "A configuração ISDN foi salva com sucesso."
+
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "A configuração da placa de rede foi salva com sucesso."
+
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "A configuração do modem foi salva com sucesso."
+
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "A configuração do proxy foi salva com sucesso."
+
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "A configuração do provedor foi salva com sucesso."
+
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "A configuração de roteamento foi salva com sucesso."
+
+#~ msgid "Configure mail now?"
+#~ msgstr "Configurar o e-mail agora?"
+
+#~ msgid "Run configuration of %1?"
+#~ msgstr "Executar a configuração de %1?"
+
#~ msgid "Device boot protocol"
#~ msgstr "Protocolo do dispositivo de inicialização"
Modified: trunk/yast/pt_BR/po/nfs.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/nfs.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/nfs.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: nfs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:54UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -143,7 +143,7 @@
"Domínio válido: %3"
#. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
msgid ""
"fstab already contains an entry\n"
"with mount point '%1'."
@@ -152,7 +152,7 @@
"com o ponto de montagem '%1'."
#. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
msgid ""
"The path entered is invalid.\n"
"It must be shorter than 70 characters\n"
@@ -395,12 +395,12 @@
msgstr "Configuração do cliente do NFS"
#. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
msgid "Unable to create directory '%1'."
msgstr "Não foi possível criar o diretório '%1'."
#. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
msgid ""
"Unable to write to /etc/fstab.\n"
"No changes will be made to the\n"
@@ -411,52 +411,52 @@
"configuração do cliente NFS.\n"
#. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
msgid "Writing NFS Configuration"
msgstr "Salvando a configuração NFS"
#. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
msgid "Stop services"
msgstr "Parar os serviços"
#. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
msgid "Start services"
msgstr "Iniciar os serviços"
#. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
msgid "Stopping services..."
msgstr "Parando os serviços..."
#. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
msgid "Starting services..."
msgstr "Iniciando os serviços..."
#. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
msgid "Finished"
msgstr "Concluído"
#. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
msgid "Writing NFS client settings. Please wait..."
msgstr "Salvando as configurações do cliente NFS. Por favor, aguarde..."
#. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr "Não foi possível montar as entradas NFS do /etc/fstab."
#. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
msgid "NFS Entries"
msgstr "Entradas do NFS"
#. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
msgid "%1 entries configured"
msgstr "%1 entradas configuradas"
Modified: trunk/yast/pt_BR/po/nis.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/nis.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/nis.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2012-05-18 12:17-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -261,9 +261,10 @@
msgstr "&Endereços IP dos servidores NIS"
#. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "Br&oadcast"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "&Broadcast"
#. pushbutton label, find nis servers
#. Shortcut must not conflict with Finish and Next (#29960)
@@ -376,11 +377,6 @@
msgstr "&Servidores (separados por espaços ou vírgulas)"
#. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "&Broadcast"
-
-#. checkbox label
#: src/include/nis/ui.rb:859
msgid "&SLP"
msgstr "&SLP"
@@ -588,3 +584,6 @@
#: src/modules/Nis.rb:1260
msgid "NIS server not found."
msgstr "Servidor NIS não encontrado."
+
+#~ msgid "Br&oadcast"
+#~ msgstr "Br&oadcast"
Modified: trunk/yast/pt_BR/po/ntp-client.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/ntp-client.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/ntp-client.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: ntp-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-10-02 17:11-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -32,7 +32,7 @@
msgstr "Salvando a configuração do NTP..."
#. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
msgstr "<p>Pressione <b>Sincronizar agora</b> para ter o horário de seu sistema ajustado corretamente usando o servidor NTP selecionado. Se você deseja usar o NTP permanentemente, habilite a opção <b>Salvar a configuração NTP</b>.</p>"
@@ -41,48 +41,48 @@
msgstr "<p>Ao habilitar a opção <b>Executar o NTP como um daemon</b>, o serviço NTP será iniciado como um daemon. Caso contrário, a hora do sistema será sincronizada periodicamente. O intervalo padrão é 15 minutos. Você pode alterá-lo após a instalação com o módulo <b>ntp-client</b> do yast2.</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
msgstr "<p>O botão <b>Configurar</b> abre a configuração avançada do NTP.</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
msgstr "<p>A sincronização com o servidor NTP pode ser feita somente quando a rede estiver configurada.</p>"
#. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
msgid "Invalid NTP server hostname %1"
msgstr "Nome de máquina do servidor NTP inválido %1"
#. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
msgid "&NTP Server Address"
msgstr "Endereço do servidor &NTP"
#. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
msgid "&Run NTP as daemon"
msgstr "&Executar o NTP como um &daemon"
#. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
msgid "&Save NTP Configuration"
msgstr "&Salvar a configuração do NTP"
#. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
msgid "S&ynchronize now"
msgstr "&Sincronizar agora"
#. push button label
#. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
msgid "&Configure..."
msgstr "&Configurar..."
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
@@ -91,18 +91,18 @@
"sem ter o pacote %1 instalado."
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
msgid "Synchronizing with NTP server..."
msgstr "Sincronizando com o servidor NTP..."
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
msgid "Connection to selected NTP server failed."
msgstr "Falha ao conectar ao servidor NTP selecionado."
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
msgid ""
"Test query to server '%1' failed.\n"
"If server is not yet accessible or network is not configured\n"
@@ -310,273 +310,267 @@
msgstr "Receptores JJY"
#. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
msgid "NTP client configuration module."
msgstr "Módulo de configuração do cliente NTP."
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
msgid "Print the status of the NTP daemon"
msgstr "Exibir o status do daemon do NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
msgid "Print all configured synchronization relationships"
msgstr "Exibir todas as relações de sincronização configuradas"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
msgid "Enable the NTP daemon"
msgstr "Habilitar o daemon do NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
msgid "Disable the NTP daemon"
msgstr "Desabilitar o daemon do NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
msgid "Add new synchronization relationship"
msgstr "Adicionar nova relação de sincronização"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
msgid "Edit existing synchronization relationship"
msgstr "Editar relação de sincronização existente"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
msgid "Delete a synchronization relationship"
msgstr "Remover a relação de sincronização"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
msgid "The address of the server"
msgstr "O endereço do servidor"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
msgid "The address of the peer"
msgstr "O endereço do par"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
msgid "The address to which to broadcast"
msgstr "O endereço ao qual será feito o broadcast"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
msgid "The address from which to accept broadcasts"
msgstr "O endereço do qual serão aceitos os broadcasts"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
msgid "The options of the relationship"
msgstr "As opções de relacionamento"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
msgid "Options for clock driver calibration"
msgstr "Opções para calibrar o driver do relógio"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
msgid "Use the server for initial synchronization"
msgstr "Utilizar o servidor para sincronização inicial"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
msgid "Do not use the server for initial synchronization"
msgstr "Não utilizar o servidor para sincronização inicial"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
msgid "The synchronization peer not specified."
msgstr "O par de sincronização não foi especificado."
#. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
msgid "Specified synchronization peer not found."
msgstr "O par de sincronização especificado não foi encontrado."
#. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is enabled."
msgstr "O daemon do NTP está habilitado."
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is disabled."
msgstr "O daemon do NTP está desabilitado."
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
msgid "Server"
msgstr "Servidor"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
msgid "Peer"
msgstr "Par"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
msgid "Broadcast"
msgstr "Broadcast"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
msgid "Accepting Broadcasts"
msgstr "Aceitando broadcasts"
#. table cell, %1 is integer 0-3
#. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
msgid "Unit Number: %1"
msgstr "Número de unidade: %1"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
msgid "Local Radio Clock"
msgstr "Relógio controlado por rádio local"
#. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
msgid "Reading the settings failed."
msgstr "Falha ao ler as configurações."
#. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
msgid "NTP Server Configuration"
msgstr "Configuração do servidor NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
msgid "NTP Configuration"
msgstr "Configuração do NTP"
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "Configurações do firewall"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
msgid "General Settings"
msgstr "Configurações gerais"
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
msgid "Security Settings"
msgstr "Configurações de segurança"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
msgid "Advanced NTP Configuration"
msgstr "Configuração avançada do NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
msgid "New Synchronization"
msgstr "Nova sincronização"
#. Server editing dialog
#. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
msgid "Server Settings"
msgstr "Configurações do servidor"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
msgid "NTP Server"
msgstr "Servidor NTP"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
msgid "Local NTP Server"
msgstr "Servidor NTP local"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
msgid "Public NTP Server"
msgstr "Servidor NTP público"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
msgid "NTP Peer"
msgstr "Par NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
msgid "Local Reference Clock"
msgstr "Relógio de referência local"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
msgid "Outgoing Broadcast"
msgstr "Broadcast de saída"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
msgid "Incoming Broadcast"
msgstr "Broadcast de entrada"
#. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
msgid "&Reference ID"
msgstr "ID de &referência"
#. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
msgid "&Stratum"
msgstr "&Stratum"
#. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
msgid "Calibration Offset 1"
msgstr "Correção de calibração 1"
#. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
msgid "Calibration Offset 2"
msgstr "Correção de calibração 2"
#. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
msgid "Flag &1"
msgstr "Indicador &1"
#. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
msgid "Flag &2"
msgstr "Indicador &2"
#. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
msgid "Flag &3"
msgstr "Indicador &3"
#. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
msgid "Flag &4"
msgstr "Indicador &4"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
msgid "Clock Driver Calibration"
msgstr "Calibração do driver do relógio"
#. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
msgid ""
"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -585,7 +579,7 @@
"Aguarde...<br></p>"
#. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
msgid ""
"<p><b><big>Aborting Initialization:</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -594,7 +588,7 @@
"Cancele com segurança o utilitário de configuração clicando em <b>Cancelar</b> agora.</p>"
#. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
msgid ""
"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -603,7 +597,7 @@
"Aguarde...<br></p>"
#. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -613,16 +607,23 @@
"Cancele o processo de salvamento clicando em <B>Cancelar</B>. \n"
"Um diálogo adicional irá informar se é seguro ou não fazer isto.</P>"
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Start NTP Daemon</big></b><br>\n"
+#| "Select whether to start the NTP daemon now and on every system boot. \n"
+#| "The NTP daemon resolves host names when initializing. Your\n"
+#| "network connection must be started before the NTP daemon starts.</p>\n"
+#| "Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
+#| "The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
+#| " You can change this when the system was set up."
msgid ""
"<p><b><big>Start NTP Daemon</big></b><br>\n"
"Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
msgstr ""
"<p><b><big>Iniciar o daemon do NTP</big></b><br>\n"
"Selecione se iniciar o daemon NTP agora ou em cada inicialização do sistema.\n"
@@ -660,7 +661,7 @@
"Indicadores de controle de acesso podem ser ajustados na tabela de resumo dos servidores. Esta opção não estará disponível se o NTP for configurado via DHCP.</p>\n"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
msgid ""
"<p><b><big>Configuring via DHCP</big></b><br>\n"
"To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -675,7 +676,7 @@
"se as informações dos servidores NTP são oferecidas pelo servidor DHCP.</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
msgid ""
"<p><b><big>Configured Servers</big></b><br>\n"
"To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -690,7 +691,7 @@
"existente, selecione-o e clique em <b>Remover</b>.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
msgid ""
"<p><b><big>Display Log</big></b></p>\n"
"<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
@@ -699,7 +700,7 @@
"<p>Para exibir os logs do daemon NTP, clique em <b>Exibir o Log</b>.</p>\n"
#. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
msgid ""
"<p><b><big>Advanced configuration</big></b><br>\n"
"To configure this host to synchronize against multiple remote hosts or against\n"
@@ -710,7 +711,7 @@
"um relógio conectado localmente, use <b>Configuração avançada</b>."
#. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
msgid ""
"<p><b><big>Clock Type</big></b><br>\n"
"Select the driver for the clock to configure.</p>"
@@ -719,7 +720,7 @@
"Selecione o driver para o relógio a configurar.</p>"
#. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
msgid ""
"<p><b><big>Unit Number</big></b><br>\n"
"If you have multiple clocks of the same type, you must set\n"
@@ -730,7 +731,7 @@
"configurar o <b>Número de unidade</b>.</p>"
#. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
msgid ""
"<p><b><big>Device</big></b><br>\n"
"To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -749,7 +750,7 @@
"ele deve ser criado manualmente.</p>"
#. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
msgid ""
"<p><b><big>Driver Calibration</big></b><br>\n"
"To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -758,7 +759,7 @@
"Para calibrar o driver do relógio, clique em <b>Calibrar Driver</b>.</p>"
#. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
msgid ""
"<p><b><big>Address of the NTP Server</big></b><br>\n"
"To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -771,7 +772,7 @@
"Internet.</p>"
#. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
msgid ""
"<p><b><big>Selecting a Server</big></b><br>\n"
"To select an NTP server from those found in the local network\n"
@@ -784,7 +785,7 @@
"escolha entre <b>Servidor NTP local</b> e <b>Servidor NTP público</b>.</p>"
#. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
msgid ""
"<p><b><big>Testing Server Accessibility</big></b><br>\n"
"To test if the selected server is up and responds properly,\n"
@@ -795,7 +796,7 @@
"adequadamente, clique em <b>Testar</b>.</p>"
#. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address of the host with which to synchronize mutually,\n"
@@ -806,7 +807,7 @@
"mútua deve ser realizada, use <b>Endereço</b>.</p>"
#. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -817,7 +818,7 @@
"broadcast, use o campo <b>Endereço</b>.</p>"
#. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address from which to accept broadcast packets, use \n"
@@ -829,7 +830,7 @@
#. help text 2/4, was removed
#. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
msgid ""
"<p><b><big>Options</big></b><br>\n"
"To fine-tune the synchronization source, enter the respective options in the\n"
@@ -840,7 +841,7 @@
"Para ajustar detalhadamente a fonte de sincronização, digite as respectivas opções no campo de texto <b>Opções</b>. Para detalhes, veja\n"
"<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>\n"
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
msgid ""
"<p><b><big>Access Control Options</big></b><br>\n"
"Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -859,7 +860,7 @@
"<b>Configurações de segurança</b>.</p>\n"
#. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
msgid ""
"<p><b><big>Synchronization Peer Type</big></b><br>\n"
"Select the kind of synchronization peer to add here.</p>"
@@ -868,7 +869,7 @@
"Selecione o tipo de par de sincronização a adicionar aqui.</p>"
#. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
msgid ""
"<p>To add an NTP server to which to synchronize,\n"
"select <b>Server</b>.</p>"
@@ -877,7 +878,7 @@
"selecione <b>Servidor</b>.</p>"
#. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
msgid ""
"<p>To add an NTP peer to synchronize mutually, select\n"
"<b>Peer</b>.</p>"
@@ -886,7 +887,7 @@
"selecione <b>Par</b>.</p>"
#. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
msgid ""
"<p>To configure a local clock connected directly to your computer,\n"
"select <b>Radio Clock</b>.</p>"
@@ -895,7 +896,7 @@
"computador, selecione <b>Relógio Controlado por Rádio</b>.</p>"
#. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
msgid ""
"<p>To broadcast time information through your network, select\n"
"<b>Outgoing Broadcast</b>.</p>"
@@ -904,7 +905,7 @@
"<b>Broadcast de saída</b>.</p>"
#. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
msgid ""
"<p>To accept NTP packets broadcasted by other hosts on the network\n"
"and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
@@ -913,7 +914,7 @@
"e usá-los para definir o horário local, selecione <b>Broadcast de entrada<b>.</p>"
#. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
msgid ""
"<p><big><b>Server Location</b></big>\n"
"Select if you want to find the NTP server in the local network or select\n"
@@ -924,7 +925,7 @@
"o servidor NTP da lista de servidores NTP conhecidos.</p>"
#. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
msgid ""
"<p><big><b>Finding Server in the Local\n"
"Network</b></big><br>\n"
@@ -939,7 +940,7 @@
"Então, selecione um servidor da lista de servidores encontrados.</p>"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
msgid ""
"<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
"Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -950,7 +951,7 @@
"Para exibir servidores NTP somente de um país, selecione-o em <b>País</b>.</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
msgid ""
"<p><big><b>Note</b></big><br>\n"
"The listed NTP servers may not be available from any country, but only\n"
@@ -971,7 +972,7 @@
"para encontrar um servidor NTP próximo de você.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
msgid ""
"<p><big><b>Testing Server Accessibility</b></big><br>\n"
"To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -981,7 +982,7 @@
#. help text connected with checkbox: "Use Random Server from pool.ntp.org"
#. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
msgid ""
"<p><big><b>Use Random Servers</b></big><br>\n"
"This service is offered by pool.ntp.org. If you select this option,\n"
@@ -996,7 +997,7 @@
"seu cliente NTP é sincronizado com diferentes servidores a cada hora.</p>\n"
#. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
msgid ""
"<p><big><b>Clock Driver Calibration</b></big><br>\n"
"The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -1009,7 +1010,7 @@
"depende de cada driver. Alguns drivers não usam todas as opções.</p>"
#. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
msgid ""
"To learn more about available options, install the package\n"
"<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
@@ -1027,17 +1028,17 @@
"Todas as alterações serão perdidas."
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
msgid "Restart NTP Daemon"
msgstr "Reiniciar o daemon do NTP"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
msgid "Save Settings and Restart NTP Daemon"
msgstr "Salvar as configurações e reiniciar o daemon do NTP"
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
msgid ""
"Warning!\n"
"\n"
@@ -1052,7 +1053,7 @@
"o daemon pode não funcionar adequadamente."
#. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
msgid ""
"NTP server '%1' is not a valid hostname,\n"
"fully qualified hostname, IPv4 address, or IPv6 address."
@@ -1061,7 +1062,7 @@
"nome de máquina totalmente qualificado, endereço IPv4 ou endereço IPv6."
#. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
msgid ""
"Enabling Random Servers from pool.ntp.org would\n"
"replace the current NTP server.\n"
@@ -1074,44 +1075,44 @@
"Realmente substituir o servidor NTP atual?"
#. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
msgid "Select the Device"
msgstr "Selecione o dispositivo"
#. selection box header
#. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
msgid "Public NTP &Servers"
msgstr "&Servidores NTP públicos"
#. message report (no server selected)
#. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
msgid "Select an NTP server."
msgstr "Selecione um servidor NTP."
#. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
msgid "All Countries"
msgstr "Todos os países"
#. combo box header
#. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
msgid "&Country"
msgstr "&País"
#. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
msgid "Scanning for NTP servers on your network..."
msgstr "Procurando por servidores NTP na sua rede..."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
#. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
msgid ""
"No NTP server has been found on your network.\n"
"This could be caused by a running SuSEfirewall2,\n"
@@ -1122,205 +1123,205 @@
"o que provavelmente está bloqueando a procura pela rede."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
msgid "No NTP server has been found on your network."
msgstr "Nenhum servidor NTP foi encontrado na sua rede."
#. combo box label
#. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
msgid "Address"
msgstr "Endereço"
#. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
msgid "No server is selected."
msgstr "Nenhum servidor foi selecionado."
#. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
msgid "A&ddress"
msgstr "En&dereço"
#. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
msgid "Ad&vanced Configuration"
msgstr "Configuração a&vançada"
#. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
msgid "&Driver Calibration"
msgstr "Calibração do &driver"
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
msgid "&Interval of the Synchronization in Minutes"
msgstr "&Intervalo da sincronização em minutos"
#. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
msgid "Start NTP Daemon"
msgstr "Iniciar o daemon do NTP"
#. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
msgid "Only &Manually"
msgstr "Apenas &manualmente"
#. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
msgid "&Synchronize without Daemon"
msgstr "&Sincronizar sem o daemon"
#. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
msgid "Now and on &Boot"
msgstr "Agora e ao &inicializar"
#. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
msgid "Run NTP Daemon in Chroot &Jail"
msgstr "Executar o daemon do NTP em chroot &jail"
#. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
msgid "&Restrict NTP Service to Configured Servers Only "
msgstr "&Restringir os serviços NTP apenas aos servidores configurados"
#. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
msgid "Manual"
msgstr "Manual"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
msgid "Auto"
msgstr "Automático"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
msgid "Custom"
msgstr "Personalizado"
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
msgid "&Runtime Configuration Policy"
msgstr "Política de configuração de &tempo de execução"
#. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
msgid "&Custom Policy"
msgstr "Política &personalizada"
#. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
msgid "&Use Random Servers from pool.ntp.org"
msgstr "&Usar servidores aleatórios de pool.ntp.org"
#. text entry label
#. text entry
#. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
msgid "&Address"
msgstr "End&ereço"
#. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
msgid "&Select..."
msgstr "&Selecionar..."
#. push button
#. push button
#. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
msgid "&Test"
msgstr "&Testar"
#. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
msgid "Synchronization Type"
msgstr "Tipo de sincronização"
#. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
msgid "Display &Log..."
msgstr "Exibir o &log..."
#. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
msgid "Clock &Type"
msgstr "&Tipo de relógio"
#. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
msgid "Unit &Number"
msgstr "&Número de unidade"
#. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
msgid "Create &Symlink"
msgstr "Criar link &simbólico"
#. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
msgid "&Device"
msgstr "&Dispositivo"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
msgid "Access Control Options"
msgstr "Opções de controle de acesso"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
msgid "&Server"
msgstr "&Servidor"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
msgid "&Peer"
msgstr "&Par"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
msgid "&Radio Clock"
msgstr "&Relógio controlado por rádio"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
msgid "&Outgoing Broadcast"
msgstr "Broadca&st de saída"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
msgid "&Incoming Broadcast"
msgstr "Broadcast de &entrada"
#. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
msgid "Type"
msgstr "Tipo"
#. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
msgid "Loc&al Network"
msgstr "Rede loc&al"
#. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
msgid "&Public NTP Server"
msgstr "Servidor NTP &público"
#. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
msgid "NTP Server Location"
msgstr "Localização do servidor NTP"
#. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
msgid "&Lookup"
msgstr "&Pesquisa"
@@ -1334,146 +1335,91 @@
msgid "Initializing ..."
msgstr "Inicializando..."
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "Inicializando a configuração do cliente NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "Ler a configuração da rede"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "Ler as configurações do NTP"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "Lendo a configuração da rede..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "Lendo as configurações do NTP..."
-
-#. progress step
#. While calling "yast clone_system" it is possible that
#. the ntp server has not already been installed at that time.
#. (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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
#. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
msgid "Finished"
msgstr "Concluído"
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "Salvando a configuração do cliente NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "Salvar as configurações do NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "Reiniciar o daemon do NTP"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "Salvando as configurações..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "Reiniciando o daemon do NTP..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-msgid "Cannot update the dynamic configuration policy."
-msgstr "Não foi possível atualizar a política dinâmica de configuração."
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "Não foi possível reiniciar o daemon do NTP."
-
#. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
msgid "The NTP daemon starts when starting the system."
msgstr "O daemon do NTP inicia quando o sistema é iniciado."
#. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
msgid "The NTP daemon does not start automatically."
msgstr "O daemon do NTP não inicia automaticamente."
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
msgid "Servers: %1"
msgstr "Servidores: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
msgid "Radio Clocks: %1"
msgstr "Relógios controlados por rádio: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
msgid "Peers: %1"
msgstr "Pares: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
msgid "Broadcast time information to: %1"
msgstr "Enviar informações horário para: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
msgid "Accept broadcasted time information from: %1"
msgstr "Aceitar informações de horário de: %1"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
msgid "Combine static and DHCP configuration."
msgstr "Combinar as configurações estática e de DHCP."
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
msgid "Static configuration only."
msgstr "Configuração estática somente."
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
msgid "Custom configuration policy."
msgstr "Política de configuração personalizada."
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
msgid "Testing the NTP server..."
msgstr "Testando o servidor NTP..."
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
msgid "Server is reachable and responds properly."
msgstr "O servidor está acessível e responde adequadamente."
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
msgid "Server is unreachable or does not respond properly."
msgstr "O servidor não está acessível ou não responde adequadamente."
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
@@ -1481,6 +1427,72 @@
"Não é possível pesquisar pelo servidor NTP na rede local\n"
"sem ter o pacote %1 instalado.\n"
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "Inicializando a configuração do cliente NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "Ler a configuração da rede"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "Ler as configurações do NTP"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "Lendo a configuração da rede..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "Lendo as configurações do NTP..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "Salvando a configuração do cliente NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "Salvar as configurações do NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "Reiniciar o daemon do NTP"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "Salvando as configurações..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "Reiniciando o daemon do NTP..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+msgid "Cannot update the dynamic configuration policy."
+msgstr "Não foi possível atualizar a política dinâmica de configuração."
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "Não foi possível reiniciar o daemon do NTP."
+
+#~ msgid "Firewall Settings"
+#~ msgstr "Configurações do firewall"
+
#~ msgid "'Test query to server '%1' failed. If server is not yet accessible or network is not configured click 'No' to ignore. Revisit NTP server configuration?"
#~ msgstr "Falha ao enviar consulta de teste para o servidor '%1'. Se o servidor ainda não estiver acessível ou a rede não estiver configurada, clique em 'Não' para ignorar. Abrir novamente a configuração do servidor NTP?"
Modified: trunk/yast/pt_BR/po/packager.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/packager.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/packager.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-31 10:56UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -415,7 +415,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:95
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr "<p>O gerenciador de repositórios está baixando os detalhes do repositório...</p>"
@@ -536,7 +536,7 @@
#. dialog caption
#. dialog caption
#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/modules/AddOnProduct.rb:688
msgid "Initializing..."
msgstr "Inicializando..."
@@ -560,11 +560,6 @@
msgid "&Media"
msgstr "&Mídia"
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-msgid "Saving the software manager configuration..."
-msgstr "Salvando a configuração do gerenciador de software..."
-
#. default (minimal) priority of a repository
#: src/clients/repositories.rb:58
msgid "&Priority"
@@ -600,7 +595,7 @@
#. 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/modules/AddOnProduct.rb:1351
msgid "URL: %1"
msgstr "URL: %1"
@@ -864,7 +859,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:1040 src/modules/Packages.rb:1328
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Detalhes:"
@@ -872,7 +867,7 @@
#. 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:1042 src/modules/Packages.rb:1336
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Tentar novamente?"
@@ -1435,42 +1430,42 @@
"'%2'?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:81
msgid "Adding a New Repository"
msgstr "Adicionando um novo repositório"
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
msgid "Check Repository Type"
msgstr "Verificar o tipo de repositório"
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:86
msgid "Add Repository"
msgstr "Adicionar repositório"
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:87
msgid "Read Repository License"
msgstr "Ler a licença do repositório"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
msgid "Checking Repository Type"
msgstr "Verificando o tipo de repositório"
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:91
msgid "Adding Repository"
msgstr "Adicionando repositório"
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:92
msgid "Reading Repository License"
msgstr "Lendo a licença do repositório"
#. 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:156
msgid "Repository"
msgstr "Repositório"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:228
#: src/modules/SourceManager.rb:330
msgid ""
"There is no product information available at the given location.\n"
@@ -1487,8 +1482,8 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -1497,7 +1492,7 @@
"a partir da URL '%1'."
#. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:335
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."
@@ -1506,12 +1501,12 @@
"Altere o protocolo ou descompacte a imagem ISO no lado do servidor."
#. popup message part 2
-#: src/include/packager/repositories_include.rb:343
+#: src/include/packager/repositories_include.rb:345
msgid "Change the URL and try again?"
msgstr "Alterar a URL e tentar novamente?"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:422
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
@@ -1519,6 +1514,11 @@
"Não é possível pesquisar por repositórios SLP\n"
"sem ter o pacote %1 instalado.\n"
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+msgid "Saving the software manager configuration..."
+msgstr "Salvando a configuração do gerenciador de software..."
+
#. New add-on product might add also new agents.
#. Functions Rereads all available agents.
#.
@@ -1526,19 +1526,19 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
msgid "An error occurred while preparing the installation system."
msgstr "Ocorreu um erro durante a preparação do sistema de instalação."
#. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:659
msgid "Control file %1 not found on media."
msgstr "O arquivo de controle %1 não foi encontrado na mídia."
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:900
msgid ""
"Package '%s' is not installed.\n"
"The add-on product cannot be registered."
@@ -1546,28 +1546,43 @@
"O pacote '%s' não está instalado.\n"
"O produto adicional não pôde ser registrado."
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+msgid "Unknown Product"
+msgstr "Produto desconhecido"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+#| msgid "Please wait..."
+msgid "Re&lease Notes..."
+msgstr "Aguarde..."
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
msgid "Unable to use additional products."
msgstr "Não foi possível usar os produtos adicionais."
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
msgid "%1, URL: %2"
msgstr "%1, URL: %2"
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1345
msgid "URL: %1, Path: %2"
msgstr "URL: %1, caminho: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1376
msgid "Additional Products"
msgstr "Produtos adicionais"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1382
msgid ""
"The installation repository also contains the listed additional repositories.\n"
"Select the ones you want to use.\n"
@@ -1575,37 +1590,30 @@
"O repositório de instalação contém também os repositórios adicionais listados.\n"
"Selecione aqueles que deseja usar.\n"
-#: src/modules/AddOnProduct.rb:1378
+#: src/modules/AddOnProduct.rb:1393
msgid "Additional Products to Select"
msgstr "Produtos adicionais para selecionar"
#. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1400
msgid "Add Selected &Products"
msgstr "Adicionar &produtos selecionados"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1532
msgid "Insert the addon %1 medium"
msgstr "Insira a mídia de %1 complementar"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1537
msgid "Insert the %1 %2 medium"
msgstr "Insira a mídia de %2 do %1"
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1589
msgid "Unable to add product %1."
msgstr "Não foi possível adicionar o produto %1."
-#. 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/Packages.rb:471
-msgid "Unknown Product"
-msgstr "Produto desconhecido"
-
#. update the trusted flag
#: src/modules/KeyManager.rb:214
msgid ""
@@ -1632,27 +1640,27 @@
msgstr "Não foi possível copiar a chave para o diretório temporário."
#. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
msgid "&Show Failed Packages List"
msgstr "E&xibir a lista de pacotes com falha"
#. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
msgid "&Show Full Log"
msgstr "E&xibir o log completo"
#. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
msgid "Installation of some Packages Failed"
msgstr "Falha ao instalar alguns pacotes"
#. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
msgid "Installation aborted by user."
msgstr "Instalação interrompida pelo usuário."
#. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
msgid "Medium %1"
msgstr "Mídia %1"
@@ -1660,13 +1668,13 @@
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
msgid ">%1"
msgstr ">%1"
#. Nothing more to install from this CD (very concise - little space!!)
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
msgid "Done."
msgstr "Concluído."
@@ -1674,21 +1682,21 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
msgid "Next: %1 -- %2"
msgstr "Próximo: %1 - %2"
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
msgid "Next: %1"
msgstr "Próximo: %1"
#. 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:918
+#: src/modules/PackageSlideShow.rb:922
msgid "Total"
msgstr "Total"
@@ -1697,41 +1705,41 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
msgid "Downloading %1 (download size %2)"
msgstr "Baixando %1 (tamanho do download %2)"
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
msgid " (Remaining: %1%2 packages)"
msgstr " (restando: %1%2 pacotes)"
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
msgid "Downloading Packages..."
msgstr "Baixando pacotes..."
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
msgid " (Downloaded %1 of %2 packages)"
msgstr " (baixados %1 de %2 pacotes)"
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
msgid "Deleting %1"
msgstr "Removendo %1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
msgid "Installing %1 (installed size %2)"
msgstr "Instalando %1 (tamanho instalado %2)"
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
msgid "Applying delta RPM: %1"
msgstr "Aplicando o RPM delta: %1"
@@ -1856,7 +1864,9 @@
msgstr "<b>Aviso:</b> O produto <b>%s</b> será removido."
#: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+#, fuzzy
+#| msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
msgstr "<b>Erro:</b> O produto <b>%s</b> será automaticamente removido.</font>"
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
@@ -1878,12 +1888,12 @@
"</li></ul></li></ul>"
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
msgid "No repository found at '%1'."
msgstr "Nenhum repositório encontrado em '%1'."
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
msgid ""
"<p><b>The release notes for the initial release are part of the installation\n"
"media. If an Internet connection is available during configuration, you can\n"
@@ -1895,31 +1905,31 @@
"no servidor de Internet do openSUSE.</b></p>\n"
#. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
msgid "Integrating booted media..."
msgstr "Integrando a mídia inicializada..."
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
msgid "Failed to integrate the service pack repository."
msgstr "Falha ao integrar o repositório do pacote de serviços."
#. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
msgid "Initializing repositories..."
msgstr "Inicializando os repositórios..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
msgid "Insert %1 CD 1"
msgstr "Insira o CD 1 do %1"
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
msgid "%1 CD 1 not found"
msgstr "CD 1 do %1 não encontrado"
#. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1928,7 +1938,7 @@
"Verifique o arquivo de log %1 para mais detalhes."
#. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1937,12 +1947,12 @@
"A proposta de software será chamada novamente."
#. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
msgid "Evaluating package selection..."
msgstr "Avaliando a seleção de pacotes..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1953,36 +1963,48 @@
#. Sets that the license (file) has been already accepted
#.
#. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
msgid "Cannot read license file %1"
msgstr "Não foi possível ler o arquivo de licença %1"
-#: src/modules/ProductLicense.rb:151
+#: src/modules/ProductLicense.rb:153
msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
msgstr "Para exibir a licença do produto adequadamente, coloque o arquivo license.tar.gz na raiz do live CD quando construir a imagem."
#. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
msgid "&Language"
msgstr "&Idioma"
#. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
msgid "I &Agree to the License Terms."
msgstr "Eu &aceito os termos da licença."
#. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+#, fuzzy
+#| msgid ""
+#| "If you want to print this EULA, you can find it\n"
+#| "on the first media in the file %1"
+msgid ""
"If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
msgstr ""
"Se você quiser imprimir este EULA, poderá encontrá-lo\n"
"na primeira mídia, no arquivo %1"
#. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
@@ -1996,18 +2018,18 @@
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
msgid "License Agreement"
msgstr "Contrato de licença"
#. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
msgid "Really abort the add-on product installation?"
msgstr "Realmente cancelar a instalação do produto complementar?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
msgid ""
"Refusing the license agreement cancels the installation.\n"
"Really refuse the agreement?"
@@ -2016,7 +2038,7 @@
"Realmente recusar o contrato?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1048
+#: src/modules/ProductLicense.rb:1044
msgid ""
"Refusing the license agreement cancels the add-on\n"
"product installation. Really refuse the agreement?"
@@ -2025,17 +2047,18 @@
"complementar. Realmente recusar o contrato?"
#. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1058
+#: src/modules/ProductLicense.rb:1054
msgid "The system is shutting down..."
msgstr "O sistema está sendo desligado..."
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
#: src/modules/ProductLicense.rb:1153
msgid "%s License Agreement"
msgstr "Contrato de licença para %s"
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
@@ -2141,7 +2164,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
msgid "S&MB/CIFS"
msgstr "S&MB/CIFS"
@@ -2186,7 +2209,7 @@
msgstr "Bai&xar os arquivos de descrição do repositório"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
msgid ""
"<p>If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>"
@@ -2195,7 +2218,7 @@
"da mídia, defina a <b>Imagem ISO</b>.</p>"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
msgid ""
"<p>If the repository is on multiple media,\n"
"set the location of the first media of the set.</p>\n"
@@ -2204,86 +2227,86 @@
"defina a localização da primeira mídia do conjunto.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
msgid "&Server Name"
msgstr "Nome do &servidor"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
msgid "&Path to Directory or ISO Image"
msgstr "&Caminho para o diretório ou imagem ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
msgid "&ISO Image"
msgstr "Imagem &ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
msgid "N&FS v4 Protocol"
msgstr "Protocolo N&FS v4"
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
msgid "Mount Options"
msgstr "Opções de montagem"
#. 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:163
+#: src/modules/SourceDialogs.rb:164
msgid "(default)"
msgstr "(padrão)"
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
msgid "URL of the Repository"
msgstr "URL do repositório"
#. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
msgid "P&rotocol"
msgstr "P&rotocolo"
#. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
msgid "&URL of the Repository"
msgstr "&URL do repositório"
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
msgid "Repository URL"
msgstr "URL do repositório"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
msgid "NFS Server"
msgstr "Servidor NFS"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
msgid "CD or DVD Media"
msgstr "Mídia de CD ou DVD"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
msgid "Hard Disk"
msgstr "Disco rígido"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
msgid "USB Stick or Disk"
msgstr "Pendrive USB ou disco"
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
msgid "Local Directory"
msgstr "Diretório local"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
msgid "Local ISO Image"
msgstr "Imagem ISO local"
@@ -2292,24 +2315,24 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: 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
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
msgid "Server and Directory"
msgstr "Servidor e diretório"
#. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:469
msgid "The name of the repository cannot be empty."
msgstr "O nome do repositório não pode estar vazio."
#. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:482
msgid "&Repository Name"
msgstr "&Nome do repositório"
#. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:497
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
@@ -2318,12 +2341,12 @@
"Utilize <b>Nome do repositório</b> para especificar o nome do repositório. Se o campo estiver vazio, o YaST usará o nome do produto (se disponível) ou o URL como nome.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:511
msgid "&Service Name"
msgstr "Nome do &serviço"
#. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:519
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
@@ -2332,17 +2355,17 @@
"Use <b>Nome do serviço</b> para especificar o nome do serviço. Se o campo estiver vazio, o YaST usará parte da URL do serviço como nome.</p>\n"
#. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:554
msgid "URL cannot be empty."
msgstr "A URL não pode estar vazia."
#. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:568
msgid "&URL"
msgstr "&URL"
#. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:582
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2354,16 +2377,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
msgid "Edit Parts of the URL"
msgstr "Editar partes da URL"
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
msgid "Edit Complete URL"
msgstr "Editar a URL completa"
#. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:774
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2373,7 +2396,7 @@
"Use <b>Nome do servidor</b> e <b>Caminho para diretório ou imagem ISO</b>\n"
"para especificar o nome de máquina do servidor NFS e o caminho no servidor.<p>"
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:781
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2386,16 +2409,16 @@
"para detalhes e a lista de opções suportadas."
#. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:836
msgid "&CD-ROM"
msgstr "&CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:838
msgid "&DVD-ROM"
msgstr "&DVD-ROM"
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:843
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2404,12 +2427,12 @@
"Defina <b>CD-ROM</b> ou <b>DVD-ROM</b> para especificar o tipo de mídia.</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:943
msgid "ISO Image File"
msgstr "Arquivo de imagem ISO"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:966
msgid ""
"The entered path is not a directory\n"
"or the directory does not exist.\n"
@@ -2418,7 +2441,7 @@
"ou o diretório não existe.\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:996
msgid ""
"The entered path is not a file\n"
"or the file does not exist.\n"
@@ -2427,7 +2450,7 @@
"ou o arquivo não existe.\n"
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1020
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2438,17 +2461,17 @@
"Usá-lo mesmo assim?\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1041
msgid "&Path to Directory"
msgstr "&Caminho do diretório"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
msgid "&Plain RPM Directory"
msgstr "Diretório R&PM"
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1064
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2463,20 +2486,20 @@
"<b>Diretório RPM</b>.</p>\n"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1300
msgid "&USB Mass Storage Device"
msgstr "Dispositivo de armazenamento em massa &USB"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
msgid "&File System"
msgstr "Sis&tema de arquivos"
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
msgid "Dire&ctory"
msgstr "Dire&tório"
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1311
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2496,7 +2519,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:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
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"
@@ -2507,11 +2530,11 @@
"quiser utilizar um sistema de arquivos específico, selecione-o da lista.</p>\n"
#. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1371
msgid "&Disk Device"
msgstr "Dispositivo de &disco"
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1378
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2530,12 +2553,12 @@
"<b>Diretório RPM</b>.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1404
msgid "&Path to ISO Image"
msgstr "&Caminho para a imagem ISO"
#. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1424
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2546,71 +2569,71 @@
"arquivo de imagem ISO.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1605
msgid "Server &Name"
msgstr "&Nome do servidor"
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1609
msgid "&Port"
msgstr "&Porta"
#. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1614
msgid "&Share"
msgstr "Compar&tilhamento"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1627
msgid "ISO &Image"
msgstr "&Imagem ISO"
#. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1630
msgid "&Directory on Server"
msgstr "&Diretório no servidor"
#. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1635
msgid "Au&thentication"
msgstr "Au&tenticação"
#. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1642
msgid "&Anonymous"
msgstr "&Anônimo"
#. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1651
msgid "&Workgroup or Domain"
msgstr "&Grupo de trabalho ou domínio"
#. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1660
msgid "&User Name"
msgstr "Nome de &usuário"
#. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1667
msgid "&Password"
msgstr "Sen&ha"
#. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1742
msgid "&FTP"
msgstr "&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1745
msgid "H&TTP"
msgstr "H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1752
msgid "HTT&PS"
msgstr "HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1926
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"
@@ -2635,7 +2658,7 @@
"da mídia, configure a <b>Imagem ISO</b>.</p>\n"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1939
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"
@@ -2646,12 +2669,20 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+#, fuzzy
+#| msgid "I would like to install an additional Add On Product"
+msgid "I would li&ke to install an additional Add On Product"
msgstr "Eu gostaria de instalar um produto complementar adicional"
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+#| msgid "Checking Network Configuration ..."
+msgid "Net&work Configuration..."
+msgstr "Verificando a configuração da rede..."
+
#. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2136
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2662,7 +2693,7 @@
"ou no disco rígido.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2673,7 +2704,7 @@
"tenha o conjunto de CDs ou o DVD em mãos.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2155
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -2689,7 +2720,7 @@
"em um só diretório.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2167
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2702,25 +2733,25 @@
"primeiro CD, como em /data1/CD1.</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2182
msgid "Select the media type"
msgstr "Selecione o tipo de mídia"
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2188
msgid "Insert the add-on product CD"
msgstr "Insira o CD do produto complementar"
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2189
msgid "Insert the add-on product DVD"
msgstr "Insira o DVD do produto complementar"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2207
msgid "No USB disk was detected."
msgstr "Nenhum disco USB foi detectado."
#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#: src/modules/SourceDialogs.rb:2415
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2735,19 +2766,19 @@
"baixar os arquivos automaticamente quando precisar deles mais tarde.</p>\n"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2635
msgid "Media Type"
msgstr "Tipo de mídia"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2659
msgid "Add On Product"
msgstr "Produto complementar"
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2690
#, fuzzy
#| msgid "URL entered is not valid"
msgid "URL scheme '%s' is not valid."
@@ -2941,12 +2972,12 @@
msgstr "Nenhum repositório SLP foi encontrado na rede."
#. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
msgid "Partition \"%1\" needs %2 more disk space."
msgstr "A partição \"%1\" necessita de %2 a mais de espaço em disco."
#. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
msgid ""
"Deselect packages or delete data or temporary files\n"
"before updating the system.\n"
@@ -2955,7 +2986,7 @@
"ou arquivos temporários antes de atualizar o sistema.\n"
#. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
msgid "Deselect some packages."
msgstr "Cancele a seleção de alguns pacotes."
@@ -3015,9 +3046,6 @@
#~ msgid "Initialize Software Manager"
#~ msgstr "Inicializar o gerenciador de software"
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "Verificando a configuração da rede..."
-
#~ msgid "Initializing Software Manager ... "
#~ msgstr "Inicializando o gerenciador de software..."
Modified: trunk/yast/pt_BR/po/pkg-bindings.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/pkg-bindings.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/pkg-bindings.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: pkg-bindings\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-09-17 17:44-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -51,12 +51,12 @@
msgstr "<P><BIG><B>Atualizando o repositório</B></BIG></P><P>O gerenciador de pacotes está atualizando o conteúdo do repositório...</P>"
#. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
msgid "The package cannot be selected to install."
msgstr "O pacote não pode ser selecionado para instalação."
#. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
msgid "The package is not available."
msgstr "O pacote não está disponível."
Modified: trunk/yast/pt_BR/po/printer.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/printer.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/printer.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: printer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-31 10:59UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -203,7 +203,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:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -219,8 +219,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:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -345,7 +345,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
msgid "Description"
msgstr "Descrição"
@@ -449,8 +449,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:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
msgid "Nothing Selected"
msgstr "Nada selecionado"
@@ -3331,56 +3331,56 @@
#. Authors: Johannes Meixner <jsmeix(a)suse.de>
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
msgid "Show"
msgstr "Exibir"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
msgid "&Local"
msgstr "&Local"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
msgid "&Remote"
msgstr "&Remoto"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
msgid "Configuration"
msgstr "Configuração"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
msgid "Name"
msgstr "Nome"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
msgid "Location"
msgstr "Localização"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
msgid "Default"
msgstr "Padrão"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
msgid "Status"
msgstr "Status"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
msgid "Re&fresh List"
msgstr "&Atualizar a lista"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
msgid "Print &Test Page"
msgstr "Imprimir página de &teste"
@@ -3390,7 +3390,7 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
msgid ""
"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
@@ -3406,7 +3406,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -3430,7 +3430,7 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
@@ -3439,67 +3439,67 @@
"(isto pode demorar algum tempo)"
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
msgid "Do no longer use the inaccessible CUPS server '%1'?"
msgstr "Não utilizar mais o servidor CUPS inacessível '%1'?"
#. Popup::YesNoHeadline body recommendation how to answer the headline question
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:207
+#: src/include/printer/overview.rb:210
msgid "To proceed, you should agree that '%1' will be no longer used."
msgstr "Para prosseguir, você deve concordar que '%1' não será mais usado."
#. 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:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
msgid "A non-accessible server leads to an endless sequence of delays and failures."
msgstr "Um servidor inacessível acarreta em uma sequência interminável de atrasos e falhas."
#. where %1 will be replaced by the CUPS server name.
-#: src/include/printer/overview.rb:253
+#: src/include/printer/overview.rb:256
msgid "CUPS Server %1"
msgstr "Servidor CUPS %1"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
msgid "Testing if CUPS server is accessible..."
msgstr "Testando a acessibilidade do servidor CUPS..."
#. 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:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
msgid "Select an entry."
msgstr "Selecione uma entrada."
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
msgid "Cannot Delete"
msgstr "Não foi possível remover"
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr "Esta é uma configuração remota. Somente configurações locais podem ser removidas."
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
msgid "Confirm Deletion"
msgstr "Confirmar remoção"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
msgid "The selected configuration would be deleted immediately and cannot be restored."
msgstr "A configuração selecionada seria removida imediatamente e não pode ser restaurada."
#. 'Yes' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:620
+#: src/include/printer/overview.rb:623
msgid "Delete configuration %1"
msgstr "Remover a configuração %1"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
msgid "Do not delete it"
msgstr "Não remover"
@@ -3510,33 +3510,33 @@
#. 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:637
+#: src/include/printer/overview.rb:640
msgid "Confirm Deletion of a Class"
msgstr "Confirmar remoção de uma classe"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
msgid "A deleted class cannot be re-created with this tool."
msgstr "Uma classe removida não pode ser recriada com essa ferramenta."
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
msgid "Rejecting Print Jobs"
msgstr "Rejeitando trabalhos de impressão"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
msgid "The testpage cannot be printed because print jobs are rejected."
msgstr "A página de teste não pode ser impressa porque trabalhos estão sendo rejeitados."
#. 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:697
+#: src/include/printer/overview.rb:700
msgid "Printout Disabled"
msgstr "Impressão desabilitada"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
msgid "The testpage cannot be printed because printout is disabled."
msgstr "A página de teste não pode ser impressa porque a impressão está desabilitada."
@@ -3545,25 +3545,25 @@
#. 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:728
+#: src/include/printer/overview.rb:731
msgid "There are pending print jobs which might be deleted before the testpage is printed."
msgstr "Existem trabalhos de impressão pendentes que podem ser removidos antes que a página de teste seja impressa."
#. where %1 will be replaced by the queue name.
#. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
msgid "Delete Pending Print Jobs For %1"
msgstr "Remover trabalhos de impressão pendentes para %1"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
msgid "Delete them before printing testpage"
msgstr "Removê-los antes de imprimir a página de teste"
#. 'No' 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:762
msgid "Print testpage after the other jobs"
msgstr "Imprimir a página de teste depois dos outros trabalhos"
@@ -3571,7 +3571,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:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
msgid "Failed to delete all pending jobs for %1."
msgstr "Falha ao remover todos os trabalhos pendentes para %1."
@@ -3590,28 +3590,28 @@
#. + (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:799
+#: src/include/printer/overview.rb:802
msgid "Test printout"
msgstr "Testar impressão"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
msgid "Print one or two pages e.g. to test duplex printing"
msgstr "Imprima uma ou duas páginas, por exemplo, para testar a impressão dupla face"
#. Popup::AnyQuestion so called 'yes' (default) button label:
-#: src/include/printer/overview.rb:803
+#: src/include/printer/overview.rb:806
msgid "Single test page"
msgstr "Página de teste única"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
msgid "Two test pages"
msgstr "Duas páginas de teste"
#. 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:835
+#: src/include/printer/overview.rb:838
msgid "Failed to print testpage for %1."
msgstr "Falha ao imprimir página de teste para %1."
@@ -3619,25 +3619,25 @@
#. 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:852
+#: src/include/printer/overview.rb:855
msgid "Wait Until Testpage Printing Finished"
msgstr "Aguarde até que a impressão da página de teste seja concluída"
#. Popup::AnyQuestion message regarding testpage printout result
#. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:856
+#: src/include/printer/overview.rb:859
msgid "Sent testpage to %1. Printing should start soon."
msgstr "Enviando página de teste para %1. A impressão deve começar logo."
#. Popup::AnyQuestion 'Yes' button label
#. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:861
+#: src/include/printer/overview.rb:864
msgid "Testpage printout was successful"
msgstr "A impressão da página de teste foi bem sucedida"
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
msgid "Testpage printing failed"
msgstr "Falha na impressão da página de teste"
@@ -3657,53 +3657,53 @@
#. 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:897
+#: src/include/printer/overview.rb:900
msgid "There are pending print jobs which might be deleted now."
msgstr "Existem trabalhos de impressão pendentes que podem ser removidos agora."
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:925
+#: src/include/printer/overview.rb:928
msgid "Delete all pending jobs"
msgstr "Remover todos os trabalhos pendentes"
#. 'No' 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:931
msgid "Do not delete them"
msgstr "Não remova-os"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr "Para o log completo, veja o arquivo /var/log/cups/error_log."
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
msgid "CUPS log information while processing the testpage for %1 (English only)"
msgstr "Informação de log do CUPS enquanto processava a página de testes para %1 (apenas em inglês)"
#. 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:1065
+#: src/include/printer/overview.rb:1068
msgid "For CUPS log information, see the /var/log/cups/error_log file."
msgstr "Para informações do log do CUPS, veja o arquivo /var/log/cups/error_log."
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1075
+#: src/include/printer/overview.rb:1078
msgid "When printing via a remote system fails, you may ask an admin of the remote system."
msgstr "Quando a impressão através de um sistema remoto falha, você deve perguntar ao administrador do sistema remoto."
#. PopupYesNoHeadline body:
-#: src/include/printer/overview.rb:1102
+#: src/include/printer/overview.rb:1105
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr "Um servidor CUPS remoto possui configurações que conflitam com a adição de configurações."
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
msgid "Cannot Modify"
msgstr "Não foi possível alterar"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr "Esta é uma configuração remota.Somente configurações locais podem ser modificadas."
Modified: trunk/yast/pt_BR/po/rdp.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/rdp.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/rdp.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-10-09 13:28-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <i18n(a)suse.de>\n"
@@ -103,52 +103,52 @@
msgstr "Configurações do firewall"
#. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
msgid "Write firewall settings"
msgstr "Salvar as configurações do firewall"
#. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
msgid "Configure xrdp"
msgstr "Configurar xrdp"
#. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
msgid "Restart the services"
msgstr "Reiniciar os serviços"
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
msgid "Stop the services"
msgstr "Parar os serviços"
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
msgid "Saving Remote Administration Configuration"
msgstr "Salvando a configuração de administração remota"
#. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
msgid "Writing firewall settings..."
msgstr "Salvando as configurações do firewall..."
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
msgid "Configuring xrdp..."
msgstr "Configurando o xrdp..."
#. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
msgid "Restarting the service..."
msgstr "Reiniciando o serviço..."
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
msgid "Stopping the service..."
msgstr "Parando os serviços..."
#. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
msgid "Remote administration is enabled."
msgstr "A administração remota está habilitada."
#. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
msgid "Remote administration is disabled."
msgstr "A administração remota está desabilitada."
Modified: trunk/yast/pt_BR/po/rear.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/rear.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/rear.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-10-21 21:11-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -234,13 +234,13 @@
msgstr "Lendo as configurações do rear"
#: src/include/rear/ui.rb:698
+msgid "Reading rear settings"
+msgstr "Lendo configurações do rear"
+
+#: src/include/rear/ui.rb:698
msgid "Analyzing system"
msgstr "Analisando o sistema"
-#: src/include/rear/ui.rb:698
-msgid "Reading rear settings"
-msgstr "Lendo configurações do rear"
-
#: src/include/rear/ui.rb:699
msgid "Analyzing system..."
msgstr "Analisando o sistema..."
Modified: trunk/yast/pt_BR/po/registration.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/registration.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/registration.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
"PO-Revision-Date: 2014-10-30 10:50-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -27,27 +27,6 @@
"X-Poedit-Country: BRAZIL\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-msgid "Local Registration Servers"
-msgstr "Servidores locais de registro"
-
-#: 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:68
-msgid "No registration server selected."
-msgstr "Nenhum servidor de registro selecionado."
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-msgid "SUSE Customer Center (%s)"
-msgstr "SUSE Customer Center (%s)"
-
#. popup message
#. popup message
#. popup message
@@ -64,9 +43,9 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -80,30 +59,30 @@
msgstr "Utilize '%s' ao invés deste módulo YaST."
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
msgid "Registration was successfull."
msgstr "Registro realizado com sucesso."
#. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
msgid "SLP discovery failed, no server found"
msgstr "Falha na descoberta SLP. Nenhum servidor encontrado"
#. download and install the specified SSL certificate to the system
#. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
msgid "Downloading SSL Certificate"
msgstr ""
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
msgid "Importing SSL Certificate"
msgstr ""
#. %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:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
msgid "Registering %s ..."
msgstr "Registrando %s ..."
@@ -240,31 +219,25 @@
msgid "SHA256 Fingerprint: "
msgstr "Impressão digital SHA256: "
-#. Error popup
-#: 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 ""
-"A rede não está configurada. O servidor de registro não pode ser alcançado.\n"
-"Deseja configurar a rede agora?"
-
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
#: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
-msgstr "Erro de rede. Verifique a configuração de rede."
-
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
msgid "Connection time out."
msgstr "Tempo de conexão esgotado."
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
+msgstr ""
+
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:91
msgid "Check that this system is known to the registration server."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:97
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -280,41 +253,47 @@
#. 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:113
-#: src/lib/registration/connect_helpers.rb:118
+#: 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:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
+#, fuzzy
+#| msgid "Contacting the Registration Server"
+msgid "Connection to registration server failed."
+msgstr "Contatando o servidor de registro"
+
#: 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
-msgid "Registration failed."
-msgstr "Falha no registro."
-
-#: src/lib/registration/connect_helpers.rb:123
msgid "Registration client error."
msgstr "Erro no cliente de registro."
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:123
+#, fuzzy
+#| msgid ""
+#| "Registration server error.\n"
+#| "Retry registration later."
msgid ""
"Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
msgstr ""
"Erro no servidor de registro.\n"
"Tente novamente mais tarde."
#. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:165
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:197
+#: src/lib/registration/connect_helpers.rb:198
msgid "Details: %s"
msgstr "Detalhes: %s"
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:227
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -324,23 +303,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing the SSL certificate"
msgstr "Importando o certificado SSL"
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:240
msgid "Importing '%s' certificate..."
msgstr "Importando o certificado '%s'..."
#. try to use a translatable message first, if not found then use
#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:260
+#: src/lib/registration/connect_helpers.rb:261
msgid "Secure connection error: %s"
msgstr "Erro de conexão segura: %s"
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:279
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -348,13 +327,33 @@
"protocol is installed at the server."
msgstr ""
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+msgid "Invalid URL."
+msgstr "URL inválida."
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:296
+msgid ""
+"Network is not configured, the registration server cannot be reached.\n"
+"Do you want to configure the network now?"
+msgstr ""
+"A rede não está configurada. O servidor de registro não pode ser alcançado.\n"
+"Deseja configurar a rede agora?"
+
+#: src/lib/registration/connect_helpers.rb:303
+msgid "Network error, check the network configuration."
+msgstr "Erro de rede. Verifique a configuração de rede."
+
#. progress step title
#: src/lib/registration/finish_dialog.rb:35
msgid "Storing Registration Configuration..."
msgstr ""
#. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
msgid ""
"The base product was not found,\n"
"check your system."
@@ -363,13 +362,13 @@
"Verifique seu sistema."
#. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
msgid ""
"The installation medium or the installer itself is seriously broken.\n"
"Report a bug at %s."
msgstr ""
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
msgid ""
"Make sure a product is installed and /etc/products.d/baseproduct\n"
"is a symlink pointing to the base product .prod file."
@@ -378,7 +377,7 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:272
msgid "Registering the System..."
msgstr "Registrando o sistema..."
@@ -387,14 +386,14 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
#: src/lib/registration/ui/migration_repos_workflow.rb:304
msgid "Updating to %s ..."
msgstr ""
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:166
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Synchronizing Products..."
@@ -406,29 +405,29 @@
#. @return [Array<Registration::Addon>] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:180
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
msgid "Loading Available Extensions and Modules..."
msgstr ""
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:195
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
msgstr "Carregando a configuração %1..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:213
msgid "Register Extensions and Modules"
msgstr "Registrar extensões e módulos"
#. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:217
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:242
#, fuzzy
#| msgid "No registration server selected."
msgid ""
@@ -437,7 +436,7 @@
msgstr "Nenhum servidor de registro selecionado."
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:246
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
@@ -451,7 +450,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:250
#, fuzzy
#| msgid "Would you like to enable access to the profile repository?"
msgid ""
@@ -467,7 +466,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -478,39 +477,39 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
msgid "Unknown product"
msgstr "Produto desconhecido"
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
msgid "Saving repository configuration failed."
msgstr "Falha ao salvar configurações do repositório."
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
msgid "Updating service '%s' failed."
msgstr "Falha ao atualizar o serviço '%s'."
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
msgid "Adding service '%s' failed."
msgstr "Falha ao adicionar serviço '%s'."
#. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
msgid "Saving service '%s' failed."
msgstr "Falha ao salvar serviço '%s'."
#. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Refreshing service '%s' failed."
msgstr "Falha ao atualizar serviço '%s'."
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:474
#, fuzzy
#| msgid "No products found to be registered."
msgid ""
@@ -584,34 +583,38 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
msgid "Details"
msgstr "Detalhes"
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
msgid "Select an extension or a module to show details here"
msgstr "Selecione uma extensão ou módulo para exibir seus detalhes aqui"
#. checkbox label for an unavailable extension
#. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:164
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
msgid "%s (not available)"
msgstr ""
#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
msgid "YaST allows to select at most %s extensions or modules."
msgstr ""
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
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_base_dialog.rb:260
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
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 ""
@@ -626,7 +629,7 @@
msgstr ""
#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
msgid "Available Extensions and Modules"
msgstr "Extensões e módulos disponíveis"
@@ -688,32 +691,32 @@
msgstr ""
#. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
msgid "Really delete '%s'?"
msgstr ""
#. dialog definition for adding/editing an addon
#. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
msgid "Extension or Module &Identifier"
msgstr ""
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "&Version"
msgstr "&Versão"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
msgid "&Architecture"
msgstr "&Arquitetura"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
msgid "&Release Type"
msgstr ""
#. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
msgid "Registration &Code"
msgstr "&Código de registro"
@@ -743,10 +746,8 @@
msgid "Register the Product"
msgstr "Registrar o produto"
-#. 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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
msgid "&E-mail Address"
msgstr "&Endereço de e-mail"
@@ -755,57 +756,68 @@
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
msgid "Server Settings"
msgstr "Configurações do servidor"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
msgid "Find Registration Server Using SLP Discovery"
msgstr "Localizar um servidor de registro utilizando o descobrimento SLP"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
msgid "Use Specific Server URL Instead of the Default"
msgstr "Utilizar um URL de um servidor específico ao invés do padrão"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
msgid "Optional SSL Server Certificate URL"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
msgid "Optional SSL Server Certificate Fingerprint"
msgstr ""
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
msgid "none"
msgstr "nenhum"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
msgid "SSL Certificate Fingerprint"
msgstr ""
#. the UI defition for the main dialog
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
msgid "Register Extensions or Modules..."
msgstr ""
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
#, fuzzy
-msgid "&Local Registration Server..."
-msgstr "Servidor local de registro"
+#| msgid "Registering the System..."
+msgid "Register System via %s"
+msgstr "Registrando o sistema..."
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#, fuzzy
+#| msgid "Registration Server"
+msgid "Register System via local SMT Server"
+msgstr "Servidor de Registro"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+msgid "&Local Registration Server URL"
+msgstr ""
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
msgid "&Skip Registration"
msgstr "&Ignorar registro"
#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
#, fuzzy
#| msgid "Register Extensions and Modules"
msgid "&Register Extensions or Modules Again"
@@ -815,26 +827,37 @@
#. @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/base_system_registration_dialog.rb:342
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr "O sistema já está registrado."
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
+#, fuzzy
+#| 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?"
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?"
+"Customer Center for online registration."
msgstr ""
"Se você não registrar o sistema não poderemos lhe conceder acesso\n"
"aos repositórios de atualização.\n"
@@ -844,29 +867,12 @@
"\n"
"Deseja realmente ignorar o registro agora?"
-#. 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
-msgid "Network Configuration..."
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
+#, fuzzy
+#| msgid "Network Configuration..."
+msgid "Net&work Configuration..."
msgstr "Configuração da rede..."
#. SSL error message
@@ -891,22 +897,30 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: 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>"
+#, fuzzy
+#| msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
msgstr "<p>Uma conexão segura (HTTPS) utiliza certificados SSL para verificar a autenticidade do servidor e para criptografar os dados transferidos.</p>"
#. help text (RichText) for importing a SSL certificate (2/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+#, fuzzy
+#| 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>"
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
msgstr "<p>Você pode escolher importar o certificado na lista de autoridades certificadores (CA) conhecidas. Isso significa que você confia no elemento e o emissor do certificado desconhecido.</p>"
#. help text (RichText) for importing a SSL certificate (3/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+#, fuzzy
+#| msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
msgstr "<p>A importação de um certificação lhe permitirá utilizar, por exemplo, um certificado auto-assinado.</p>"
#. help text (RichText) for importing a SSL certificate (4/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+#, fuzzy
+#| 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>"
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
msgstr "<p><b>Importante:</b> você deve verificar a impressão digital do certificado para garantir que o certificado genuíno seja importado do servidor.</p>"
#. help text (RichText) for importing a SSL certificate (5/5)
@@ -914,16 +928,6 @@
msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
msgstr "<p><b>A importação de um certificado desconhecido sem realizar a verificação é um risco de segurança.</b></p>"
-#. error message, the entered URL is not valid
-#: src/lib/registration/ui/local_server_dialog.rb:67
-msgid "Invalid URL."
-msgstr "URL inválida."
-
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-msgid "&Local Registration Server URL"
-msgstr ""
-
#. TRANSLATORS: error message, %s are details
#. TRANSLATORS: error message, %s are details
#: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -958,21 +962,21 @@
msgstr "Selecionar nova arquitetura base."
#. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
#, fuzzy
#| msgid "Saving Repositories..."
msgid "Manage Repositories..."
msgstr "Salvando repositórios..."
#. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
#, 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
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
#, fuzzy
#| msgid "Priority"
msgid "Priority: %s"
@@ -1047,19 +1051,19 @@
msgstr "Selecionar nova arquitetura base."
#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
msgid "Manually Adjust the Repositories for Migration"
msgstr ""
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
#, fuzzy
#| msgid "Possible &Solutions"
msgid "Possible Migration Targets"
msgstr "Possíveis &soluções"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
#, fuzzy
#| msgid "Configuration Summary"
msgid "Migration Summary"
@@ -1071,14 +1075,14 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:214
+#: 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:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
#, fuzzy
#| msgid "Package %1 will be installed."
msgid "%s <b>will be installed.</b>"
@@ -1086,25 +1090,25 @@
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
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:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
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:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
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:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1152,16 +1156,80 @@
"You can manually register the system from scratch."
msgstr ""
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service] List of services to show.
+#. @param heading [String] Text to be shown as dialog heading. A default text
+#. will be used if it's not specified.
+#. @param description [String] Text to be shown as description. A default text
+#. will be used if it's not specified.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:64
+msgid "Local Registration Servers"
+msgstr "Servidores locais de registro"
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:65
+msgid ""
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
+msgstr ""
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:67
+#, fuzzy
+#| msgid "No registration server selected."
+msgid "No registration server selected"
+msgstr "Nenhum servidor de registro selecionado."
+
+#. Default registration server
+#.
+#. return [String] Returns a string representing the default SCC service.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:102
+msgid "SUSE Customer Center (%s)"
+msgstr "SUSE Customer Center (%s)"
+
+#. @return [Array<Yast::SlpServiceClass::Service>]
+#: src/lib/registration/url_helpers.rb:220
msgid "Searching..."
msgstr "Pesquisando..."
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:220
msgid "Looking up local registration servers..."
msgstr "Pesquisando servidores de registro locais..."
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service>] list of services to show
+#. @param heading [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
#, fuzzy
+#| msgid "Server Settings"
+msgid "Service selection"
+msgstr "Configurações do servidor"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+#| msgid "No registration server selected."
+msgid "No service was selected."
+msgstr "Nenhum servidor de registro selecionado."
+
+#~ msgid "Registration failed."
+#~ msgstr "Falha no registro."
+
+#, fuzzy
+#~ msgid "&Local Registration Server..."
+#~ msgstr "Servidor local de registro"
+
+#, fuzzy
#~| msgid "Edit Repositories"
#~ msgid "Migration Repositories"
#~ msgstr "Editar repositórios"
Modified: trunk/yast/pt_BR/po/reipl.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/reipl.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/reipl.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: reipl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-06-11 15:02-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -34,11 +34,16 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "After shutdown, reload the system\n"
+#| "with an IPL from DASD '%1'.\n"
msgid ""
"\n"
"After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
msgstr ""
"\n"
"Depois de desligar, recarregue o sistema\n"
@@ -49,7 +54,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -63,7 +68,7 @@
"com WWPN '%2'\n"
"e LUN '%3'.\n"
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: trunk/yast/pt_BR/po/samba-client.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/samba-client.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/samba-client.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: samba-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-10-29 11:44-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -862,79 +862,79 @@
msgstr "Instalando pacotes necessários..."
#. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
msgid "PAM Login"
msgstr "Login PAM"
#. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
msgid "Use Kerberos"
msgstr "Usar Kerberos"
#. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
msgid "Do Not Use Kerberos"
msgstr "Não usar Kerberos"
#. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
msgid "Default Realm"
msgstr "Realm padrão"
#. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
msgid "Default Domain"
msgstr "Domínio padrão"
#. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
msgid "KDC Server Address"
msgstr "Endereço do servidor KDC"
#. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
msgid "Clock Skew"
msgstr "Desvio do relógio"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
msgid "<b>KDC Server</b>: %1<br>"
msgstr "<b>Servidor KDC</b>: %1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<b>Domínio padrão</b>: %1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
msgid "<b>Default Realm</b>: %1<br>"
msgstr "<b>Realm padrão</b>: %1<br>"
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
msgid "<b>Kerberos Authentication Enabled</b>: %1"
msgstr "<b>Autenticação Kerberos habilitada</b>: %1"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "Sim"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
msgid "No"
msgstr "Não"
#. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
msgid "Configuration Acquired via DNS"
msgstr "Configuração adquirida via DNS"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
@@ -943,7 +943,7 @@
"Tente novamente.\n"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: trunk/yast/pt_BR/po/samba-server.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/samba-server.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/samba-server.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-05-29 14:45-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -256,11 +256,17 @@
#. TRANSLATORS: a popup message
#: src/include/samba-server/complex.rb:88
+#, fuzzy
+#| msgid ""
+#| "Because users are currently connected to this Samba server,\n"
+#| "the server configuration has been reloaded instead of restarted.\n"
+#| "To confirm that all settings are applied despite possibly disconnecting the users,\n"
+#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgid ""
"Because users are currently connected to this Samba server,\n"
"the server configuration has been reloaded instead of restarted.\n"
"To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
msgstr ""
"Como os usuários atualmente estão conectados a este servidor Samba,\n"
"a configuração do servidor foi recarregada ao invés de ser reiniciada.\n"
Modified: trunk/yast/pt_BR/po/security.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/security.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/security.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: security\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2012-10-26 01:04-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -129,204 +129,204 @@
#. Authors: Michal Svec <msvec(a)suse.cz>
#.
#. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
msgid "Unknown"
msgstr "Desconhecido"
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
msgid "Use magic SysRq keys"
msgstr "Habilitar teclas mágicas SysRq "
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
msgid "Use secure file permissions"
msgstr "Usar permissões de arquivo seguras"
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
msgid "Remote access to the display manager"
msgstr "Acesso remoto ao gerenciador de exibição"
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
msgid "Write back system time to the hardware clock"
msgstr "Salvar novamente a hora do sistema no relógio do hardware"
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
msgid "Always generate syslog message for cron scripts"
msgstr "Sempre gerar mensagens do syslog para os scripts cron"
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
msgid "Run the DHCP daemon in a chroot"
msgstr "Executar o daemon do DHCP em um chroot"
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
msgid "Run the DHCP daemon as dhcp user"
msgstr "Executar o daemon do DHCP como usuário dhcp"
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
msgid "Remote root login in the display manager"
msgstr "Login remoto como root no gerenciador de exibição"
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
msgid "Remote access to the X server"
msgstr "Acesso remoto ao servidor X"
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
msgid "Remote access to the email delivery subsystem"
msgstr "Acesso remoto ao subsistema de entrega de e-mail"
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
msgid "Restart services on update"
msgstr "Reiniciar os serviços ao atualizar"
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
msgid "Stop services on removal"
msgstr "Parar os serviços ao remover"
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
msgid "Enable TCP syncookies"
msgstr "Habilitar TCP syncookies"
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
msgid "IPv4 forwarding"
msgstr "Encaminhamento IPv4"
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
msgid "IPv6 forwarding"
msgstr "Encaminhamento IPv6"
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
#, fuzzy
#| msgid "Enable the service"
msgid "Enable basic system services"
msgstr "Habilitar o serviço"
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
#, fuzzy
#| msgid "Disable the service"
msgid "Disable extra services"
msgstr "Desabilitar o serviço"
#. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
msgid "Configure"
msgstr "Configurar"
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
msgid "Enabled"
msgstr "Habilitado"
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
msgid "Disabled"
msgstr "Desabilitado"
#. table header
#. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
msgid "Security Setting"
msgstr "Configurações de Segurança"
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
msgid "Status"
msgstr "Status"
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
msgid "Security Status"
msgstr "Status da Segurança"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
msgid "Help"
msgstr "Ajuda"
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
msgid " or "
msgstr " ou "
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
#, fuzzy
#| msgid "<P>These basic system services are not running:<BR><B>%1</B></P>"
msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
msgstr "<P>Este serviço básico do sistema não está sendo executado:<BR><B>%1</B></P>"
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
msgid "<P>All basic services are enabled.</P>"
msgstr "<P>Todos os serviços básicos estão habilitados.</P>"
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
#, fuzzy
#| msgid "<P>These extra services are running:<BR><B>%1</B></P>"
msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
msgstr "<P>Este(s) servço(s) extra estão sendo executados:<BR><B>%1</B></P>"
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr "<P>Verifique a lista de serviços e desabilite todos os serviços não utilizados.</P>"
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
msgid "<P>Only basic system services are enabled.</P>"
msgstr "<P>Apenas serviços básicos do sistema estão habilitados.</P>"
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
msgid "Description"
msgstr "Descrição"
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
msgid "Security Overview"
msgstr "Resumo sobre a segurança"
#. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
msgid "Change &Status"
msgstr "Alterar o &status"
#. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
msgid "&Description"
msgstr "&Descrição"
#. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
#, fuzzy
#| msgid "Analyzing the system..."
msgid "Analyzing system"
msgstr "Analisando o sistema..."
#. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr "Configurações de Inicialização"
#. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
msgid "Boot Permissions"
msgstr "Permissões de Inicialização"
#. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
msgid "Miscellaneous Settings"
msgstr "Configurações gerais"
#. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
msgid "Password Settings"
msgstr "Configurações de Senha"
#. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
msgid "Checks"
msgstr "Verificações"
#. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
msgid "Password Age"
msgstr "Idade da Senha"
#. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
@@ -335,7 +335,7 @@
"que o máximo."
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
@@ -344,17 +344,17 @@
"O comprimento máximo de senha para a criptografia selecionada é %1."
#. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr "Configurações do login"
#. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
msgid "Login"
msgstr "Iniciar sessão"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -363,7 +363,7 @@
"<br>Por favor, aguarde...<br></p>"
#. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -372,7 +372,7 @@
"Cancele o utilitário de configuração com segurança clicando em <b>Cancelar</b> agora.</p>"
#. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -381,7 +381,7 @@
"<br>Por favor, aguarde...<br></p>"
#. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.</p>"
@@ -389,55 +389,9 @@
"<p><b><big>Cancelando o salvamento</big></b><br>\n"
"Cancele o salvamento clicando em <b>Cancelar</b>.</p>"
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>Segurança da Inicialização</big></b></p>\n"
-"<p>Nesta caixa de diálogo, altere várias configurações de inicialização relacionadas à segurança.</p>"
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
#: src/include/security/helps.rb:59
msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-"<p><b>Interpretação de Ctrl + Alt + Del</b>:\n"
-"Configure o que o sistema deve fazer em resposta a\n"
-"alguém no console pressionando a combinação de teclas\n"
-"CTRL + ALT + DEL. Em geral, o sistema é reinicializado. Algumas vezes convém ignorar\n"
-"esse evento, por exemplo, quando o sistema funciona como \n"
-"estação de trabalho e servidor.</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>\n"
-msgstr ""
-"<p><b>Comportamento de desligamento do gerenciador de login</b>:\n"
-"Defina quem tem permissão de desligar a máquina a partir do KDM.</p>\n"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-"<p><b>Sistema de hibernação</b>:\n"
-"Configure as condições para permitir que usuários possam usar o modo de hibernação. Por padrão, usuários no console\n"
-"ativo possuem esse direito. Outras opções são permitir a ação para qualquer usuário ou exigir autenticação em todos os casos.</p>\n"
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-msgid ""
"<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
"<p>Using predefined defaults, change the local security settings, which include\n"
" booting, login, password, user creation, and file permissions. The default\n"
@@ -451,7 +405,7 @@
"</p>"
#. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
#, fuzzy
#| msgid ""
#| "<p><b>Networked Workstation</b>: For a computer connected\n"
@@ -464,14 +418,14 @@
"a qualquer tipo de rede, incluindo a Internet.</p>"
#. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
msgid ""
"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
"that connects to different networks.</p>"
msgstr ""
#. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
@@ -480,12 +434,12 @@
"qualquer tipo de serviço.</p>"
#. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr "<p><b>Configurações personalizadas</b>: crie sua própria configuração.</p>"
#. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -496,7 +450,7 @@
"são armazenadas no arquivo /etc/login.defs.</p>"
#. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
msgid ""
"<p><b>Delay after Incorrect Login Attempt:</b>\n"
"It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -509,7 +463,7 @@
"tentar novamente se uma senha for digitada de forma incorreta. Um valor razoável é três segundos (<tt>3</tt>).</p>"
#. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
msgid ""
"<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
"attempts is useful. It can warn you of unauthorized access to the\n"
@@ -522,7 +476,7 @@
"</p>\n"
#. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
msgid ""
"<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
"to a graphical login screen for this machine over the network. Remote access\n"
@@ -533,7 +487,7 @@
"à sua máquina por um gerenciador de exibição talvez represente um risco de segurança.</p>"
#. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
@@ -542,7 +496,7 @@
"são armazenadas principalmente no arquivo /etc/login.defs.</p>"
#. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
msgid ""
"<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
"cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -553,7 +507,7 @@
"Ao marcar a caixa, você aplica a verificação de senha quanto a essas regras.</p>"
#. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
"The minimum acceptable size for the new password reduced by the number\n"
@@ -568,7 +522,7 @@
"Esta opção só pode ser modificada quando <b>Verificar novas senhas</b> for definido.</p>"
#. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -579,12 +533,12 @@
"Digite 0 caso não se deva armazenar nenhuma senha.</p>"
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
msgid "<p><b>Password Encryption Method:</b></p>"
msgstr "<p><b>Método de Criptografia de Senha:</b></p>"
#. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
msgid ""
"<p><b>DES</b>, the Linux default method, works in all network environments,\n"
"but it restricts you to passwords no longer than eight characters. If you need\n"
@@ -595,7 +549,7 @@
"necessitar compatibilidade com outros sistema, use este método.</p>"
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
msgid ""
"<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
"distributions, but not by other systems or old software.</p>"
@@ -604,12 +558,12 @@
"distribuições Linux atuais, mas não por outros sistemas nem softwares antigos.</p>"
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
msgstr "<p><b>SHA-512</b> é o método de hash padrão atualmente. A utilização de outros algoritmos não é recomendada, exceto por compatibilidade.</p>"
#. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
@@ -618,7 +572,7 @@
"número mínimo e máximo de dias em que uma senha pode ser usada.</p>"
#. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
msgid ""
"<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
"number of days users are warned before their passwords expire. The longer the\n"
@@ -629,7 +583,7 @@
"tempo, menor a probabilidade de alguém adivinhar as senhas.</p>"
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
@@ -638,7 +592,7 @@
"<p>Neste diálogo, altere várias configurações usadas para criar usuários.</p>"
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
@@ -647,7 +601,7 @@
"defina o ID de usuário mínimo e máximo possíveis.</p>"
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
@@ -656,7 +610,7 @@
"defina o ID de grupo mínimo e máximo possíveis.</p>"
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
@@ -665,7 +619,7 @@
"<p>Neste diálogo, altere configurações diversas relacionadas à segurança local.</p>"
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
msgid ""
"<p><b>File Permissions</b>: Settings for the permissions\n"
"of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -696,7 +650,7 @@
"decidir quais usuários podem executar aplicativos do X e programas setuid.</p>\n"
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
msgid ""
"<p><b>User Launching updatedb</b>: The program updatedb runs \n"
"once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -711,7 +665,7 @@
" (poucos arquivos) ou <b>root</b> (todos os arquivos).</p>"
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
msgid ""
"<p><b>Current Directory in root's Path</b> On a DOS system,\n"
"the system first searches for executable files (programs) in the current\n"
@@ -724,7 +678,7 @@
"pesquisa-os somente por meio do caminho de pesquisa (variável PATH).</p>"
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
msgid ""
"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
"system first searches for executable files (programs) in the current directory\n"
@@ -737,7 +691,7 @@
"pesquisados somente por meio do caminho de pesquisa (variável PATH).</p>"
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
msgid ""
"<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
"search path, enabling files in the current path to be found and executed.\n"
@@ -754,7 +708,7 @@
"é mais fácil se você definir essa opção.</p>"
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
msgid ""
"<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
"path of root, making it the last to be searched.</p>"
@@ -763,7 +717,7 @@
"pesquisa do root, fazendo ele ser o último pesquisado.</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
@@ -772,7 +726,7 @@
"no diretório atual pré-fixado com um \"./\". Exemplo: \"./configure\".</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
msgid ""
"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
"will have some control over the system even if it crashes (for example, during kernel\n"
@@ -783,26 +737,26 @@
"do kernel). Para obter detalhes, consulte /usr/src/linux/Documentation/sysrq.txt</p>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr "<P><B>Resumo da segurança</B><BR>Este resumo exibe as configurações de segurança mais importantes.</P>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
msgid "<P>To change the current value, click the link associated to the option.</P>"
msgstr "<P>Para alterar o valor atual, clique no link associado à opção.</P>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr "<P>Uma marca de seleção na coluna <B>Status da segurança</B> significa que algum valor atual da opção é seguro.</P>"
#. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
msgstr "<P><B>O valor atual não pode ser lido. O serviço provavelmente não está instalado ou a opção está ausente no sistema.</B></P>"
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
msgid ""
"<P>A display manager provides a graphical login screen and can be accessed\n"
"across the network by an X server running on another system if so\n"
@@ -820,7 +774,7 @@
"ganhando acesso não apenas ao conteúdo gráfico em exibição, mas também a nomes de usuários\n"
"e senhas utilizados.</P> <P>Se você não precisa do <EM>XDMCP</EM> para fazer login remoto no ambiente gráfico, desabilite esta opção.</P>"
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
msgid ""
"<P>Upon startup, the system time is being set from the hardware clock of the\n"
"computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -831,23 +785,23 @@
"Por consequência, é necessário configurar o relógio do hardware antes de desligar o computador.</P>\n"
"<P>A hora do sistema consistente é essencial para o sistema ter a habilidade de corrigir mensagens de log.</P>"
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
msgstr "<P>Avarias no sistema são normalmente determinadas por anomalias em seu comportamento. Mensagens do syslog sobre eventos reincidentes regularmente são importantes para encontrar as causas dos problemas, e a ausência de um único registro pode dizer mais do que a ausência de todo o log gravado.</P><P>A partir desse ponto de vista, mensagens do syslog de eventos do sistema são úteis apenas se elas estão presentes.</P>"
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
msgstr "<P>Ambientes de execução chroot são usados para restringir um processo apenas aos arquivos necessários, colocando-os em um subdiretório separado e executando o processo com uma raiz alterada (chroot) para aquele diretório.</P>"
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
msgstr "<P>O daemon cliente DHCP deve ser executado como o usuário <EM>dhcpcd</EM> para minimizar uma possível ameaça caso seja encontrada uma vulnerabilidade no código do programa.</P><P>Note que o dhcpcd não deve ser executado como <EM>root</EM> ou com o recurso <EM>CAP_SYS_CHROOT</EM> para que o confinamento da execução chroot seja efetivo.</P>"
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
msgstr "<P>Administradores devem ter cuidado para não logar como <EM>root</EM> em uma sessão X Window para minimizar o uso dos privilégios de root.</P><P>Esta opção não evita administradores descuidados, mas evita que atacantes consigam logar como <EM>root</EM> através de um gerenciador de exibição caso ele quebre ou adquira a senha.</P> "
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
msgid ""
"<P>X Window clients, e.g. programs that open a window on your display, connect\n"
"to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -859,13 +813,13 @@
"Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>"
msgstr "<P>Clientes X Window, por exemplo, programas que abrem uma janela de exibição, conectam no servidor X que executa na máquina física. Programas podem também ser executados em sistemas diferentes e podem exibir o conteúdo do servidor X através da rede.</P><P>Quando habilitado, isto faz com que o servidor X escute na porta 6000 mais o número da tela. Como o tráfego de rede transferido não está criptografado, e, portanto, sujeito a sniffing de rede e, como outra porta aberta por um programa - neste caso, o servidor X - fornece opções de ataque, a configuração segura é desabilitar isto.</P><P>Para ter clientes X Window através da rede, é recomendada a utilização de um shell seguro (<EM>ssh</EM>), que permite que clientes conectem-se ao servidor X através da conexão ssh criptografada.</P>"
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
msgid ""
"<P>The email delivery subsystem is always started. However, it does not expose\n"
"itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
msgstr "<P>O subsistema de entrega de e-mail sempre é iniciado. Entretanto, ele não se expõe externamente ao sistema por padrão porque ele não escuta a porta 25 da rede SMTP.</P><P>Se você não quiser entregar e-mails para o seu sistema através do protocolo SMTP, desabilite esta opção.</P>"
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"updated, the service is restarted after the files in the package have been\n"
@@ -877,7 +831,7 @@
"reason to do so.</P>"
msgstr "<P>Se um pacote contendo um serviço em execução estiver sendo atualizado, o serviço é reiniciado depois que os arquivos do pacote forem instalados.</P><P>Isso faz sentido na maioria dos casos, e é seguro fazer isso, considerando que muitos serviços precisam dos seus binários disponíveis no sistema de arquivos ou em seus arquivos de configuração. Esses serviços continuariam em execução até que fossem parados. Por exemplo, os daemons em execução fossem interrompidos.</P><P>Essa definição deve ser alterada apenas se houver uma razão específica.</P>"
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"uninstalled, the service is stopped before the files of the package are\n"
@@ -889,38 +843,139 @@
"reason to do so.</P>"
msgstr "<P>Se um pacote contendo um serviço em execução estiver sendo removido, o serviço é parado antes dos arquivos do pacote serem removidos.</P><P> Isso faz sentido na maioria dos casos, e é seguro fazer isso, considerando que muitos serviços precisam dos seus binários acessíveis no sistema de arquivos ou em seus arquivos de configuração. Esses serviços continuariam em execução até que fossem parados. Por exemplo, os daemons em execução fossem interrompidos.</P><P>Essa definição deve ser alterada apenas se houver alguma razão especifica. </P>"
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
msgstr "<P> Um sistema pode ser sobrecarregado com inúmeras tentativas de conexões de forma que o sistema fique sem memória, vulnerabilidade conhecida como (DoS - Denial of Service) Ataque de Negação de Serviço.</P><P>O uso de syncookies é um método que pode ajudá-lo em situações como esta, mas uma configuração com um grande número de tentativas de conexões legítimas a partir de uma origem <EM> Habilitada</EM> pode trazer problemas com a negação de conexões TCP quando a carga estiver alta.</P><P>Ainda assim, para a maioria dos ambientes, o syncookie é a primeira linha de defesa contra ataques SYN flood DoS, então a configuração segura é <EM>Habilitada</EM>.</P>"
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
msgstr "<P>Encaminhamento IP significa encaminhar os pacotes que foram recebidos pela rede, mas que não são destinados a nenhuma das interfaces de rede configuradas no sistema. Por exemplo, endereços da interface de rede.</P><P>Se um sistema encaminha o tráfego de rede na camada 3 ISO/OSI, ele é chamado de roteador. Se você não precisa da funcionalidade de roteador, desabilite esta opção.</P>"
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr "<p>Estas configurações se aplicam apenas para o <EM>IPv4</EM>.</p>"
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr "<P>Estas configurações se aplicam apenas para o <EM>IPv6</EM>.</P>"
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
msgstr "<P>As teclas mágicas SysRq habilitam alguns controles sobre o sistema se ele falhar (por exemplo, durante a depuração do kernel) ou se o sistema não estiver respondendo.</P>"
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>"
msgstr "<P> Há pré-definições de segurança nos arquivos /etc/permissions.*. A permissão de arquivo mais restritiva é definida como 'secure' ou 'paranoid'.</P>"
-#: src/include/security/helps.rb:349
+#: src/include/security/helps.rb:330
msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>"
msgstr "<P>Serviços básicos do sistema devem ser habilitados para prover consistência ao sistema e executar os serviços relacionados à segurança.</P>"
-#: src/include/security/helps.rb:352
+#: src/include/security/helps.rb:333
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 "<P>Todo serviço em execução é um alvo em potencial de um ataque de segurança. Portanto, é recomendado desabilitar todos os serviços que não estão sendo usados pelo sistema.</P>"
+#: src/include/security/helps.rb:341
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>Segurança da Inicialização</big></b></p>\n"
+"<p>Nesta caixa de diálogo, altere várias configurações de inicialização relacionadas à segurança.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Interpretação de Ctrl + Alt + Del</b>:\n"
+"Configure o que o sistema deve fazer em resposta a\n"
+"alguém no console pressionando a combinação de teclas\n"
+"CTRL + ALT + DEL. Em geral, o sistema é reinicializado. Algumas vezes convém ignorar\n"
+"esse evento, por exemplo, quando o sistema funciona como \n"
+"estação de trabalho e servidor.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Interpretação de Ctrl + Alt + Del</b>:\n"
+"Configure o que o sistema deve fazer em resposta a\n"
+"alguém no console pressionando a combinação de teclas\n"
+"CTRL + ALT + DEL. Em geral, o sistema é reinicializado. Algumas vezes convém ignorar\n"
+"esse evento, por exemplo, quando o sistema funciona como \n"
+"estação de trabalho e servidor.</p>"
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+"<p><b>Interpretação de Ctrl + Alt + Del</b>:\n"
+"Configure o que o sistema deve fazer em resposta a\n"
+"alguém no console pressionando a combinação de teclas\n"
+"CTRL + ALT + DEL. Em geral, o sistema é reinicializado. Algumas vezes convém ignorar\n"
+"esse evento, por exemplo, quando o sistema funciona como \n"
+"estação de trabalho e servidor.</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+#, fuzzy
+#| msgid ""
+#| "<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+#| "Set who is allowed to shut down the machine from KDM.</p>\n"
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+"<p><b>Comportamento de desligamento do gerenciador de login</b>:\n"
+"Defina quem tem permissão de desligar a máquina a partir do KDM.</p>\n"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+"<p><b>Sistema de hibernação</b>:\n"
+"Configure as condições para permitir que usuários possam usar o modo de hibernação. Por padrão, usuários no console\n"
+"ativo possuem esse direito. Outras opções são permitir a ação para qualquer usuário ou exigir autenticação em todos os casos.</p>\n"
+
#. level name
#: src/include/security/levels.rb:54
#, fuzzy
@@ -988,163 +1043,238 @@
"O ID de grupo mínimo não pode ser maior que o\n"
"máximo."
-#. ComboBox label
-#: src/include/security/widgets.rb:100
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "&Interpretação de Ctrl + Alt + Del"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
+#. 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: include/security/widgets.ycp
+#. * Module: Security configuration
+#. * Summary: Security widgets definitions
+#. * Authors: Michal Svec <msvec(a)suse.cz>
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
msgid "Ignore"
msgstr "Ignorar"
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
msgid "Reboot"
msgstr "Reiniciar"
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
msgid "Halt"
msgstr "Desligar"
+#: src/include/security/widgets.rb:93
+msgid "Only root"
+msgstr "Somente root"
+
+#: src/include/security/widgets.rb:94
+msgid "All Users"
+msgstr "Todos os Usuários"
+
+#: src/include/security/widgets.rb:95
+msgid "Nobody"
+msgstr "Ninguém"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "&Interpretação de Ctrl + Alt + Del"
+
#. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
msgid "Allow Remote &Graphical Login"
msgstr "Permitir Login Remoto &Gráfico"
#. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
msgid "&Magic SysRq Keys"
msgstr "Teclas &mágicas SysRq"
#. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
msgid "Disable"
msgstr "Desabilitar"
#. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
msgid "Enable All Functions"
msgstr "Habilitar todas as funções"
#. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
msgid "&Delay after Incorrect Login Attempt"
msgstr "Segundos para &Esperar Após Tentativa de Login Incorreta"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
msgid "Maxim&um"
msgstr "Máxim&o"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
msgid "M&inimum"
msgstr "&Mínimo"
#. ComboBox label
-#: src/include/security/widgets.rb:154
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "Comportamento de &desligamento do gerenciador de login KDM:"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-msgid "Only root"
-msgstr "Somente root"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-msgid "All Users"
-msgstr "Todos os Usuários"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-msgid "Nobody"
-msgstr "Ninguém"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
+#: src/include/security/widgets.rb:164
msgid "System Hybernation"
msgstr "Hibernação do sistema"
#. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
msgid "User on the active console"
msgstr "Usuário no console ativo"
#. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
msgid "Anyone can hibernate"
msgstr "Qualquer um pode hibernar"
#. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
msgid "Authentication always required"
msgstr "Autenticação sempre necessária"
#. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
msgid "P&assword Encryption Method"
msgstr "Método de Criptografia de Senh&a"
#. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
msgid "&Check New Passwords"
msgstr "&Verificar Novas Senhas"
#. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
msgid "Numb&er of Passwords to Remember"
msgstr "Núm&ero de Senhas a Memorizar"
#. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
msgid "&Minimum Acceptable Password Length"
msgstr "Tamanho &Mínimo Aceitável de Senha"
#. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
msgid "&Days before Password Expires Warning"
msgstr "&Dias Antes do Aviso de Vencimento de Senha"
#. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
msgid "&File Permissions"
msgstr "Per&missões de Arquivo"
#. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
msgid "Easy"
msgstr "Fácil"
#. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
msgid "Secure"
msgstr "Seguro"
#. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
msgid "Paranoid"
msgstr "Paranoico"
#. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
msgid "&User Launching updatedb"
msgstr "&Usuário Iniciando o updatedb"
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
msgid "Ma&ximum"
msgstr "Má&ximo"
#. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
msgid "&Minimum"
msgstr "&Mínimo"
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+#| msgid "&Shutdown Behaviour of KDM Login Manager:"
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "Comportamento de &desligamento do gerenciador de login KDM:"
+
#: src/include/security/wizards.rb:53
msgid "Predefined Security Configurations"
msgstr "Configurações de Segurança Pré-definidas"
@@ -1160,62 +1290,62 @@
msgstr "Inicializando..."
#. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
msgid "Saving Security Configuration"
msgstr "Salvando a configuração de segurança"
#. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
msgid "Write security settings"
msgstr "Salvar as configurações de segurança"
#. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
msgid "Write inittab settings"
msgstr "Salvar as configurações do inittab"
#. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
msgid "Write PAM settings"
msgstr "Salvar as configurações PAM"
#. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
msgid "Update system settings"
msgstr "Atualizar as configurações do sistema"
#. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
msgid "Writing security settings..."
msgstr "Salvando as configurações de segurança..."
#. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
msgid "Writing inittab settings..."
msgstr "Salvando as configurações do inittab..."
#. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
msgid "Writing PAM settings..."
msgstr "Salvando as configurações PAM..."
#. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
msgid "Updating system settings..."
msgstr "Atualizando as configurações do sistema..."
#. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
msgid "Finished"
msgstr "Concluído"
#. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
msgid "Current Security Level: Custom settings"
msgstr "Nível de segurança atual: configurações personalizadas"
#. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
msgid "Current Security Level: %1"
msgstr "Nível de segurança atual: %1"
Modified: trunk/yast/pt_BR/po/services-manager.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/services-manager.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/services-manager.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-10-02 17:23-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -304,11 +304,11 @@
#. 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
+#: src/modules/services_manager_service.rb:415
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr ""
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
#, fuzzy
#| msgid "%1: Could not change state of the device"
msgid "Could not %{change} %{service}. "
Modified: trunk/yast/pt_BR/po/snapper.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/snapper.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/snapper.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-31 11:02UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -53,136 +53,136 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
msgid "Description"
msgstr "Descrição"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
msgid "User data"
msgstr "Dados do usuário"
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
msgid "Cleanup algorithm"
msgstr "Algoritmo de limpeza"
#. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
+#: src/include/snapper/dialogs.rb:161
msgid "Modify Snapshot %{num}"
msgstr "Modificar snapshot %{num}"
#. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
+#: src/include/snapper/dialogs.rb:167
msgid "Modify Snapshot %{pre} and %{post}"
msgstr "Modificar snapshots %{pre} e %{post}"
#. label
-#: src/include/snapper/dialogs.rb:161
+#: src/include/snapper/dialogs.rb:169
msgid "Pre (%{pre})"
msgstr "Pre (%{pre})"
#. label
-#: src/include/snapper/dialogs.rb:165
+#: src/include/snapper/dialogs.rb:173
msgid "Post (%{post})"
msgstr "Post (%{post})"
#. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:250
msgid "Create New Snapshot"
msgstr "Criar novo snapshot"
#. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:263
msgid "Single snapshot"
msgstr "Snapshot single"
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
msgid "Pre"
msgstr "Pre"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:282
msgid "Post, paired with:"
msgstr "Post, pareado com:"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:358
#, fuzzy
#| msgid "Really delete snapshot '%1'?"
msgid "Really delete snapshot %{num}?"
msgstr "Realmente remover o snapshot '%1'?"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
+#: src/include/snapper/dialogs.rb:365
#, fuzzy
#| msgid "Really delete snapshot '%1'?"
msgid "Really delete snapshots %{pre} and %{post}?"
msgstr "Realmente remover o snapshot '%1'?"
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:380
msgid "Snapshots"
msgstr "Snapshots"
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:409
msgid "Single"
msgstr "Single"
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:434
msgid "Pre & Post"
msgstr "Pre & Post"
#. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:469
msgid "Reading list of snapshots..."
msgstr "Lendo a lista de snapshots..."
#. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:485
msgid "Current Configuration"
msgstr "Configuração atual"
#. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:496
msgid "ID"
msgstr "ID"
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:497
msgid "Type"
msgstr "Tipo"
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:498
msgid "Start Date"
msgstr "Data de Início"
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:499
msgid "End Date"
msgstr "Data de Término"
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:501
msgid "User Data"
msgstr "Dado de Usuário"
#. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:507
msgid "Show Changes"
msgstr "Mostrar Mofificações"
#. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:510
msgid "Modify"
msgstr "Modificar"
#. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:553
msgid ""
"This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
"Showing differences is not possible."
@@ -191,131 +191,131 @@
"A exibição das diferenças não é possível."
#. dialog caption
-#: src/include/snapper/dialogs.rb:634
+#: src/include/snapper/dialogs.rb:638
msgid "Selected Snapshot Overview"
msgstr "Visão geral do snapshot"
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:670
msgid "%1: %2"
msgstr "%1: %2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:689
msgid "Calculating changed files..."
msgstr "Calculando os arquivos alterados..."
#. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:699
msgid "Calculating file modifications..."
msgstr "Calculando alterações do arquivo..."
#. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:707
msgid "New file was created."
msgstr "O novo arquivo foi criado."
#. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:711
msgid "File was removed."
msgstr "O arquivo foi removido."
#. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:716
msgid "File content was not changed."
msgstr "O conteúdo do arquivo não foi alterado."
#. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:722
msgid "File does not exist in either snapshot."
msgstr "O arquivo não existe em nenhum snapshot."
#. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:728
msgid "File content was modified."
msgstr "O conteúdo do arquivo foi alterado."
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:738
msgid "File mode was changed from '%1' to '%2'."
msgstr "O modo de arquivo foi alterado de '%1' para '%2'."
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:753
msgid "File user ownership was changed from '%1' to '%2'."
msgstr "O proprietário do arquivo foi alterado de '%1' para '%2'."
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:769
msgid "File group ownership was changed from '%1' to '%2'."
msgstr "O grupo do arquivo foi alterado de '%1' para '%2'."
#. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:786
msgid "R&estore from First"
msgstr "R&estaurar a partir do primeiro"
#. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:788
msgid "Restore"
msgstr "Restaurar"
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:811
msgid "Res&tore from Second"
msgstr "Res&taurar a partir do segundo"
#. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:848
msgid "Show the difference between snapshot and current system"
msgstr "Exibir a diferença entre o snapshot e o sistema atual"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:860
msgid "Show the difference between current and selected snapshot:"
msgstr "Exibir a diferença entre o snapshot atual e o selecionado:"
#. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:907
msgid "Show the difference between first and second snapshot"
msgstr "Exibir a diferença entre o primeiro e o segundo snapshot"
#. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:918
msgid "Show the difference between first snapshot and current system"
msgstr "Exibir a diferença entre o primeiro snapshot e o sistema atual"
#. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:929
msgid "Show the difference between second snapshot and current system"
msgstr "Exibir a diferença entre o segundo snapshot e o sistema atual"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:954
+#: src/include/snapper/dialogs.rb:958
msgid "Time of taking the snapshot:"
msgstr "Horário de tomada do snapshot:"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:966
msgid "Time of taking the first snapshot:"
msgstr "Horário de tomada do primeiro snapshot:"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:971
msgid "Time of taking the second snapshot:"
msgstr "Horário de tomada do segundo snapshot:"
#. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:994
msgid "&Open"
msgstr "&Abrir"
#. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1040
msgid "Restore Selected"
msgstr "Restaurar os selecionados"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1125
msgid ""
"Do you want to delete the file\n"
"\n"
@@ -331,7 +331,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:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -346,19 +346,19 @@
"do snapshot '%2' para o sistema atual?"
#. popup message
-#: src/include/snapper/dialogs.rb:1187
+#: src/include/snapper/dialogs.rb:1191
#, fuzzy
#| msgid "No file was selected for restoring"
msgid "No file was selected for restoring."
msgstr "Nenhum arquivo foi selecionado para restauração."
#. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1201
msgid "Restoring files"
msgstr "Restaurando arquivos"
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1204
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
Modified: trunk/yast/pt_BR/po/storage.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/storage.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/storage.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-10-30 10:50-0200\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -102,8 +102,7 @@
# FIXME! Reused old trans intentionally!
# FIXME!
#. popup text
-#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -182,7 +181,13 @@
msgid "Not enough space available to propose separate /home."
msgstr "Sem espaço em disco disponível para propor a partição /home separada."
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
+#, fuzzy
+#| msgid "Nothing assigned as root filesystem!"
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr "Nada atribuído como sistema de arquivos raiz!"
+
+#: src/clients/inst_disk_proposal.rb:304
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -969,7 +974,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6272
msgid "Propose Separate &Home Partition"
msgstr "Propor Partição &Home Separada"
@@ -987,7 +992,7 @@
msgstr "Tipo de proposta"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -1002,7 +1007,7 @@
"Realmente usar esta configuração?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -1018,7 +1023,7 @@
"Realmente usar esta configuração?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1034,7 +1039,7 @@
"Realmente usar esta configuração?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1051,7 +1056,7 @@
#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1061,7 +1066,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -1082,7 +1087,7 @@
"Realmente usar esta configuração?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
@@ -1097,7 +1102,7 @@
"Realmente manter este tamanho da partição de inicialização?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
#, fuzzy
#| msgid ""
#| "Warning: There is no partition of type bios_grub present.\n"
@@ -1119,7 +1124,7 @@
#. 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:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
#, fuzzy
#| msgid ""
#| "Warning: There is no partition mounted as /boot.\n"
@@ -1146,7 +1151,7 @@
"Realmente usar a configuração sem a partição /boot?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1166,11 +1171,17 @@
"\n"
"Realmente usar esta configuração?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
+#, fuzzy
+#| msgid ""
+#| "Warning: Some subvolumes of the root filesystem are shadowed by\n"
+#| "mount points of other filesystem. This could lead to problems.\n"
+#| "\n"
+#| "Really use this setup?\n"
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
"Really use this setup?\n"
msgstr ""
"Aviso: alguns subvolumes do sistema de arquivos raiz estão ocultos\n"
@@ -1321,7 +1332,7 @@
"Realmente manter a partição não formatada?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1330,7 +1341,7 @@
"Remova-o do RAID antes de editá-lo.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1339,7 +1350,7 @@
"Remova-o do grupo de volume antes de editá-lo.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1348,7 +1359,7 @@
"Remova o volume antes de editá-lo.\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1357,7 +1368,7 @@
"Remova-o do RAID antes de removê-lo.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1365,12 +1376,12 @@
"O dispositivo (%2) é usado por %1.\n"
"Remova %1 antes de removê-lo.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
msgid "It cannot be deleted while mounted."
msgstr "O disco não pode ser removido enquanto estiver montado."
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
@@ -1379,7 +1390,7 @@
"e uma outra partição lógica com um número maior está sendo usada.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
@@ -1392,7 +1403,7 @@
"Escolha Cancelar, a menos que você saiba exatamente o que está fazendo.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1407,7 +1418,7 @@
"antes de remover a partição estendida.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1422,7 +1433,7 @@
"a partição estendida.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1441,13 +1452,13 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6400
msgid "Do not forget what you enter here!"
msgstr "Não se esqueça do que digitou aqui!"
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
msgid "Empty password allowed."
msgstr "É permitido uma senha vazia."
@@ -1476,7 +1487,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
msgid "&Enter a Password for your File System:"
msgstr "&Digite a senha para o seu sistema de arquivos:"
@@ -1487,7 +1498,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:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
msgid "Reenter the Password for &Verification:"
msgstr "Digite novamente a senha para &verificação:"
@@ -1510,7 +1521,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1521,7 +1532,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1879,7 +1890,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6253
msgid "Enable Snapshots"
msgstr "Habilitar snapshots"
@@ -1894,7 +1905,7 @@
msgid "Empty subvolume name not allowed."
msgstr "Não é permitido um nome vazio de subvolume."
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
@@ -1902,11 +1913,11 @@
"Somente nomes de subvolume começando com \"%1\" estão atualmente permitidos!\n"
"Anexando automaticamente ao início \"%1\" no nome do subvolume."
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
msgid "Subvolume name %1 already exists."
msgstr "O nome do subvolume %1 já existe."
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
msgid "Modifications done so far in this dialog will be lost."
msgstr "As alterações realizadas até agora serão perdidas."
@@ -1949,7 +1960,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1968,7 +1979,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -1987,7 +1998,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2019,7 +2030,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2229,7 +2240,7 @@
"a um dispositivo com sistema de arquivos não existente ou desconhecido."
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
msgid ""
"\n"
"WARNING:\n"
@@ -2253,12 +2264,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
msgid "The file system is currently mounted on %1."
msgstr "O sistema de arquivos está atualmente montado em %1."
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2268,12 +2279,12 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
msgid "Unmount"
msgstr "Desmontar"
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2281,15 +2292,15 @@
"Você pode tentar desmontá-lo agora ou cancelar.\n"
"Clique em Cancelar ao menos que saiba exatamente o que está fazendo."
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "Não é possível diminuir o sistema de arquivos enquanto ele estiver montado."
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
msgid "It is not possible to extend the file system while it is mounted."
msgstr "Não é possível estender o sistema de arquivos enquanto ele estiver montado."
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
msgid "It is not possible to resize the file system while it is mounted."
msgstr "Não é possível redimensionar o sistema de arquivos enquanto ele estiver montado."
@@ -2571,11 +2582,9 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:40
-#: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61
-#: src/include/partitioning/ep-loop.rb:37
-#: src/include/partitioning/ep-lvm.rb:64
-#: src/include/partitioning/ep-raid.rb:38
+#: src/include/partitioning/ep-btrfs.rb:40 src/include/partitioning/ep-dm.rb:36
+#: src/include/partitioning/ep-hd.rb:61 src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38
msgid "Edit"
msgstr "Editar"
@@ -2606,9 +2615,8 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:45
-#: src/include/partitioning/ep-hd.rb:43 src/include/partitioning/ep-hd.rb:64
-#: src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-btrfs.rb:45 src/include/partitioning/ep-hd.rb:43
+#: src/include/partitioning/ep-hd.rb:64 src/include/partitioning/ep-loop.rb:37
#: src/include/partitioning/ep-lvm.rb:44 src/include/partitioning/ep-lvm.rb:66
#: src/include/partitioning/ep-raid.rb:40
#: src/include/partitioning/ep-tmpfs.rb:36
@@ -2630,8 +2638,7 @@
#: src/include/partitioning/ep-btrfs.rb:140
#: src/include/partitioning/ep-btrfs.rb:205
#: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86
-#: src/include/partitioning/ep-loop.rb:54
-#: src/include/partitioning/ep-lvm.rb:86
+#: src/include/partitioning/ep-loop.rb:54 src/include/partitioning/ep-lvm.rb:86
#: src/include/partitioning/ep-raid.rb:59
msgid "Edit..."
msgstr "Editar..."
@@ -2648,8 +2655,7 @@
#. push button text
#: src/include/partitioning/ep-btrfs.rb:145
#: src/include/partitioning/ep-hd.rb:92 src/include/partitioning/ep-loop.rb:56
-#: src/include/partitioning/ep-lvm.rb:90
-#: src/include/partitioning/ep-raid.rb:63
+#: src/include/partitioning/ep-lvm.rb:90 src/include/partitioning/ep-raid.rb:63
#: src/include/partitioning/ep-tmpfs.rb:112
#: src/include/partitioning/ep-tmpfs.rb:170
msgid "Delete..."
@@ -2713,32 +2719,39 @@
msgstr "<p>Escolha a função do dispositivo.</p>"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
+#, fuzzy
+#| msgid "Format partition"
+msgid "EFI Boot Partition"
+msgstr "Formatar a partição"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
msgid "Operating System"
msgstr "Sistema operacional"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
msgid "Data and ISV Applications"
msgstr "Dados a aplicações ISV"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
msgid "Swap"
msgstr "Swap"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
msgid "Raw Volume (unformatted)"
msgstr "Volume bruto (não formatado)"
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
msgid "Role"
msgstr "Função"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
msgid ""
"<p>First, choose whether the partition should be\n"
"formatted and the desired file system type.</p>"
@@ -2747,7 +2760,7 @@
"e escolha o tipo de sistema de arquivos.</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2758,7 +2771,7 @@
"um volume existente excluirá todos os dados nele contidos.</p>\n"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
msgid ""
"<p>Then, choose whether the partition should\n"
"be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>"
@@ -2767,47 +2780,47 @@
"e seu ponto de montagem ( /, /boot, /home, /var, etc.)</p>"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
msgid "Formatting Options"
msgstr "Opções de formatação"
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
msgid "Format partition"
msgstr "Formatar a partição"
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
msgid "Do not format partition"
msgstr "Não formatar a partição"
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
msgid "Do not mount partition"
msgstr "Não montar partição"
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
msgid "Mounting Options"
msgstr "Opções de montagem"
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
msgid "Mount partition"
msgstr "Montar partição"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "Ponto de Montagem"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
msgid "Fs&tab Options..."
msgstr "Opções do Fs&tab..."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
msgid "Crypt files must be encrypted."
msgstr "Os arquivos crypt devem ser criptografados."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2820,17 +2833,17 @@
"Também verifique a opção de formatação.\n"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
msgid "Crypt files require a mount point."
msgstr "Os arquivos crypt necessitam de um ponto de montagem."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
msgid "Tmpfs requires a mount point."
msgstr "Os tmpfs necessitam de um ponto de montagem."
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2845,7 +2858,7 @@
"</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2859,21 +2872,21 @@
"(suspender para o disco).\n"
"</p>\n"
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
msgid "All data stored on the volume will be lost!"
msgstr "Todos os dados armazenado no volume serão perdidos!"
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
msgid "Password"
msgstr "Senha"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
msgid "Resize not supported by underlying device."
msgstr "Redimensionamento não é uma operação suportada pelo dispositivo subjacente."
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -2883,7 +2896,7 @@
"Você não pode redimensionar a partição selecionada porque o sistema de arquivos\n"
"nessa partição não suporta redimensionamento.\n"
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
msgid ""
"It is not possible to check whether a NTFS\n"
"can be resized while it is mounted."
@@ -2892,7 +2905,7 @@
"pode ser redimensionada enquanto estiver montada."
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
@@ -2901,21 +2914,21 @@
"pois o sistema de arquivos parece estar inconsistente.\n"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
msgid "Resize Partition %1"
msgstr "Redimensionar Partição %1"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
msgid "Resize Logical Volume %1"
msgstr "Redimensionar Volume Lógico %1"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
msgid "Current size: %1"
msgstr "Tamanho atual: %1"
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
msgid "Currently used: %1"
msgstr "Atualmente usado: %1"
@@ -2923,8 +2936,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2936,33 +2949,33 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
msgid "Maximum Size (%1)"
msgstr "Tamanho Máximo (%1)"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
msgid "Minimum Size (%1)"
msgstr "Tamanho mínimo (%1)"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
msgid "Custom Size"
msgstr "Tamanho personalizado"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
msgid "<p>Choose new size.</p>"
msgstr "<p>Escolha o novo tamanho.</p>"
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2972,7 +2985,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -2985,12 +2998,12 @@
"da tarefa de redimensionar."
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
msgid "Output of %1"
msgstr "Saída de %1"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
msgid "Rescanning disks..."
msgstr "Lendo novamente os discos..."
@@ -3182,50 +3195,50 @@
msgstr "A região informada não é válida."
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
msgid "Add Partition on %1"
msgstr "Adicionar Partição em %1"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
msgid "Edit Partition %1"
msgstr "Editar Partição %1"
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
msgid "No space to moved partition %1."
msgstr "Nenhum espaço para a partição movida %1."
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
msgid "Move partition %1 forward?"
msgstr "Mover a partição %1 para frente?"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
msgid "Move partition %1 backward?"
msgstr "Mover a partição %1 para trás?"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
msgid "Move partition %1?"
msgstr "Mover a partição %1?"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
msgid "Forward"
msgstr "Encaminhar"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
msgid "Backward"
msgstr "Para trás"
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
msgid "Confirm Deleting of All Partitions"
msgstr "Confirmar a remoção de todas as partições"
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
msgid ""
"The disk \"%1\" contains at least one partition.\n"
"If you proceed, the following partitions will be deleted:"
@@ -3233,30 +3246,35 @@
"O disco \"%1\" contém ao menos uma partição.\n"
"Se você continuar, as seguintes partições serão removidas:"
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
msgid "Really delete all partitions on \"%1\"?"
msgstr "Realmente remover todas as partições em \"%1\"?"
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
msgid "No hard disk selected."
msgstr "Nenhum disco rígido selecionado."
#. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
msgid "The disk is in use and cannot be modified."
msgstr "Este disco está em uso e não pode ser modificado."
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
msgid "Select new partition table type for %1."
msgstr "Selecione o novo tipo de tabela de partição para %1."
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
@@ -3265,29 +3283,29 @@
"em %1 e todos os RAIDs e grupos de volume que utilizam partições em %1."
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
msgid "No disk selected."
msgstr "Nenhum disco selecionado."
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
msgid "Really delete BIOS RAID %1?"
msgstr "Realmente remover o RAID BIOS %1?"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
msgid "Really delete Partitioned RAID %1?"
msgstr "Realmente remover o RAID particionado %1?"
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
msgid "There are no partitions to delete on this disk."
msgstr "Não existem partições para remover neste disco."
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
msgid "It is not possible to create a partition on %1."
msgstr "Não foi possível criar uma partição em %1."
@@ -3295,15 +3313,15 @@
#. error popup
#. error popup
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
msgid "No partition selected."
msgstr "Nenhuma partição selecionada."
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
msgid ""
"The partition %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
@@ -3312,12 +3330,12 @@
"ser editada. Para editar %1, tenha certeza de que ela não está em uso."
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
msgid "An extended partition cannot be edited."
msgstr "Uma partição estendida não pode ser editada."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
msgid ""
"The partition %1 is already created on disk\n"
"and cannot be moved."
@@ -3326,12 +3344,12 @@
"e não pode ser movida."
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
msgid "An extended partition cannot be moved."
msgstr "Uma partição estendida não pode ser movida."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
msgid ""
"The partition %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
@@ -3340,12 +3358,12 @@
"redimensionada. Para redimensionar %1, tenha certeza de que ela não está sendo usada."
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
msgid "An extended partition cannot be resized."
msgstr "Uma partição estendida não pode ser redimensionada."
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -3361,7 +3379,7 @@
"partições. Após a duplicação, estas partições\n"
"serão removidas.</p>\n"
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
@@ -3369,11 +3387,11 @@
"As seguintes partições serão removidas\n"
"e todos os seus dados serão perdidos:"
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
msgid "Really delete these partitions?"
msgstr "Realmente remover estas partições?"
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
msgid ""
"There are no partitions on this disk, but a clonable\n"
"disk must have at least one partition.\n"
@@ -3383,7 +3401,7 @@
"duplicável deve ter pelo menos uma partição.\n"
"Crie algumas partições antes de duplicar o disco.\n"
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
msgid ""
"This disk cannot be cloned. There are no suitable\n"
"disks that could have the same partitioning layout."
@@ -3391,20 +3409,20 @@
"Este disco não pode ser duplicado. Não existem discos\n"
"apropriados com o mesmo layout de particionamento."
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
msgid "Clone partition layout of %1"
msgstr "Duplicar o layout de partição de %1"
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
msgid "Available target disks:"
msgstr "Discos disponíveis como destino:"
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
msgid "Select a target disk for creating a clone"
msgstr "Selecione um disco de destino para criar um clone"
#. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
@@ -3413,7 +3431,7 @@
"Realmente executar dasdfmt no disco %1?\n"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3457,8 +3475,7 @@
msgstr "Mover"
#: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43
-#: src/include/partitioning/ep-lvm.rb:65
-#: src/include/partitioning/ep-raid.rb:39
+#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39
msgid "Resize"
msgstr "Redimensionar"
@@ -3557,8 +3574,7 @@
#. push button text
#. push button text
-#: src/include/partitioning/ep-hd.rb:496
-#: src/include/partitioning/ep-lvm.rb:213
+#: src/include/partitioning/ep-hd.rb:496 src/include/partitioning/ep-lvm.rb:213
#: src/include/partitioning/ep-lvm.rb:337
#: src/include/partitioning/ep-tmpfs.rb:110
msgid "Add..."
@@ -3675,11 +3691,11 @@
msgstr "Senha incorreta fornecida."
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
msgid "Confirm Deleting Partition Used by LVM"
msgstr "Confirmar a remoção da partição usada pelo LVM"
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
msgid ""
"The selected partition is used by volume group \"%1\".\n"
"To keep the system in a consistent state, the following volume group\n"
@@ -3689,15 +3705,15 @@
"Para manter o sistema num estado consistente, o seguinte grupo de volume\n"
"e seus volumes lógicos serão removidos:\n"
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr "Remover partição \"%1\" e grupo de volume \"%2\" agora?"
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
msgid "Confirm Deleting Partition Used by RAID"
msgstr "Confirmar a remoção da partição usada pelo RAID"
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
"To keep the system in a consistent state, the following\n"
@@ -3707,24 +3723,24 @@
"Para manter o sistema em um estado consistente, o seguinte\n"
"dispositivo RAID será removido:\n"
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "Remover a partição \"%1\" e o RAID \"%2\" agora?"
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
msgid "Really delete all partitions on %1?"
msgstr "Realmente remover todas as partições em %1?"
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
msgid "Really delete %1?"
msgstr "Realmente remover %1?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -3734,7 +3750,7 @@
#. Guarantee some minimal share (1%) of total graph width to the segment.
#. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
msgid "Unpartitioned"
msgstr "Não particionado"
@@ -3742,33 +3758,33 @@
#. or the end of the disk if
#. 1. end +1th cyl is not the next one
#. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
msgid "Unallocated"
msgstr "Não alocado"
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
msgid "<p>No changes to partitioning.</p>"
msgstr "<p>Nenhuma alteração no particionamento.</p>"
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
msgid "<p>Changes to partitioning:</p>"
msgstr "<p>Alteração no particionamento:</p>"
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
msgid "<p>No changes to storage settings.</p>"
msgstr "<p>Nenhuma alteração nas configurações de armazenamento.</p>"
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
msgid "<p>Storage settings:</p>"
msgstr "<p>Configurações de armazenamento:</p>"
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
#, fuzzy
#| msgid "<p>Storage settings:</p>"
msgid "<p>Packages to install:</p>"
msgstr "<p>Configurações de armazenamento:</p>"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
#, fuzzy
#| msgid "<p>No changes to storage settings.</p>"
msgid "<p>No packages need to be installed.</p>"
@@ -3889,12 +3905,12 @@
"ou ative o indicador de criação."
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
msgid "Add Crypt File"
msgstr "Adicionar Arquivo Crypt"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
msgid "Edit Crypt File %1"
msgstr "Editar Arquivo Crypt %1"
@@ -4222,12 +4238,12 @@
msgstr "Used Pool"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
msgid "Add Logical Volume on %1"
msgstr "Adicionar Volume Lógico em %1"
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
msgid "Edit Logical Volume %1 on %2"
msgstr "Editar volume lógico %1 em %2"
@@ -4265,9 +4281,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
msgid "No logical volume selected."
msgstr "Nenhum volume lógico selecionado."
@@ -4277,7 +4293,7 @@
msgstr "Não há espaço disponível no grupo de volume \"%1\"."
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
msgid ""
"The volume %1 is a thin pool.\n"
"It cannot be edited."
@@ -4286,7 +4302,7 @@
"Não é possível editá-lo."
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
msgid ""
"The volume %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
@@ -4668,17 +4684,17 @@
msgstr "<p>Alterar os dispositivos utilizados para o RAID.</p>"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
msgid "Add RAID %1"
msgstr "Adicionar RAID %1"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
msgid "Resize RAID %1"
msgstr "Redimensionar RAID %1"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
msgid "Edit RAID %1"
msgstr "Editar RAID %1"
@@ -4973,7 +4989,7 @@
msgstr "<p>Esta visão exibe o resumo da instalação.</p>"
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
msgid "Add tmpfs Mount"
msgstr "Adicionar montagem tmpfs"
@@ -5833,19 +5849,62 @@
"somente quando realmente souber o que está fazendo.</p>\n"
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:937
+#, fuzzy
+#| msgid "Operation not permitted on disk %1.\n"
+msgid "Operation not permitted on disk %{device}.\n"
msgstr "Operação não permitida no disco %1.\n"
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:942
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The partitioning on your disk %1 is either not readable or not \n"
+#| "supported by the partitioning tool parted used to change the\n"
+#| "partition table.\n"
+#| "\n"
+#| "You can use the partitions on disk %1 as they are or\n"
+#| "format them and assign mount points, but you cannot add, edit, \n"
+#| "resize, or remove partitions from that disk here.\n"
msgid ""
"\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+"\n"
+"O particionamento no seu disco %1 ou não é reconhecido ou não é\n"
+"suportado pela ferramenta de particionamento parted, usada para\n"
+"alterar a tabela de partições.\n"
+"\n"
+"Você pode usar as partições do disco %1 como estão ou formatá-las\n"
+"e atribuir pontos de montagem, mas você não pode adicionar, editar,\n"
+"redimensionar nem remover partições desse disco aqui.\n"
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:954
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The partitioning on your disk %1 is either not readable or not \n"
+#| "supported by the partitioning tool parted used to change the\n"
+#| "partition table.\n"
+#| "\n"
+#| "You can use the partitions on disk %1 as they are or\n"
+#| "format them and assign mount points, but you cannot add, edit, \n"
+#| "resize, or remove partitions from that disk here.\n"
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
"supported by the partitioning tool parted used to change the\n"
"partition table.\n"
"\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
"format them and assign mount points, but you cannot add, edit, \n"
"resize, or remove partitions from that disk here.\n"
msgstr ""
@@ -5858,15 +5917,25 @@
"e atribuir pontos de montagem, mas você não pode adicionar, editar,\n"
"redimensionar nem remover partições desse disco aqui.\n"
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:966
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The disk %1 does not contain a partition table but for\n"
+#| "compatibility the kernel has automatically generated a\n"
+#| "partition spanning almost the entire disk.\n"
+#| "\n"
+#| "You can use the partition on disk %1 as it is or\n"
+#| "format it and assign a mount point, but you cannot resize\n"
+#| "or remove the partition from that disk here.\n"
msgid ""
"\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
"compatibility the kernel has automatically generated a\n"
"partition spanning almost the entire disk.\n"
"\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
"format it and assign a mount point, but you cannot resize\n"
"or remove the partition from that disk here.\n"
msgstr ""
@@ -5880,7 +5949,7 @@
"possível redimensionar ou remover a partição do disco aqui.\n"
#. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:982
msgid ""
"\n"
"\n"
@@ -5895,7 +5964,7 @@
"mas isto irá destruir todos os dados nas partições deste disco.\n"
#. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:992
msgid ""
"\n"
"\n"
@@ -5913,7 +5982,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
msgid "Resize Not Possible:"
msgstr "Não é Possível Redimensionar:"
@@ -5926,7 +5995,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:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5939,7 +6008,7 @@
"Talvez a senha de criptografia fornecida esteja incorreta.\n"
#. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5950,7 +6019,7 @@
"Tente novamente."
#. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5962,24 +6031,24 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
msgid "&Enter Encryption Password:"
msgstr "Digite a chave de cripto&grafia:"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
msgid "Provide Password"
msgstr "Informe a senha"
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
msgid "The following encrypted volumes are already available."
msgstr "Os seguintes volumes criptografados já estão disponíveis."
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
msgid "Encrypted Volume Activation"
msgstr "Ativação do Volume Criptografado"
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5991,12 +6060,12 @@
"As senhas devem ser conhecidas se os volumes são necessários em \n"
"uma atualização ou se eles contiverem um volume físico LVM."
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
msgid "Do you want to provide encryption passwords?"
msgstr "Você deseja fornecer senhas de criptografia?"
#. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6007,69 +6076,69 @@
"A senha será utilizada em todos os dispositivos."
#. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
msgid "Enter Encryption Password"
msgstr "Digite a chave de criptografia"
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
msgid "There are no encrypted volume to unlock."
msgstr "Não existem volumes criptografados para desbloquear."
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
msgid "Provide password for any of the following devices:"
msgstr "Forneça a senha para qualquer um dos seguintes dispositivos:"
#. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
msgid "Provide password for the following device:"
msgstr "Forneça a senha para o seguinte dispositivo:"
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
msgid "Trying to unlock encrypted volumes..."
msgstr "Tentando desbloquear volumes criptografados..."
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
msgid "Password did not unlock any volume."
msgstr "A senha não desbloqueou nenhum volume."
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
msgid "IDE Disk"
msgstr "Disco IDE"
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
msgid "SCSI Disk"
msgstr "Disco SCSI"
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
msgid "Disk"
msgstr "Disco"
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
msgid "DM RAID"
msgstr "DM RAID"
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
msgid "MD RAID"
msgstr "MD RAID"
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
msgid "Installing required packages failed."
msgstr "Falha ao instalar os pacotes requeridos."
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
msgid "Continue despite the error?"
msgstr "Continuar apesar do erro?"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr "Não é possível criar partições, pois outras partições do disco estão em uso."
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
@@ -6079,7 +6148,7 @@
"O dispositivo %1 não pode ser alterado pois contém troca ativada\n"
"necessária para executar a instalação.\n"
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
@@ -6089,7 +6158,7 @@
"O dispositivo %1 não pode ser alterado pois contém os dados\n"
"da instalação necessários para executar a instalação.\n"
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
@@ -6099,7 +6168,7 @@
"O dispositivo %1 não pode ser removido pois contém troca ativada\n"
"necessária para executar a instalação.\n"
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
@@ -6109,7 +6178,7 @@
"O dispositivo %1 não pode ser removido pois contém os dados\n"
"da instalação para executar a instalação.\n"
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6121,7 +6190,7 @@
"o dispositivo %2, que contém troca ativada necessária para executar \n"
"a instalação.\n"
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6133,7 +6202,7 @@
"a instalação.\n"
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6144,18 +6213,18 @@
"disco %2 estão usadas.\n"
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
msgid "Nothing assigned as root filesystem!"
msgstr "Nada atribuído como sistema de arquivos raiz!"
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
msgid "Installation will most certainly fail fatally!"
msgstr "A instalação muito provavelmente irá falhar fatalmente!"
#. 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:6032
+#: src/modules/Storage.rb:6042
msgid "Adding the following resolvables failed: %1"
msgstr "Falha ao adicionar os seguintes resolvíveis: %1"
@@ -6807,50 +6876,41 @@
"O subsistema de armazenamento está bloqueado pelo aplicativo \"%1\" (%2).\n"
"Você deve fechar o aplicativo antes de continuar."
-#. enable snapshots for root volume if desired
+#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr "Não foi possível redimensionar devido a inconsistências no sistema de arquivos. Tente verificar o sistema de arquivos no Windows."
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-msgid "Create &LVM-based Proposal"
-msgstr "Criar proposta baseada em &LVM"
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-msgid "Encr&ypt Volume Group"
-msgstr "&Criptografar grupo de volume "
-
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6239
msgid "File System for Root Partition"
msgstr "Sistema de arquivos para a partição raiz"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6286
msgid "File System for Home Partition"
msgstr "Sistema de arquivos para a partição home"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6304
msgid "Enlarge &Swap for Suspend"
msgstr "Aumentar &swap para suspensão"
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6314
msgid "Proposal Settings"
msgstr "Configurações recomendadas"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
+#: src/modules/StorageProposal.rb:6329
msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>\n"
-msgstr "<p>Para criar uma proposta baseada em LVM, escolha o botão correspondente.A proposta baseada em LVM pode ser criptografada.</p>\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
+msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6337
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"
@@ -6863,7 +6923,7 @@
"tamanho da partição raiz.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6346
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>"
@@ -6872,7 +6932,7 @@
"a partição home pode ser selecionado na caixa de seleção correspondente.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6325
+#: src/modules/StorageProposal.rb:6353
msgid ""
"<p>The swap partition can be made large enough to be used to suspend\n"
"the system to disk in most cases.</p>"
@@ -6880,22 +6940,41 @@
"<p>A partição swap pode ter o tamanho suficiente para ser utilizada na\n"
"suspensão do sistema para o disco na maioria dos casos.</p>"
-#: src/modules/StorageProposal.rb:6350
+#: src/modules/StorageProposal.rb:6378
msgid "Enter your password for the proposal encryption."
msgstr "Digite sua senha para a criptografia proposta."
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6385
msgid "Password:"
msgstr "Senha:"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6396
msgid "Reenter the password for verification:"
msgstr "Digite novamente a senha para verificação:"
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6594
+#, fuzzy
+#| msgid "&Partition Based"
+msgid "&Partition-based Proposal"
+msgstr "Baseado em &Partição"
+
+#: src/modules/StorageProposal.rb:6596
+#, fuzzy
+#| msgid "Create &LVM-based Proposal"
+msgid "&LVM-based Proposal"
+msgstr "Criar proposta baseada em &LVM"
+
+#: src/modules/StorageProposal.rb:6598
+#, fuzzy
+#| msgid "Create &LVM-based Proposal"
+msgid "&Encrypted LVM-based Proposal"
+msgstr "Criar proposta baseada em &LVM"
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -6939,6 +7018,14 @@
msgid "Visible Information on Storage Devices:"
msgstr "Informação visível nos dispositivos de armazenamento:"
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr "&Criptografar grupo de volume "
+
+#~ msgid ""
+#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+#~ "LVM-based proposal can be encrypted.</p>\n"
+#~ msgstr "<p>Para criar uma proposta baseada em LVM, escolha o botão correspondente.A proposta baseada em LVM pode ser criptografada.</p>\n"
+
#~ msgid "No unsaved changes exist."
#~ msgstr "Não existem alterações não salvas."
@@ -7179,9 +7266,6 @@
#~ msgid "Default Filesystem:"
#~ msgstr "Sistema de arquivos padrão:"
-#~ msgid "&Partition Based"
-#~ msgstr "Baseado em &Partição"
-
#~ msgid "&LVM Based"
#~ msgstr "Baseado em &LVM"
Modified: trunk/yast/pt_BR/po/update.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/update.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/update.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-31 11:04UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -432,7 +432,7 @@
msgstr "Nenhum desses arquivos existe: %1"
#. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -874,13 +874,13 @@
#. -----------------------------------------------------------------------
#. GLOBAL FUNCTIONS
#. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
msgid "Unknown Product"
msgstr "Produto desconhecido"
#. If the current default desktop is not installed, it's a valid use case
#. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
msgid ""
"Cannot select these patterns required for installation:\n"
"%{patterns}"
@@ -888,7 +888,7 @@
"Não foi possível selecionar estes padrões necessários para instalação:\n"
"%{patterns}"
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
msgid ""
"Cannot select these packages required for installation:\n"
"%{packages}"
Modified: trunk/yast/pt_BR/po/users.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/users.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/users.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-06-10 15:33-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -137,621 +137,6 @@
msgid "Do not ask for missing data; return error instead."
msgstr "Não perguntar por dados ausentes; ao invés, retornar um erro."
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-msgid "User Authentication Method"
-msgstr "Método de Autenticação do Usuário"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<b>Autenticação</b><br>\n"
-"Selecione o método de autenticação a ser usado pelos usuários do sistema.\n"
-"</p>"
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: 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>Selecione <b>Local</b> para autenticar usuários somente usando os arquivos locais <i>/etc/passwd</i> e <i>/etc/shadow</i>.</p>"
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr "Se houve uma instalação anterior ou um sistema alternativo, será possível criar usuários com base nesta origem. Para isso, selecione <b>Ler Dados do Usuário de Instalação Anterior</b>. Essa opção usa um diretório pessoal existente ou cria um novo para cada usuário na localização especificada para esta instalação."
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-msgid "&LDAP"
-msgstr "&LDAP"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-msgid "N&IS"
-msgstr "N&IS"
-
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "&Samba"
-
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-msgid "&Windows Domain"
-msgstr "Domínio do &Windows"
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-msgid "L&ocal (/etc/passwd)"
-msgstr "L&ocal (/etc/passwd)"
-
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-msgid "eDirectory LDAP"
-msgstr "LDAP do eDirectory"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Se você estiver usando um servidor NIS ou LDAP para armazenar dados de usuário ou se desejar\n"
-"autenticar usuários em um servidor NT, escolha o valor apropriado. Em seguida,\n"
-"pressione <b>Próximo</b> para continuar a configuração do cliente.</p>"
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Se estiver usando um servidor NIS ou LDAP para armazenar dados do usuário, escolha o\n"
-"valor apropriado. Em seguida, pressione <b>Próximo</b> para continuar a configuração do cliente.</p>"
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Se estiver usando um servidor LDAP para armazenar dados de usuário ou se desejar\n"
-"autenticar usuários em um servidor NT, escolha o valor apropriado. Em seguida,\n"
-"pressione <b>Próximo</b> para continuar a configuração do cliente.</p>"
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Se você estiver usando um servidor LDAP para armazenar dados do usuário, escolha o\n"
-"valor apropriado. Em seguida, pressione <b>Próximo</b> para continuar a configuração do seu cliente.</p>"
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr "<p>Marque <b>Configurar Autenticação Kerberos</b> para configurar o Kerberos após configurar a fonte de dados do usuário.</p>"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-msgid "&Read User Data from a Previous Installation"
-msgstr "&Ler Dados do Usuário de uma Instalação Anterior"
-
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-msgid "&Choose"
-msgstr "E&scolher"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-msgid "Authentication Method"
-msgstr "Método de Autenticação"
-
-#. check box label
-#: src/clients/inst_auth.rb:303
-msgid "Set Up &Kerberos Authentication"
-msgstr "Configurar Autenticação &Kerberos"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-msgid "&Select Users to Read"
-msgstr "&Selecionar Usuários para Ler"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-msgid "Select or Deselect &All"
-msgstr "Selecionar ou anular a seleção de &todos"
-
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-msgid "Password for the System Administrator \"root\""
-msgstr "Senha para o Administrador do Sistema \"root\""
-
-#. advise user to remember his new password
-#. advise users to remember their new password
-#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
-msgid "Do not forget what you enter here."
-msgstr "Não se esqueça do que informou aqui."
-
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-msgid "&Password for root User"
-msgstr "&Senha para o Usuário root"
-
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-msgid "Con&firm Password"
-msgstr "Con&firmar senha"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-msgid "&Test Keyboard Layout"
-msgstr "&Teste de Layout do Teclado"
-
-#. push button
-#: src/clients/inst_root.rb:119
-msgid "E&xpert Options..."
-msgstr "Opções A&vançadas..."
-
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Diferente dos usuários comuns do sistema, que gravam textos, criam\n"
-"gráficos ou navegam pela Internet, o usuário \"root\" existe em\n"
-"todos os sistemas e é solicitado sempre que\n"
-"tarefas administrativas precisam ser executadas. Efetue login como root\n"
-"somente quando precisar ser o administrador do sistema.\n"
-"</p>\n"
-
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Como o usuário root possui todas as permissões, a senha do\n"
-"\"root\" deve ser escolhida com cuidado. A combinação de letras e números\n"
-"é recomendada. Para garantir que a senha foi informada \n"
-"corretamente, informe novamente no segundo campo.\n"
-"</p>\n"
-
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Todas as regras para senhas de usuário se aplicam para o \"root\":\n"
-"Faça diferença entre maiúsculas e minúsculas. A senha deve ter no\n"
-"mínimo 5 caracteres e, como regra, não conter caracteres acentuados ou umlauts (ex: ä,ü).\n"
-"</p>\n"
-
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Não se esqueça da senha do \"root\".\n"
-"</p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-"<p>Se você planeja usar essa senha para criar certificados,\n"
-"ela deverá ter pelo menos %1 caracteres.</p>"
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr "<p>Para verificar se o layout atual do teclado está correto, tente digitar algum texto no campo <b>Teste de Layout de Teclado</b>.</p>"
-
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. 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: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."
-msgstr ""
-"As senhas não são iguais.\n"
-"Tente novamente."
-
-#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"Nenhuma senha digitada.\n"
-"Tente novamente. "
-
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"Se você planeja criar certificados,\n"
-"a senha deve ter pelo menos %1 caracteres."
-
-#. last part of message popup
-#. last part of message popup
-#. 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:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-msgid "Really use this password?"
-msgstr "Realmente usar esta senha?"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-"A senha do root não foi configurada.\n"
-"Provavelmente, você não conseguirá efetuar login.\n"
-"Tentar configurá-la novamente?\n"
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-msgid "Initialization of module for configuration of authentication..."
-msgstr "Inicialização do módulo para configuração de autenticação..."
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"O pacote '%1' não está instalado no sistema.\n"
-"Instalá-lo agora?\n"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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:93 src/clients/users_proposal.rb:57
-msgid "SHA-256"
-msgstr "SHA-256"
-
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59
-msgid "SHA-512"
-msgstr "SHA-512"
-
-#. frame label
-#: src/clients/inst_user_first.rb:143
-msgid "Password Encryption Type"
-msgstr "Tipo da Criptografia de Senha"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513
-msgid "&DES"
-msgstr "&DES"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: MD5-crypt
-#: 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:153 src/include/users/widgets.rb:520
-msgid "SHA-&256"
-msgstr "SHA-&256"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha512 crypt
-#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528
-msgid "SHA-&512"
-msgstr "SHA-&512"
-
-#. help text for dialog "User Authentication Method" 1/2
-#: src/clients/inst_user_first.rb:162
-msgid "<p><b>Authentication</b><br></p>"
-msgstr "<p><b>Autenticação</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "<p>Escolha o método de criptografia de senha para os usuários local e do sistema.</p>"
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: 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 "<p><b>SHA-512</b> é o método de hashing padrão atual. A utilização de outros algoritmos não é recomendada, exceto por compatibilidade.</p>"
-
-#. text entry
-#. text entry
-#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403
-msgid "User's &Full Name"
-msgstr "Nome &Completo do Usuário"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-msgid "&Username"
-msgstr "Nome de &usuário"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-msgid "U&se this password for system administrator"
-msgstr "U&sar esta senha para o administrador do sistema"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-msgid "Receive S&ystem Mail"
-msgstr "Receber e-mail do &sistema"
-
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-msgid "&Automatic Login"
-msgstr "Login a&utomático"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-msgid "Create New User"
-msgstr "Criar Novo Usuário"
-
-#. yes-no popup headline
-#. 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:342 src/include/users/dialogs.rb:1112
-msgid "Empty User Login"
-msgstr "Login de Usuário Vazio"
-
-#. yes-no popup contents
-#. yes-no popup contents
-#: 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"
-"Leave it empty?"
-msgstr ""
-"Deixar o nome de usuário vazio faz sentido somente\n"
-"em um ambiente de rede com um servidor de autenticação.\n"
-"Deixá-lo vazio?"
-
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: 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"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Digite o <b>Nome Completo do Usuário</b>, <b>Nome do Usuário</b> e <b>Senha</b> para\n"
-"atribuir a essa conta de usuário.\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ao digitar uma senha, faça a distinção entre maiúsculas e\n"
-"minúsculas. As senhas não devem conter caracteres especiais, como caracteres acentuados ou umlauts (ex: ä,ü). \n"
-"</p>\n"
-
-#. 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:457 src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Com a criptografia de senha atual (%1), o tamanho da senha deve ter entre\n"
-" %2 e %3 caracteres.\n"
-"</p>"
-
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>Se você planeja usar essa senha para criar certificados,\n"
-"ela deverá ter pelo menos %s caracteres.</p>"
-
-#. help text for main add user dialog
-#. help text 4/4
-#: 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"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Para garantir que a senha foi informada corretamente, repita\n"
-"exatamente no segundo campo. Não esqueça sua senha.\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: 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"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Para o <b>Nome do Usuário</b>, use somente letras (sem caracteres acentuados), dígitos e <tt>._-</tt>.\n"
-"Não use letras maiúsculas nessa entrada, a menos que saiba o que está fazendo.\n"
-"Nomes de usuário possuem mais restrições do que senhas. Você pode redefinir as\n"
-"restrições no arquivo /etc/login.defs. Leia seu manual para obter informações.\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: 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>Selecione <b>Usar esta senha para o administrador do sistema</b> se a mesma senha fornecida para o primeiro usuário deve ser utilizada para o 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: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"
-msgstr ""
-"<p>\n"
-"O nome de usuário e a senha criados aqui são necessários para efetuar login e trabalhar com o sistema Linux. Com o <b>Login automático</b> habilitado, o procedimento de login é pulado. Este usuário efetua o login automaticamente.</p>\n"
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: 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"
-msgstr ""
-"<p>\n"
-"Encaminhe mensagens do root para esse usuário marcando <b>Receber Mensagens do Sistema</b>.</p>\n"
-
-#. 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:573
-msgid "Expert Settings"
-msgstr "Configurações Avançadas"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-msgid "The authentication method is local /etc/passwd."
-msgstr "O método de autenticação local é o /etc/passwd"
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-msgid "The password encryption method is %s."
-msgstr "O método de criptografia de senha é %s."
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] "O usuário %s será importado."
-msgstr[1] "Os usuários %s serão importados."
-
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-msgid "&Change..."
-msgstr "A<erar..."
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-msgid "Summary"
-msgstr "Resumo"
-
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Se você planeja criar certificados,\n"
-"a senha deve ter pelo menos %s caracteres."
-
#. translators: command line help text for Users module
#: src/clients/users.rb:102
msgid "User configuration module"
@@ -873,11 +258,6 @@
msgid "New UID of the user"
msgstr "Novo UID do usuário"
-#. progress step title
-#: src/clients/users_finish.rb:63
-msgid "Writing Users Configuration..."
-msgstr "Salvando as Configurações dos Usuários..."
-
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -1132,93 +512,6 @@
msgid "Seconds"
msgstr "Segundos"
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr "NIS"
-
-#. authentication type
-#: src/clients/users_proposal.rb:46
-msgid "Samba (Windows Domain)"
-msgstr "Samba (domínio do Windows)"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-msgid "<%1>Root Password<%2> set"
-msgstr "<%1>Senha de Root<%2> configurada"
-
-#: src/clients/users_proposal.rb:74
-msgid "<%1>Root Password<%2> not set"
-msgstr "<%1>Senha de Root<%2> não configurada"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-msgid "No <%1>user<%2> configured"
-msgstr "Nenhum <%1> usuário<%2> configurado"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "<%1>Método de Autenticação<%2>: %3"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr "<%1>Método de autenticação<%2>: %3 e Kerberos."
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr "<%1>Usuários<%2> %3 selecionados para importação"
-
-#. summary line, <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-msgid "<%1>User<%2> %3 will be imported."
-msgstr "<%1>Usuário<%2> %3 será importado."
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-msgid "<%1>User<%2> %3 configured"
-msgstr "<%1>Usuário<%2> %3 configurado"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "<%1>Usuário<%2> %3 (%4) configurado"
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-msgid "Password Encryption Method: %1"
-msgstr "Método de criptografia de senha: %1"
-
-#. rich text label
-#: src/clients/users_proposal.rb:170
-msgid "User Settings"
-msgstr "Configurações do usuário"
-
-#. menu button label
-#: src/clients/users_proposal.rb:173
-msgid "&User"
-msgstr "&Usuário"
-
-#. menu button label
-#: src/clients/users_proposal.rb:175
-msgid "&Root Password"
-msgstr "Senha do &root"
-
#. password entering label
#: src/include/users/cmdline.rb:55
msgid "LDAP Server Password:"
@@ -1381,6 +674,24 @@
"as configurações de criptografia deste usuário,\n"
"digite a senha atual do usuário."
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:471
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"As senhas não são iguais.\n"
+"Tente novamente."
+
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -1411,6 +722,13 @@
msgstr "&Alterar dono do diretório"
#. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:583
+msgid "User's &Full Name"
+msgstr "Nome &Completo do Usuário"
+
+#. text entry
#: src/include/users/dialogs.rb:411
msgid "&First Name"
msgstr "&Primeiro nome "
@@ -1425,11 +743,30 @@
msgid "For remote users, only additional group memberships can be changed."
msgstr "Para usuários remotos, somente associações de grupos adicionais podem ser alteradas."
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:590
+msgid "&Username"
+msgstr "Nome de &usuário"
+
#. checkbox label
+#: src/include/users/dialogs.rb:446
+msgid "Receive S&ystem Mail"
+msgstr "Receber e-mail do &sistema"
+
+#. checkbox label
#: src/include/users/dialogs.rb:456
msgid "A&utomatic Login"
msgstr "Login A&utomático"
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:614
+msgid "U&se this password for system administrator"
+msgstr "U&sar esta senha para o administrador do sistema"
+
#. check box label
#: src/include/users/dialogs.rb:480
msgid "D&isable User Login"
@@ -1599,6 +936,33 @@
msgid "Plu&g-Ins"
msgstr "Plu&g-ins"
+#. 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/include/users/dialogs.rb:1112
+msgid "Empty User Login"
+msgstr "Login de Usuário Vazio"
+
+#. yes-no popup contents
+#: 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"
+"Leave it empty?"
+msgstr ""
+"Deixar o nome de usuário vazio faz sentido somente\n"
+"em um ambiente de rede com um servidor de autenticação.\n"
+"Deixá-lo vazio?"
+
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:483
+msgid "Really use this password?"
+msgstr "Realmente usar esta senha?"
+
#. popup question
#: src/include/users/dialogs.rb:1308
msgid "Change home directory to %1?"
@@ -1692,6 +1056,20 @@
msgid "Group &Data"
msgstr "&Dados do Grupo"
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+msgid "DES"
+msgstr "DES"
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+msgid "MD5"
+msgstr "MD5"
+
#. help text 1/4
#: src/include/users/helps.rb:62
msgid ""
@@ -1706,6 +1084,32 @@
"caracteres acentuados ou umlauts (ex: ä,ü). \n"
"</p>\n"
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Com a criptografia de senha atual (%1), o tamanho da senha deve ter entre\n"
+" %2 e %3 caracteres.\n"
+"</p>"
+
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Para garantir que a senha foi informada corretamente, repita\n"
+"exatamente no segundo campo. Não esqueça sua senha.\n"
+"</p>\n"
+
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -1871,6 +1275,19 @@
"<b>Senha</b> para atribuir a esse usuário.\n"
"</p>\n"
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Digite o <b>Nome Completo do Usuário</b>, <b>Nome do Usuário</b> e <b>Senha</b> para\n"
+"atribuir a essa conta de usuário.\n"
+"</p>\n"
+
#. help text 2/7
#: src/include/users/helps.rb:226
msgid ""
@@ -1911,6 +1328,25 @@
"restrições no arquivo /etc/login.defs. Leia sua respectiva página de manual para obter informações.\n"
"</p>\n"
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
+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"
+msgstr ""
+"<p>\n"
+"O nome de usuário e a senha criados aqui são necessários para efetuar login e trabalhar com o sistema Linux. Com o <b>Login automático</b> habilitado, o procedimento de login é pulado. Este usuário efetua o login automaticamente.</p>\n"
+
+#. help text 5/7 (only during installation)
+#: 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"
+msgstr ""
+"<p>\n"
+"Encaminhe mensagens do root para esse usuário marcando <b>Receber Mensagens do Sistema</b>.</p>\n"
+
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2668,7 +2104,8 @@
msgstr "Usuários do Sistema"
#. the type of user set
-#: src/include/users/widgets.rb:79
+#. New user is the default option
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
msgid "Local Users"
msgstr "Usuários Locais"
@@ -2744,6 +2181,11 @@
msgstr "Grupos do Samba"
#. richtext label
+#: src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr "NIS"
+
+#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr "SSSD"
@@ -2763,6 +2205,11 @@
msgid "&SSSD"
msgstr "&SSSD"
+#. menubutton label
+#: src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "&Samba"
+
#. tab header
#: src/include/users/widgets.rb:168
msgid "&Users"
@@ -2890,6 +2337,11 @@
"protocolos de rede não suportam esse recurso, podendo ocorrer problemas com o NIS.\n"
"</p>"
+#. Help text for password expert dialog 4/5
+#: 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 "<p><b>SHA-512</b> é o método de hashing padrão atual. A utilização de outros algoritmos não é recomendada, exceto por compatibilidade.</p>"
+
#. Label
#: src/include/users/widgets.rb:499
msgid "Password Encryption"
@@ -2900,6 +2352,26 @@
msgid "Encryption Type"
msgstr "Tipo de Criptografia"
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr "&DES"
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr "&MD5"
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr "SHA-&256"
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr "SHA-&512"
+
#. help text 1/3
#: src/include/users/widgets.rb:582
msgid ""
@@ -3195,6 +2667,12 @@
#. type of user/group
#. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
msgid "System"
msgstr "Sistema"
@@ -3531,6 +3009,15 @@
msgid "Package %1 is not available for installation."
msgstr "O pacote %1 não está disponível para instalação."
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"O pacote '%1' não está instalado no sistema.\n"
+"Instalá-lo agora?\n"
+
#. dialog caption
#: src/include/users/wizards.rb:102
msgid "User and Group Administration"
@@ -3548,6 +3035,422 @@
msgid "Initializing..."
msgstr "Inicializando..."
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Se você planeja criar certificados,\n"
+"a senha deve ter pelo menos %s caracteres."
+
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>Se você planeja usar essa senha para criar certificados,\n"
+"ela deverá ter pelo menos %s caracteres.</p>"
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+msgid "Writing Users Configuration..."
+msgstr "Salvando as Configurações dos Usuários..."
+
+#. Copyright (c) 2016 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "<p>Escolha o método de criptografia de senha para os usuários local e do sistema.</p>"
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+#, fuzzy
+#| msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> é o método de hashing padrão atual. A utilização de outros algoritmos não é recomendada, exceto por compatibilidade.</p>"
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+msgid "Password Encryption Type"
+msgstr "Tipo da Criptografia de Senha"
+
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+msgid "Do not forget what you enter here."
+msgstr "Não se esqueça do que informou aqui."
+
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+msgid "&Password for root User"
+msgstr "&Senha para o Usuário root"
+
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+msgid "Con&firm Password"
+msgstr "Con&firmar senha"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+msgid "&Test Keyboard Layout"
+msgstr "&Teste de Layout do Teclado"
+
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Diferente dos usuários comuns do sistema, que gravam textos, criam\n"
+"gráficos ou navegam pela Internet, o usuário \"root\" existe em\n"
+"todos os sistemas e é solicitado sempre que\n"
+"tarefas administrativas precisam ser executadas. Efetue login como root\n"
+"somente quando precisar ser o administrador do sistema.\n"
+"</p>\n"
+
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Como o usuário root possui todas as permissões, a senha do\n"
+"\"root\" deve ser escolhida com cuidado. A combinação de letras e números\n"
+"é recomendada. Para garantir que a senha foi informada \n"
+"corretamente, informe novamente no segundo campo.\n"
+"</p>\n"
+
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Todas as regras para senhas de usuário se aplicam para o \"root\":\n"
+"Faça diferença entre maiúsculas e minúsculas. A senha deve ter no\n"
+"mínimo 5 caracteres e, como regra, não conter caracteres acentuados ou umlauts (ex: ä,ü).\n"
+"</p>\n"
+
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Não se esqueça da senha do \"root\".\n"
+"</p>"
+
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+msgid "Password for the System Administrator \"root\""
+msgstr "Senha para o Administrador do Sistema \"root\""
+
+#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"Nenhuma senha digitada.\n"
+"Tente novamente. "
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:134
+#, fuzzy
+#| 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>"
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr "<p>Selecione <b>Local</b> para autenticar usuários somente usando os arquivos locais <i>/etc/passwd</i> e <i>/etc/shadow</i>.</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+#| msgid "Create New User"
+msgid "Create new user"
+msgstr "Criar Novo Usuário"
+
+#: src/lib/users/dialogs/inst_user_first.rb:142
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ao digitar uma senha, faça a distinção entre maiúsculas e\n"
+"minúsculas. As senhas não devem conter caracteres especiais, como caracteres acentuados ou umlauts (ex: ä,ü). \n"
+"</p>\n"
+
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:149
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "With the current password encryption (%1), the password length should be between\n"
+#| " %2 and %3 characters.\n"
+#| "</p>"
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Com a criptografia de senha atual (%1), o tamanho da senha deve ter entre\n"
+" %2 e %3 caracteres.\n"
+"</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:165
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Para o <b>Nome do Usuário</b>, use somente letras (sem caracteres acentuados), dígitos e <tt>._-</tt>.\n"
+"Não use letras maiúsculas nessa entrada, a menos que saiba o que está fazendo.\n"
+"Nomes de usuário possuem mais restrições do que senhas. Você pode redefinir as\n"
+"restrições no arquivo /etc/login.defs. Leia seu manual para obter informações.\n"
+"</p>\n"
+
+#: src/lib/users/dialogs/inst_user_first.rb:172
+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>Selecione <b>Usar esta senha para o administrador do sistema</b> se a mesma senha fornecida para o primeiro usuário deve ser utilizada para o root.</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "Import User Data from a Previous Installation"
+msgstr "&Ler Dados do Usuário de uma Instalação Anterior"
+
+#: src/lib/users/dialogs/inst_user_first.rb:184
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:193
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:275
+#, fuzzy
+#| msgid "Local Users"
+msgid "Local User"
+msgstr "Usuários Locais"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:330
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:387
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:514
+#, fuzzy
+#| msgid "Create New User"
+msgid "&Create New User"
+msgstr "Criar Novo Usuário"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:537
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "&Import User Data from a Previous Installation"
+msgstr "&Ler Dados do Usuário de uma Instalação Anterior"
+
+#: src/lib/users/dialogs/inst_user_first.rb:547
+#, fuzzy
+#| msgid "System Users"
+msgid "Choose Users"
+msgstr "Usuários do Sistema"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:563
+msgid "&Skip User Creation"
+msgstr ""
+
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:619
+msgid "&Automatic Login"
+msgstr "Login a&utomático"
+
+#: src/lib/users/dialogs/inst_user_first.rb:626
+#, fuzzy
+#| msgid "No user was specified."
+msgid "No users selected"
+msgstr "Nenhum usuário foi especificado."
+
+#: src/lib/users/dialogs/inst_user_first.rb:628
+#, fuzzy
+#| msgid "User %s will be imported."
+#| msgid_plural "Users %s will be imported."
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] "O usuário %s será importado."
+msgstr[1] "Os usuários %s serão importados."
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+msgid "&Select Users to Read"
+msgstr "&Selecionar Usuários para Ler"
+
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+msgid "Select or Deselect &All"
+msgstr "Selecionar ou anular a seleção de &todos"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+msgid "SHA-256"
+msgstr "SHA-256"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+msgid "SHA-512"
+msgstr "SHA-512"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+#| msgid "Password Encryption Method: %1"
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "Método de criptografia de senha: %1"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+#| msgid "Password Encryption Type"
+msgid "Password &Encryption Type"
+msgstr "Tipo da Criptografia de Senha"
+
+#. rich text label
+#: src/lib/users/proposal.rb:75
+msgid "User Settings"
+msgstr "Configurações do usuário"
+
+#. menu button label
+#: src/lib/users/proposal.rb:78
+msgid "&User"
+msgstr "&Usuário"
+
+#. menu button label
+#: src/lib/users/proposal.rb:80
+msgid "&Root Password"
+msgstr "Senha do &root"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+msgid "<%1>Root Password<%2> set"
+msgstr "<%1>Senha de Root<%2> configurada"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+msgid "<%1>Root Password<%2> not set"
+msgstr "<%1>Senha de Root<%2> não configurada"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+msgid "No <%1>user<%2> configured"
+msgstr "Nenhum <%1> usuário<%2> configurado"
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+#, fuzzy
+#| msgid "<%1>User<%2> %3 will be imported."
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] "<%1>Usuário<%2> %3 será importado."
+msgstr[1] "<%1>Usuário<%2> %3 será importado."
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+msgid "<%1>User<%2> %3 configured"
+msgstr "<%1>Usuário<%2> %3 configurado"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "<%1>Usuário<%2> %3 (%4) configurado"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+#| msgid "Password Encryption Method: %1"
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "Método de criptografia de senha: %1"
+
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
msgid "root"
@@ -4005,7 +3908,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:722
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -4024,185 +3927,185 @@
"após montá-los corretamente. Continuar a configuração de usuário?"
#. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:970
msgid "Multiple users satisfy the input conditions."
msgstr "Vários usuários satisfazem as condições de entrada."
#. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1548
msgid "Initializing User and Group Configuration"
msgstr "Inicializando a Configuração de Usuário e Grupo"
#. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1555
msgid "Read the default login settings"
msgstr "Ler as configurações padrões de login"
#. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1557
msgid "Read the default system settings"
msgstr "Ler as configurações padrões de sistema"
#. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1559
msgid "Read the configuration type"
msgstr "Ler o tipo de configuração"
#. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1561
msgid "Read the user custom settings"
msgstr "Ler as configurações personalizadas do usuário"
#. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1563
msgid "Read users and groups"
msgstr "Ler usuários e grupos"
#. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1565
msgid "Build the cache structures"
msgstr "Construir estruturas de cache"
#. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1569
msgid "Reading the default login settings..."
msgstr "Lendo as configurações padrões de login..."
#. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1571
msgid "Reading the default system settings..."
msgstr "Lendo as configurações padrões de sistema..."
#. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1573
msgid "Reading the configuration type..."
msgstr "Lendo o tipo de configuração..."
#. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1575
msgid "Reading custom settings..."
msgstr "Lendo as configurações personalizadas..."
#. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1577
msgid "Reading users and groups..."
msgstr "Lendo usuários e grupos..."
#. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1579
msgid "Building the cache structures..."
msgstr "Construindo estruturas de cache..."
#. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
msgid "Finished"
msgstr "Concluído"
#. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2137
msgid "User does not exist."
msgstr "Usuário inexistente."
#. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2389
msgid "Group does not exist."
msgstr "Grupo inexistente."
#. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4258
msgid "Writing User and Group Configuration"
msgstr "Salvando a Configuração de Usuário e Grupo"
#. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4267
msgid "Write LDAP users and groups"
msgstr "Salvar as configurações de usuário e grupo LDAP"
#. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4269
msgid "Write groups"
msgstr "Salvar grupos"
#. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4271
msgid "Check for deleted users"
msgstr "Verificar usuários removidos"
#. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4273
msgid "Write users"
msgstr "Salvar usuários"
#. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4275
msgid "Write passwords"
msgstr "Salvar senhas"
#. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4277
msgid "Write the custom settings"
msgstr "Salvar as configurações personalizadas"
#. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4279
msgid "Write the default login settings"
msgstr "Salvar as configurações padrões de login"
#. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4282
msgid "Writing LDAP users and groups..."
msgstr "Salvando usuários e grupos LDAP..."
#. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4284
msgid "Writing groups..."
msgstr "Salvando grupos..."
#. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4286
msgid "Checking deleted users..."
msgstr "Verificando usuários removidos..."
#. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4288
msgid "Writing users..."
msgstr "Salvando usuários..."
#. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4290
msgid "Writing passwords..."
msgstr "Salvando senhas..."
#. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4292
msgid "Writing the custom settings..."
msgstr "Salvando as configurações do usuário..."
#. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4294
msgid "Writing the default login settings..."
msgstr "Salvando as configurações padrões de login..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4379
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr "O arquivo %s não foi lido corretamente, portanto, não será salvo."
#. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
msgid "An error occurred while removing users."
msgstr "Ocorreu um erro ao remover usuários."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr "O arquivo %s não foi lido corretamente, portanto, não será salvo."
#. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4565
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
@@ -4211,17 +4114,17 @@
"O suporte à criptografia não está instalado, os diretórios home NÃO serão criptografados."
#. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
msgid "An error occurred while setting forwarding for root's mail."
msgstr "Erro ao configurar encaminhamento para o e-mail do root."
#. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4843
msgid "No UID is available for this type of user."
msgstr "Não há UID disponível para esse tipo de usuário."
#. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4874
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4231,7 +4134,7 @@
"Selecione um inteiro válido entre %i e %i."
#. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4905
msgid ""
"The user ID entered is already in use.\n"
"Really use it?"
@@ -4240,7 +4143,7 @@
"Realmente usá-lo?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4918
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4252,7 +4155,7 @@
"Realmente usá-lo?"
#. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4933
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4264,7 +4167,7 @@
"Realmente alterar o tipo de usuário para 'local'? "
#. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4947
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4275,7 +4178,7 @@
"pois é menor que %i.\n"
"Realmente alterar o tipo de usuário para 'sistema'? "
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4981
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
@@ -4285,7 +4188,7 @@
# Die Üs. ist genauer als der englische Text. -ke-
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4985
msgid ""
"There is a conflict between the entered\n"
"username and an existing username. %1\n"
@@ -4296,7 +4199,7 @@
"Tente outro nome."
#. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5015
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
@@ -4305,7 +4208,7 @@
"conter dois pontos (:). Tente novamente."
#. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5022
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4316,7 +4219,7 @@
"Remova o excesso."
#. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5085
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4327,7 +4230,7 @@
"Tente novamente."
#. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5108
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4337,7 +4240,7 @@
"Escolha outro caminho para o diretório pessoal."
#. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5119
msgid ""
"The home directory is used by another user.\n"
"Try again."
@@ -4346,7 +4249,7 @@
"Tente novamente."
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5161
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4357,7 +4260,7 @@
"Realmente usar esse caminho?"
#. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5172
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4367,7 +4270,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5179
#, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4379,7 +4282,7 @@
"Usar este diretório?\n"
#. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5188
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4393,7 +4296,7 @@
"Usar este diretório?"
#. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5216
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
@@ -4402,12 +4305,12 @@
"Deseja usar esse shell? "
#. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5236
msgid "No GID is available for this type of group."
msgstr "Não há GID disponível para esse tipo de grupo."
#. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5269
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4417,7 +4320,7 @@
"Selecione um valor inteiro válido entre %i e %i."
#. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5299
msgid ""
"The group ID entered is already in use.\n"
"Really use it?"
@@ -4426,7 +4329,7 @@
"Realmente usá-lo?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5311
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4438,7 +4341,7 @@
"Realmente usá-lo?"
#. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5326
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4450,7 +4353,7 @@
"Realmente alterar o tipo de grupo para 'local'?"
#. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5340
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4463,7 +4366,7 @@
# loginname -> "Benutzername".
#. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5359
msgid ""
"No group name entered.\n"
"Try again."
@@ -4473,7 +4376,7 @@
# login -> Benutzername
#. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5376
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4483,7 +4386,7 @@
"Tente novamente."
#. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5389
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4497,7 +4400,7 @@
# Die Üs. ist genauer als der englische Text. -ke-
#. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5397
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
@@ -4507,13 +4410,13 @@
"informado e um grupo já existente.\n"
"Tente outro nome."
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5513
#, perl-format
msgid "User %s does not exist."
msgstr "O usuário %s não existe."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5567
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4524,7 +4427,7 @@
"como seu grupo padrão."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5574
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4535,22 +4438,22 @@
"Remova os usuários deste grupo primeiro. "
#. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6587
msgid "<h3>Users</h3>"
msgstr "<h3>Usuários</h3>"
#. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6597
msgid "<h3>Groups</h3>"
msgstr "<h3>Grupos</h3>"
#. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6608
msgid "<h3>Login Settings</h3>"
msgstr "<h3>Configurações de login</h3>"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6610
msgid "User %1 configured for automatic login"
msgstr "O usuário %1 foi configurado para o login automático"
@@ -4570,21 +4473,21 @@
"existe no servidor LDAP. Deseja Criá-la agora?"
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
msgid "Kerberos Configuration"
msgstr "Configuração do Kerberos"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
msgid "No Kerberos Management for Groups"
msgstr "Sem gerenciamento Kerberos para grupos"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
msgid "Manage Kerberos Principials"
msgstr "Gerenciar os principais Kerberos"
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
msgid "Cannot execute kadmin.local."
msgstr "Não foi possível executar kadmin.local."
@@ -4716,7 +4619,7 @@
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:505
+#: src/modules/UsersSimple.pm:379
msgid ""
"The password may only contain the following characters:\n"
"0-9, a-z, A-Z, and any of \"`~!@#$%^&* ,.;:._-+/|?='{[(<>)]}\\\".\n"
@@ -4727,7 +4630,7 @@
"Tente novamente."
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4742,7 +4645,7 @@
"</p>"
#. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
msgid ""
"The user's full name cannot contain\n"
"\":\" or \",\" characters.\n"
@@ -4753,37 +4656,37 @@
"Tente novamente."
#. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
msgid "You have used the group name as a part of the password."
msgstr "Você usou o nome de grupo como parte da senha."
#. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
msgid "You have used the username as a part of the password."
msgstr "Você usou o nome de usuário como parte da senha."
#. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
msgid "You have used only lowercase letters for the password."
msgstr "Você usou somente letras minúsculas para a senha."
#. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
msgid "You have used only uppercase letters for the password."
msgstr "Você usou somente letras maiúsculas para a senha."
#. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
msgid "You have used a palindrome for the password."
msgstr "Você usou um palíndromo para a senha."
#. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
msgid "You have used only digits for the password."
msgstr "Você usou somente dígitos para a senha."
#. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
#, perl-format
msgid ""
"The password is too long for the current encryption method.\n"
@@ -4793,7 +4696,7 @@
"Ela será truncada para %s caracteres."
#. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
#, perl-format
msgid ""
"The password is too simple:\n"
@@ -4803,13 +4706,13 @@
"%s."
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
#, perl-format
msgid "The password should have at least %i characters."
msgstr "A senha deve ter no mínimo %i caracteres."
#. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
msgid ""
"No username entered.\n"
"Try again."
@@ -4818,7 +4721,7 @@
"Tente novamente. "
#. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
#, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -4828,7 +4731,7 @@
"Tente novamente."
#. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
msgid ""
"The username may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4842,7 +4745,7 @@
# Die Üs. ist genauer als der englische Text. -ke-
#. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
msgid ""
"There is a conflict between the entered\n"
"username and an existing username.\n"
@@ -4852,15 +4755,13 @@
"digitado e um nome de usuário já existente.\n"
"Tente outro nome."
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
msgid "Retrieving %1 extension..."
msgstr "Obtendo a extensão %1..."
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
msgid "Releasing %1 extension..."
msgstr "Lançando a extensão %1..."
@@ -4928,6 +4829,144 @@
msgid "There are multiple users satisfying the input conditions."
msgstr "Existem múltiplos usuários satisfazendo as condições de entrada."
+#~ msgid "User Authentication Method"
+#~ msgstr "Método de Autenticação do Usuário"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b>Authentication</b><br>\n"
+#~ "Select the authentication method to use for users on your system.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b>Autenticação</b><br>\n"
+#~ "Selecione o método de autenticação a ser usado pelos usuários do sistema.\n"
+#~ "</p>"
+
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "Se houve uma instalação anterior ou um sistema alternativo, será possível criar usuários com base nesta origem. Para isso, selecione <b>Ler Dados do Usuário de Instalação Anterior</b>. Essa opção usa um diretório pessoal existente ou cria um novo para cada usuário na localização especificada para esta instalação."
+
+#~ msgid "&LDAP"
+#~ msgstr "&LDAP"
+
+#~ msgid "N&IS"
+#~ msgstr "N&IS"
+
+#~ msgid "&Windows Domain"
+#~ msgstr "Domínio do &Windows"
+
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "L&ocal (/etc/passwd)"
+
+#~ msgid "eDirectory LDAP"
+#~ msgstr "LDAP do eDirectory"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Se você estiver usando um servidor NIS ou LDAP para armazenar dados de usuário ou se desejar\n"
+#~ "autenticar usuários em um servidor NT, escolha o valor apropriado. Em seguida,\n"
+#~ "pressione <b>Próximo</b> para continuar a configuração do cliente.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Se estiver usando um servidor NIS ou LDAP para armazenar dados do usuário, escolha o\n"
+#~ "valor apropriado. Em seguida, pressione <b>Próximo</b> para continuar a configuração do cliente.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Se estiver usando um servidor LDAP para armazenar dados de usuário ou se desejar\n"
+#~ "autenticar usuários em um servidor NT, escolha o valor apropriado. Em seguida,\n"
+#~ "pressione <b>Próximo</b> para continuar a configuração do cliente.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Se você estiver usando um servidor LDAP para armazenar dados do usuário, escolha o\n"
+#~ "valor apropriado. Em seguida, pressione <b>Próximo</b> para continuar a configuração do seu cliente.</p>"
+
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>Marque <b>Configurar Autenticação Kerberos</b> para configurar o Kerberos após configurar a fonte de dados do usuário.</p>"
+
+#~ msgid "&Choose"
+#~ msgstr "E&scolher"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Método de Autenticação"
+
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "Configurar Autenticação &Kerberos"
+
+#~ msgid "E&xpert Options..."
+#~ msgstr "Opções A&vançadas..."
+
+#~ msgid ""
+#~ "<p>If you intend to use this password for creating certificates,\n"
+#~ "it has to be at least %1 characters long.</p>"
+#~ msgstr ""
+#~ "<p>Se você planeja usar essa senha para criar certificados,\n"
+#~ "ela deverá ter pelo menos %1 caracteres.</p>"
+
+#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+#~ msgstr "<p>Para verificar se o layout atual do teclado está correto, tente digitar algum texto no campo <b>Teste de Layout de Teclado</b>.</p>"
+
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "Se você planeja criar certificados,\n"
+#~ "a senha deve ter pelo menos %1 caracteres."
+
+#~ msgid ""
+#~ "The root password could not be set.\n"
+#~ "You might not be able to log in.\n"
+#~ "Try setting it again?\n"
+#~ msgstr ""
+#~ "A senha do root não foi configurada.\n"
+#~ "Provavelmente, você não conseguirá efetuar login.\n"
+#~ "Tentar configurá-la novamente?\n"
+
+#~ msgid "Initialization of module for configuration of authentication..."
+#~ msgstr "Inicialização do módulo para configuração de autenticação..."
+
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>Autenticação</b></p>"
+
+#~ msgid "Expert Settings"
+#~ msgstr "Configurações Avançadas"
+
+#~ msgid "The authentication method is local /etc/passwd."
+#~ msgstr "O método de autenticação local é o /etc/passwd"
+
+#~ msgid "The password encryption method is %s."
+#~ msgstr "O método de criptografia de senha é %s."
+
+#~ msgid "&Change..."
+#~ msgstr "A<erar..."
+
+#~ msgid "Summary"
+#~ msgstr "Resumo"
+
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "Samba (domínio do Windows)"
+
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "<%1>Método de Autenticação<%2>: %3"
+
+#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+#~ msgstr "<%1>Método de autenticação<%2>: %3 e Kerberos."
+
+#~ msgid "<%1>Users<%2> %3 selected for import"
+#~ msgstr "<%1>Usuários<%2> %3 selecionados para importação"
+
#~ msgid "Kerberos"
#~ msgstr "Kerberos"
Modified: trunk/yast/pt_BR/po/vm.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/vm.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/vm.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: vm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-06-11 15:35-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -41,12 +41,12 @@
msgstr "Configurando a máquina virtual..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr "x86_64 é a única arquitetura suportada para hospedar máquinas virtuais. Sua arquitetura é "
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -56,151 +56,151 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
msgid "Verify Installed Packages"
msgstr "Verificar os pacotes instalados"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
msgid "Network Bridge Configuration"
msgstr "Configuração da ponte de rede"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
msgid "Configuring the VM Server (domain 0)"
msgstr "Configurando o servidor VM (domínio 0)"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr "<p><big><b>Configuração do servidor VM</b></big></p><p>A configuração do servidor VM (domínio 0) possui duas etapas.</p>"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr "<p>Primeiro, os pacotes necessários são instalados no sistema. Em seguida, o carregador de inicialização é alternado para o GRUB (caso ele ainda não esteja sendo usado) e a seção do Xen é adicionada ao menu do carregador de inicialização caso ela esteja ausente.</p>"
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr "<p>O GRUB é necessário porque suporta o padrão de multi-inicialização necessário para inicializar o Xen e o kernel do Linux.</p>"
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr "<p>Quando a configuração for concluída com sucesso, você poderá inicializar o servidor VM a partir do menu do carregador de inicialização.</p>"
#. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
msgid "The installation will be aborted."
msgstr "A instalação será cancelada."
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
msgid "Choose Hypervisor(s) to install"
msgstr "Escolha o(s) Hypervisor(s) para instalar"
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
msgid "Server: Minimal system to get a running Hypervisor"
msgstr "Servidor: sistema mínimo para ter um Hypervisor funcional"
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "Ferramentas: configure, gerencie e monitore máquinas virtuais"
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
msgid "KVM Hypervisor"
msgstr "Hypervisor KVM"
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
msgid "KVM server"
msgstr "Servidor KVM"
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
msgid "KVM tools"
msgstr "Ferramentas KVM"
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
msgid "libvirt LXC containers"
msgstr "Containers LXC libvirt"
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
msgid "libvirt LXC daemon"
msgstr "Daemon LXC libvirt"
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
msgid "Software to connect to Virtualization server"
msgstr "Software para conexão ao servidor de virtualização"
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
msgid "Virtualization client tools"
msgstr "Ferramentas do cliente de virtualização"
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
msgid "Xen Hypervisor"
msgstr "Hypervisor Xen"
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
msgid "Xen server"
msgstr "Servidor Xen"
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
msgid "Xen tools"
msgstr "Ferramentas Xen"
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
msgid "Package installation failed\n"
msgstr "Falha ao instalar pacote\n"
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
msgid "Package installation failed for lxc\n"
msgstr "Falha ao instalar pacote para lxc\n"
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
msgid "Package installation failed for sled client pattern\n"
msgstr "Falha ao instalar pacote para padrão de cliente sled\n"
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
msgid "Package installation failed for sles patterns\n"
msgstr "Falha ao instalar pacote para padrões sles\n"
#. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
msgid "Running in text mode. Install graphical components anyway?"
msgstr "Executando em modo texto. Instalar os componentes gráficos mesmo assim?"
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
msgid "Checking packages..."
msgstr "Verificando os pacotes..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
msgid "Installing packages..."
msgstr "Instalando os pacotes..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
msgid "Cannot install required packages."
msgstr "Não foi possível instalar os pacotes necessários."
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
msgid "Updating grub2 configuration files..."
msgstr "Atualizando os arquivos de configuração do grub2..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
msgid "Configuring Default Network Bridge..."
msgstr "Configurando a ponte de rede padrão..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
msgid "Network Bridge."
msgstr "Ponte de rede."
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr "<p>Para configurações normais de rede hospedando máquinas virtuais, uma ponte de rede é recomendada.</p><p>Configurar uma ponte de rede padrão?</p>"
@@ -213,27 +213,27 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr "Os componentes KVM estão instalados. Seu hospedeiro está pronto para instalar convidados KVM."
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
msgstr "Os componentes KVM estão instalados. Reinicializa a máquina e selecione o kernel nativo no menu de inicialização para instalar os convidados KVM."
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
msgstr "Para instalar convidados Xen, reinicie a máquina e selecione a seção Xen no menu do carregador de inicialização."
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
msgid "Xen Hypervisor and tools are installed."
msgstr "O hipervisor Xen e as ferramentas estão instalados."
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
msgid "Virtualization client tools are installed."
msgstr "As ferramentas do cliente de virtualização estão instaladas."
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
msgid "Libvirt LXC components are installed."
msgstr "Os componentex LXC libvirt estão instalados."
Modified: trunk/yast/pt_BR/po/vpn.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/vpn.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
+++ trunk/yast/pt_BR/po/vpn.pt_BR.po 2016-09-03 12:12:46 UTC (rev 96731)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-31 11:05UTC-0300\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -234,14 +234,14 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
#, fuzzy
#| msgid "The server name is already in configured."
msgid "The user name is already used."
msgstr "O nome do servidor já está configurado."
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
msgid "Cannot find a matching client connection."
msgstr ""
@@ -342,122 +342,122 @@
msgstr "Você gostaria de trocar o CD e tentar novamente?"
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
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
+#: src/lib/vpn/main_dialog.rb:365
msgid "Name"
msgstr "Nome"
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
msgid "Description"
msgstr "Descrição"
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
#, fuzzy
#| msgid "All networks"
msgid "All IPv6 networks (::/0)"
msgstr "Todas as redes"
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
#, fuzzy
#| msgid "Connection Management"
msgid "Connection name: "
msgstr "Gerenciamento de conexão"
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
msgid "Type"
msgstr "Tipo"
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
#, fuzzy
#| msgid "Master Server"
msgid "Gateway (Server)"
msgstr "Servidor mestre"
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
#, fuzzy
#| msgid "Clients"
msgid "Client"
msgstr "Clientes"
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
#, fuzzy
#| msgid "Choose Scenario"
msgid "The scenario is"
msgstr "Escolher o cenário"
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
#, fuzzy
#| msgid "Choose the directory with certificates"
msgid "Secure communication with a certificate"
msgstr "Escolha o diretório contendo certificados"
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
#, fuzzy
#| msgid "External credentials"
msgid "Edit Credentials"
msgstr "Credenciais externas"
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
#, fuzzy
#| msgid "Server Requires Authentication"
msgid "The gateway requires authentication"
msgstr "Servidor requer autenticação"
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
#, fuzzy
#| msgid "Read certificates"
msgid "By a certificate"
msgstr "Ler Certificados"
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
#, fuzzy
#| msgid "Default &Gateway IP"
msgid "VPN gateway IP"
msgstr "&Gateway IP padrão"
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -574,40 +574,40 @@
msgstr "O Smart não está disponível para este disco."
#. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Failed to install IPSec packages."
msgstr "Falha ao instalar os pacotes requeridos."
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
#, fuzzy
#| msgid "Failed to start the CUPS daemon"
msgid "Failed to start IPSec daemon."
msgstr "Falha ao iniciar o daemon CUPS"
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
#, fuzzy
#| msgid "Failed to apply the settings to the system."
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr "Falha ao aplicar as configurações no sistema."
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
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
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
#, fuzzy
#| msgid "Failed to create the new map."
msgid "Failed to restart SuSE firewall."
msgstr "Falha ao criar o novo mapa."
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
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"
@@ -615,35 +615,35 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
#, fuzzy
#| msgid "Global Settings"
msgid "VPN Global Settings"
msgstr "Configurações globais"
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
#, fuzzy
#| msgid "Enable VPN Services"
msgid "Enable VPN (IPSec) daemon: %s"
msgstr "Habilitar Serviços de VPN"
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
#, fuzzy
#| msgid "Create Client Connection"
msgid "Gateway and Connections"
msgstr "Criar Conexão Cliente"
#. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
#, fuzzy
#| msgid "Read current connection setup"
msgid "A client connecting to "
1
0
03 Sep '16
Author: minton
Date: 2016-09-03 14:12:31 +0200 (Sat, 03 Sep 2016)
New Revision: 96730
Added:
trunk/yast/pt_BR/po/journalctl.pt_BR.po
Log:
pt_BR merged
Added: trunk/yast/pt_BR/po/journalctl.pt_BR.po
===================================================================
--- trunk/yast/pt_BR/po/journalctl.pt_BR.po (rev 0)
+++ trunk/yast/pt_BR/po/journalctl.pt_BR.po 2016-09-03 12:12:31 UTC (rev 96730)
@@ -0,0 +1,121 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: journalctl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"PO-Revision-Date: 2016-08-04 14:55+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr ""
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr ""
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr ""
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr ""
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr ""
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr ""
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr ""
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr ""
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr ""
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:116
+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/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr ""
1
0
03 Sep '16
Author: belphegor
Date: 2016-09-03 02:48:24 +0200 (Sat, 03 Sep 2016)
New Revision: 96729
Modified:
trunk/yast/ja/po/journalctl.ja.po
trunk/yast/ja/po/registration.ja.po
Log:
updated
Modified: trunk/yast/ja/po/journalctl.ja.po
===================================================================
--- trunk/yast/ja/po/journalctl.ja.po 2016-09-02 21:45:57 UTC (rev 96728)
+++ trunk/yast/ja/po/journalctl.ja.po 2016-09-03 00:48:24 UTC (rev 96729)
@@ -1,84 +1,87 @@
+# translation of journalctl.po to Japanese
# Japanese translations for opensuse-i package.
# Copyright (C) 2016 SuSE Linux Products GmbH, Nuernberg
# This file is distributed under the same license as the opensuse-i package.
+#
# Automatically generated, 2016.
-#
+# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: opensuse-i 18n\n"
+"Project-Id-Version: journalctl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-04 14:55+0200\n"
-"PO-Revision-Date: 2016-08-04 14:55+0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2016-09-03 09:47+0900\n"
+"Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n"
+"Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: KBabel 1.11.4\n"
#. Header
#: src/lib/journalctl/entries_dialog.rb:62
msgid "Journal entries"
-msgstr ""
+msgstr "ジャーナルの項目"
#. Filters
#: src/lib/journalctl/entries_dialog.rb:67
msgid "Displaying entries with the following text"
-msgstr ""
+msgstr "下記のテキストがある項目を表示しています"
#. Footer buttons
#: src/lib/journalctl/entries_dialog.rb:81
msgid "Change filter..."
-msgstr ""
+msgstr "フィルタの変更..."
#: src/lib/journalctl/entries_dialog.rb:83
msgid "Refresh"
-msgstr ""
+msgstr "更新"
#. Header
#: src/lib/journalctl/query_dialog.rb:85
msgid "Entries to display"
-msgstr ""
+msgstr "表示する項目"
#. Boot selector
#: src/lib/journalctl/query_dialog.rb:89
msgid "Log entries for"
-msgstr ""
+msgstr "下記に対する項目"
#. Filter checkboxes
#: src/lib/journalctl/query_dialog.rb:96
msgid "Filters"
-msgstr ""
+msgstr "フィルタ"
#. User readable description of the current filters
#: src/lib/journalctl/query_presenter.rb:60
msgid "from previous boot"
-msgstr ""
+msgstr "以前の起動から"
#: src/lib/journalctl/query_presenter.rb:62
msgid "since system's boot"
-msgstr ""
+msgstr "システムの起動以後"
#: src/lib/journalctl/query_presenter.rb:66
msgid "unit (%s)"
-msgstr ""
+msgstr "ユニット (%s)"
#: src/lib/journalctl/query_presenter.rb:67
msgid "file (%s)"
-msgstr ""
+msgstr "ファイル (%s)"
#: src/lib/journalctl/query_presenter.rb:68
msgid "priority (%s)"
-msgstr ""
+msgstr "優先度 (%s)"
#: src/lib/journalctl/query_presenter.rb:79
msgid "with no additional conditions"
-msgstr ""
+msgstr "追加条件無し"
#: src/lib/journalctl/query_presenter.rb:81
msgid "filtering by %s"
-msgstr ""
+msgstr "%s でフィルタ"
#. Possible options for the :boot filter to be used in forms
#.
@@ -86,11 +89,11 @@
#. :value and :label
#: src/lib/journalctl/query_presenter.rb:93
msgid "Since system's boot"
-msgstr ""
+msgstr "システムの起動以後"
#: src/lib/journalctl/query_presenter.rb:94
msgid "From previous boot"
-msgstr ""
+msgstr "以前の起動から"
#. Possible filters (in addition to :boot) to be used in forms
#.
@@ -100,27 +103,28 @@
#. * :values optional list of valid values
#: src/lib/journalctl/query_presenter.rb:108
msgid "For this systemd unit"
-msgstr ""
+msgstr "systemd のユニットに対して"
#: src/lib/journalctl/query_presenter.rb:112
msgid "For this file (executable or device)"
-msgstr ""
+msgstr "このファイルに対して (実行可能ファイルまたはデバイス)"
#: src/lib/journalctl/query_presenter.rb:116
msgid "With at least this priority"
-msgstr ""
+msgstr "少なくとも下記の優先順位"
#. Fields to display for listing the entries
#.
#. @return [Array<Hash>] for each column a :label and a :method is provided
#: src/lib/journalctl/query_presenter.rb:128
msgid "Time"
-msgstr ""
+msgstr "時刻"
#: src/lib/journalctl/query_presenter.rb:129
msgid "Source"
-msgstr ""
+msgstr "ソース"
#: src/lib/journalctl/query_presenter.rb:130
msgid "Message"
-msgstr ""
+msgstr "メッセージ"
+
Modified: trunk/yast/ja/po/registration.ja.po
===================================================================
--- trunk/yast/ja/po/registration.ja.po 2016-09-02 21:45:57 UTC (rev 96728)
+++ trunk/yast/ja/po/registration.ja.po 2016-09-03 00:48:24 UTC (rev 96729)
@@ -11,7 +11,7 @@
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-15 17:44+0200\n"
-"PO-Revision-Date: 2016-08-09 20:00+0900\n"
+"PO-Revision-Date: 2016-09-03 09:44+0900\n"
"Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n"
"Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n"
"Language: ja\n"
@@ -224,6 +224,8 @@
"Make sure that the registration server is reachable and\n"
"the connection is reliable."
msgstr ""
+"登録サーバに対して通信できる環境かどうか、および\n"
+"接続が信頼できるものかどうかをご確認ください。"
#. TRANSLATORS: additional hint for an error message
#: src/lib/registration/connect_helpers.rb:91
@@ -872,28 +874,24 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: src/lib/registration/ui/import_certificate_dialog.rb:122
-#, fuzzy
#| msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
-msgstr "<p>機密を保持するタイプの接続 (HTTPS) では、サーバの正当性を確認してデータを暗号化する際、 SSL 証明書を使用します。</p>"
+msgstr "<p>機密を保持するタイプの接続 (例: HTTPS) では、サーバの正当性を確認してデータを暗号化する際、 SSL 証明書を使用します。</p>"
#. help text (RichText) for importing a SSL certificate (2/5)
#: src/lib/registration/ui/import_certificate_dialog.rb:127
-#, fuzzy
#| 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>"
msgid "<p>You can choose to import the certificate into the list of known certificate authorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
-msgstr "<p>既知の証明機関 (CA) の一覧に証明書を取り込むこともできます。この場合、未知の証明書の発行先と発行者を信頼することになります。</p>"
+msgstr "<p> なお、既知の証明機関 (CA) の一覧に証明書を取り込むこともできます。この場合、未知の証明書の発行先と発行者を信頼することになります。 </p>"
#. help text (RichText) for importing a SSL certificate (3/5)
#: src/lib/registration/ui/import_certificate_dialog.rb:132
-#, fuzzy
#| msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
-msgstr "<p>また、証明書の取り込みを行なうと、たとえば自己署名証明書の使用も許可することになります。</p>"
+msgstr "<p> また、証明書の取り込みを行なうと、たとえば自己署名証明書の使用も許可することになります。 </p>"
#. help text (RichText) for importing a SSL certificate (4/5)
#: src/lib/registration/ui/import_certificate_dialog.rb:136
-#, fuzzy
#| 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>"
msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
msgstr "<p><b>重要:</b> 証明書の拇印を確認して、正規の発行者から証明書が発行されていることを必ず確認してください。 </p>"
@@ -1173,3 +1171,4 @@
#: src/lib/slp/dialogs/service_selection.rb:80
msgid "No service was selected."
msgstr "サービスが選択されていません。"
+
1
0
02 Sep '16
Author: minton
Date: 2016-09-02 23:45:57 +0200 (Fri, 02 Sep 2016)
New Revision: 96728
Added:
trunk/yast/zu/po/journalctl.zu.po
Modified:
trunk/yast/zu/po/add-on.zu.po
trunk/yast/zu/po/auth-client.zu.po
trunk/yast/zu/po/auth-server.zu.po
trunk/yast/zu/po/autoinst.zu.po
trunk/yast/zu/po/base.zu.po
trunk/yast/zu/po/bootloader.zu.po
trunk/yast/zu/po/ca-management.zu.po
trunk/yast/zu/po/cio.zu.po
trunk/yast/zu/po/cluster.zu.po
trunk/yast/zu/po/control.zu.po
trunk/yast/zu/po/country.zu.po
trunk/yast/zu/po/crowbar.zu.po
trunk/yast/zu/po/dhcp-server.zu.po
trunk/yast/zu/po/dns-server.zu.po
trunk/yast/zu/po/docker.zu.po
trunk/yast/zu/po/drbd.zu.po
trunk/yast/zu/po/fcoe-client.zu.po
trunk/yast/zu/po/firewall.zu.po
trunk/yast/zu/po/firstboot.zu.po
trunk/yast/zu/po/fonts.zu.po
trunk/yast/zu/po/geo-cluster.zu.po
trunk/yast/zu/po/installation.zu.po
trunk/yast/zu/po/iscsi-client.zu.po
trunk/yast/zu/po/iscsi-lio-server.zu.po
trunk/yast/zu/po/kdump.zu.po
trunk/yast/zu/po/live-installer.zu.po
trunk/yast/zu/po/mail.zu.po
trunk/yast/zu/po/network.zu.po
trunk/yast/zu/po/nfs.zu.po
trunk/yast/zu/po/nis.zu.po
trunk/yast/zu/po/ntp-client.zu.po
trunk/yast/zu/po/packager.zu.po
trunk/yast/zu/po/pkg-bindings.zu.po
trunk/yast/zu/po/printer.zu.po
trunk/yast/zu/po/rdp.zu.po
trunk/yast/zu/po/rear.zu.po
trunk/yast/zu/po/registration.zu.po
trunk/yast/zu/po/reipl.zu.po
trunk/yast/zu/po/samba-client.zu.po
trunk/yast/zu/po/samba-server.zu.po
trunk/yast/zu/po/security.zu.po
trunk/yast/zu/po/services-manager.zu.po
trunk/yast/zu/po/snapper.zu.po
trunk/yast/zu/po/storage.zu.po
trunk/yast/zu/po/update.zu.po
trunk/yast/zu/po/users.zu.po
trunk/yast/zu/po/vm.zu.po
trunk/yast/zu/po/vpn.zu.po
Log:
zu merged
Modified: trunk/yast/zu/po/add-on.zu.po
===================================================================
--- trunk/yast/zu/po/add-on.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/add-on.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -67,15 +67,16 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>Imidiya: %1, Umgudu: %2, Umkhiqizo: %3</li>\n"
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr ""
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
msgid "Failed to add add-on product."
msgstr "Ihlulekile ukunezela umkhiqizo owenezelwayo."
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr ""
-
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
#. placeholder for unknown directory
Modified: trunk/yast/zu/po/auth-client.zu.po
===================================================================
--- trunk/yast/zu/po/auth-client.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/auth-client.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,1160 +16,1770 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
msgstr ""
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+#, fuzzy
+#| msgid "Name"
+msgid "User Name"
+msgstr "Igama"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr ""
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr ""
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr ""
+
+#. Add an auth_to_local_names
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
+msgstr ""
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter realm name."
+msgstr "Faka igama lephrofayili entsha."
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication via Kerberos"
+msgstr "&Imodi Yokugunyaza"
+
+#. LDAP tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:76
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:84
+msgid ""
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:92
+msgid ""
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:100
+msgid ""
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:108
+msgid ""
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:163
+msgid ""
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:176
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Are you sure to delete realm %s?"
+msgstr "Ingabe ngempela ufuna ukususa iphathishini %1?"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Automatically Create Home Directory"
+msgstr "Yakha i-Home Directory lapho Ungena"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "All Authentication Realms"
+msgstr "&Imodi Yokugunyaza"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Realm"
+msgstr "Susa"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+msgid "Change Settings"
+msgstr ""
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "User Logon Configuration"
+msgstr "Ukuhlelwa Kwe-Global"
+
+#: src/lib/authui/main_dialog.rb:68
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "LDAP/Kerberos Configuration"
+msgstr "Ukuhlelwa Kwe-Global"
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr "Igama"
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr "I-value"
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+#, fuzzy
+#| msgid "Network Service"
+msgid "Network Domain"
+msgstr "Isevisi Yenethiwekhi"
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+msgid "Identity Domains"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr "Incazelo"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name filter:"
+msgstr "Isisefo:"
+
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
#, fuzzy
#| msgid "None"
msgid "None."
msgstr "Akukho lutho"
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
#, fuzzy
#| msgid "Modem Parameters"
msgid "Mandatory Parameters"
msgstr "Amapharamitha Emodemu"
-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
#, fuzzy
#| msgid "Optional Parameter File"
msgid "Optional Parameters"
msgstr "Ifayela Yamapharamitha Ongayikhetha Uma Uthanda"
#. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
msgid "Please complete all of the following mandatory parameters:\n"
msgstr ""
-#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
#, fuzzy
-#| msgid "Authentication Method"
-msgid "Authentication Client Configuration"
-msgstr "Indlela Yokugunyaza"
-
-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
+#| msgid "Global Configuration"
+msgid "Global Options"
msgstr "Ukuhlelwa Kwe-Global"
-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
+#: src/lib/authui/sssd/main_dialog.rb:40
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name switch"
+msgstr "Isisefo:"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication"
+msgstr "&Imodi Yokugunyaza"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
+#. Render overview and edit buttons on left side, config editor on right side.
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:77
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Create Home Directory"
msgstr "Yakha i-Home Directory lapho Ungena"
-#: src/lib/yauthclient/main_dialog.rb:68
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
#, fuzzy
-#| msgid "Enable the NTP daemon"
-msgid "Enable SSSD daemon"
-msgstr "Vula i-daemon ye-NTP"
+#| msgid "Domain"
+msgid "Join Domain"
+msgstr "I-domain"
-#: src/lib/yauthclient/main_dialog.rb:73
+#: src/lib/authui/sssd/main_dialog.rb:92
#, fuzzy
+#| msgid "Domain"
+msgid "Leave Domain"
+msgstr "I-domain"
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+#, fuzzy
#| msgid "Selections"
-msgid "Sections"
+msgid "Service Options"
msgstr "Okukhethiwe"
-#: src/lib/yauthclient/main_dialog.rb:76
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
#, fuzzy
-#| msgid "Network Service"
-msgid "New Service/Domain"
-msgstr "Isevisi Yenethiwekhi"
+#| msgid "Domain"
+msgid "Domain Options"
+msgstr "I-domain"
-#: src/lib/yauthclient/main_dialog.rb:77
-#, fuzzy
-#| msgid "Create Service"
-msgid "Delete Service/Domain"
-msgstr "Yakha Isevisi"
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
#. TRANSLATORS: Label of the area used to customise parameters.
#. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
-msgid "Customisation - %s"
+#: src/lib/authui/sssd/main_dialog.rb:172
+msgid "Options - %s"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
-msgstr "Igama"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
-msgstr "I-value"
+#: src/lib/authui/sssd/main_dialog.rb:220
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Do you really wish to erase configuration for domain %s?"
+msgstr "Ingabe ngempela ufuna ukususa iphathishini %1?"
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
-msgstr "Incazelo"
+#. Enable/disable SSSD daemon
+#: src/lib/authui/sssd/main_dialog.rb:252
+msgid ""
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. For the currently selected config section, render list of additional parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-#, fuzzy
-#| msgid "Modem Parameters"
-msgid "More Parameters"
-msgstr "Amapharamitha Emodemu"
+#. Enable/disable NSS password database
+#: src/lib/authui/sssd/main_dialog.rb:284
+msgid ""
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:140
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name filter:"
-msgstr "Isisefo:"
+#. Enable/disable NSS group database
+#: src/lib/authui/sssd/main_dialog.rb:302
+msgid ""
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
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"
-"Do you want to continue?"
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"Sudo data source has been globally enabled.\n"
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
msgstr ""
-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-#, fuzzy
-#| msgid "Really delete section %1?"
-msgid "You may not delete section SSSD."
-msgstr "Uyayisula ngempela le ngxenye'%1'?"
+#. Enable/disable NSS automount database
+#: src/lib/authui/sssd/main_dialog.rb:342
+msgid ""
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:225
-#, fuzzy
-#| msgid "Do you really want to delete partition %1?"
-msgid "Do you really wish to delete section %s?"
-msgstr "Ingabe ngempela ufuna ukususa iphathishini %1?"
+#: src/lib/authui/sssd/main_dialog.rb:350
+msgid ""
+"Automount data source has been globally enabled.\n"
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
+msgstr ""
+#. Enable/disable PAC responder
+#: src/lib/authui/sssd/main_dialog.rb:374
+msgid ""
+"MS-PAC data source has been globally enabled.\n"
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
+msgstr ""
+
#. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
#, fuzzy
#| msgid "Modem Parameter Details"
msgid "Confirm parameter removal: "
msgstr "Imininingwane Yepharamitha Yemodemu"
-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to continue?"
+"Do you still wish to remove the parameter?"
msgstr ""
#. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
+#: src/lib/authui/sssd/main_dialog.rb:434
#, fuzzy
#| msgid "Logging enabled"
-msgid "No domain enabled"
+msgid "No domain"
msgstr "Ukuloga kuvuliwe"
-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
msgid ""
-"No domain has been enabled in [sssd] \"domains\" parameter.\n"
-"SSSD will not start, and only local authentication will be available.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
+"SSSD will fail to start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
msgstr ""
-#. Render input box and dropdowns for service/domain creation
-#: src/lib/yauthclient/new_section_dialog.rb:49
-#, fuzzy
-#| msgid "Would you like to open this profile in editing mode?"
-msgid "Would you like to enable another service or join a domain?"
-msgstr "Ungathanda ukuvula le phrofayili kwimodi yokuhlela?"
+#. The frame is shown only if AD server can be discovered or is explicitly specified
+#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
+#: src/lib/authui/sssd/manage_ad_dialog.rb:68
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
+msgstr ""
-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
-msgstr "Isevisi"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
+msgstr ""
-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
-msgstr "I-domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com)"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:64
-#, fuzzy
-#| msgid "Identification:"
-msgid "Identification provider:"
-msgstr "I-ID:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:69
-#, fuzzy
-#| msgid "&Authentication Mode"
-msgid "Authentication provider:"
-msgstr "&Imodi Yokugunyaza"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
msgstr ""
-#. 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 "La masevisi azovulwa"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
+msgstr ""
-#. 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 "Faka igama lephrofayili entsha."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+msgid ""
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:126
-#, fuzzy
-#| msgid "This domain is already defined."
-msgid "The domain name is already in-use."
-msgstr "Le domaini isibonisiwe kakade."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
+msgstr ""
-#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
msgstr ""
-#: src/lib/yauthclient/params.rb:114
-msgid "Comma separated list of services that are started when sssd itself starts."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
msgstr ""
-#: src/lib/yauthclient/params.rb:115
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
msgid ""
+"Enrollment has completed successfully!\n"
"\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+"Command output:\n"
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"
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+msgid ""
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
msgstr ""
-#: 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."
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
msgstr ""
-#: src/lib/yauthclient/params.rb:126
-msgid "This parameter contains the list of domains in the order these will be queried."
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
msgstr ""
-#: 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"
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
msgstr ""
-#: src/lib/yauthclient/params.rb:143
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
msgstr ""
-#: 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."
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com)"
msgstr ""
+#: src/lib/authui/sssd/new_section_dialog.rb:78
+msgid "Which service provides identity data, such as user names and group memberships?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
+#, fuzzy
+#| msgid "Enable the NTP daemon"
+msgid "Enable the domain"
+msgstr "Vula i-daemon ye-NTP"
+
+#. Create new domain
+#: src/lib/authui/sssd/new_section_dialog.rb:106
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter the domain name."
+msgstr "Faka igama lephrofayili entsha."
+
+#: src/lib/authui/sssd/new_section_dialog.rb:109
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:112
+#, fuzzy
+#| msgid "This domain is already defined."
+msgid "The domain name is already in-use."
+msgstr "Le domaini isibonisiwe kakade."
+
+#. Define Global Parameters
+#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:119
+msgid "The regular expression parses user name and domain name into components"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:123
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:127
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:131
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:135
+msgid "A default domain name for all names without a domian name component"
+msgstr ""
+
#. Define Global Services Parameters
-#: 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."
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
+#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
+#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
msgstr ""
-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
msgid "Add a timestamp to the debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
msgid "Add microseconds to the timestamp in debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
+#: src/lib/authui/sssd/params.rb:161
+msgid "Timeout in seconds between heartbeats for this service"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:171
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:176
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:181
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
msgstr ""
-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/yauthclient/params.rb:202
+#: src/lib/authui/sssd/params.rb:198
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 ""
-#: src/lib/yauthclient/params.rb:207
+#: src/lib/authui/sssd/params.rb:203
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 ""
-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
msgid "Exclude certain users from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
msgid "If you want filtered user to still be group members set this option to false."
msgstr ""
-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr ""
-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr ""
-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
msgid "Override the login shell for all users."
msgstr ""
-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
msgid "Restrict user shell to one of the listed values."
msgstr ""
-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
msgid "Replace any instance of these shells with the shell_fallback"
msgstr ""
-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr ""
-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr ""
-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:291
+#: src/lib/authui/sssd/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 ""
#. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
msgid "Display a warning N days before the password expires."
msgstr ""
-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr ""
-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: src/lib/authui/sssd/params.rb:325
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr ""
-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr ""
-#: src/lib/yauthclient/params.rb:330
+#: src/lib/authui/sssd/params.rb:342
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr ""
-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr ""
-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/yauthclient/params.rb:355
+#: src/lib/authui/sssd/params.rb:371
msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
msgstr ""
-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/yauthclient/params.rb:401
+#: src/lib/authui/sssd/params.rb:417
msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
msgid "The identification provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:413
+#: src/lib/authui/sssd/params.rb:429
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 ""
-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
msgstr ""
-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
msgid "The access control provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
msgid "The provider which should handle change password operations for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
msgid "The SUDO provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
msgid "The provider which should handle loading of selinux settings."
msgstr ""
-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
msgid "The provider which should handle fetching of subdomains."
msgstr ""
-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
msgid "The autofs provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
msgid "The provider used for retrieving host identity information."
msgstr ""
-#: src/lib/yauthclient/params.rb:466
+#: src/lib/authui/sssd/params.rb:482
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr ""
-#: src/lib/yauthclient/params.rb:471
+#: src/lib/authui/sssd/params.rb:487
msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
msgstr ""
-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr ""
-#: src/lib/yauthclient/params.rb:482
+#: src/lib/authui/sssd/params.rb:498
msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr ""
-#: src/lib/yauthclient/params.rb:486
+#: src/lib/authui/sssd/params.rb:502
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr ""
-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr ""
-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:516
msgid "Treat user and group names as case sensitive."
msgstr ""
-#: src/lib/yauthclient/params.rb:500
+#: src/lib/authui/sssd/params.rb:521
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 ""
-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:526
msgid "Use this homedir as default value for all subdomains within this domain."
msgstr ""
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:532
msgid "Comma separated list of users who are allowed to log in."
msgstr ""
-#: src/lib/yauthclient/params.rb:516
+#: src/lib/authui/sssd/params.rb:537
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:521
+#: src/lib/authui/sssd/params.rb:542
msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr ""
#. 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/lib/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:551
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:556
msgid "Indicate if a home directory should be created by default for new users."
msgstr ""
-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:561
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr ""
-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:566
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:550
+#: src/lib/authui/sssd/params.rb:571
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 ""
-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:576
msgid "The mail spool directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:580
msgid "The command that is run after a user is removed."
msgstr ""
#. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:589
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:595
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:601
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr ""
-#: src/lib/yauthclient/params.rb:579
+#: src/lib/authui/sssd/params.rb:606
msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr ""
-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
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 ""
-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:624
#, fuzzy
#| msgid "Password for LDAP server"
msgid "Base DN for LDAP search"
msgstr "Iphasiwedi yesiphakelalwazi se-LDAP"
-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:631
#, fuzzy
#| msgid "LDAP secure port"
msgid "LDAP schema type"
msgstr "I-port ephephile ye-LDAP:"
-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:635
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:641
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:645
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:650
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:655
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:660
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:665
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:670
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:675
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:680
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:685
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:690
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:673
+#: src/lib/authui/sssd/params.rb:700
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 ""
-#: src/lib/yauthclient/params.rb:678
+#: src/lib/authui/sssd/params.rb:705
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 ""
-#: src/lib/yauthclient/params.rb:683
+#: src/lib/authui/sssd/params.rb:710
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 ""
-#: src/lib/yauthclient/params.rb:688
+#: src/lib/authui/sssd/params.rb:715
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 ""
-#: src/lib/yauthclient/params.rb:693
+#: src/lib/authui/sssd/params.rb:720
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 ""
-#: src/lib/yauthclient/params.rb:698
+#: src/lib/authui/sssd/params.rb:725
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 ""
-#: src/lib/yauthclient/params.rb:703
+#: src/lib/authui/sssd/params.rb:730
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 ""
-#: src/lib/yauthclient/params.rb:708
+#: src/lib/authui/sssd/params.rb:735
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 ""
-#: src/lib/yauthclient/params.rb:713
+#: src/lib/authui/sssd/params.rb:740
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 ""
-#: src/lib/yauthclient/params.rb:718
+#: src/lib/authui/sssd/params.rb:745
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 ""
-#: src/lib/yauthclient/params.rb:723
+#: src/lib/authui/sssd/params.rb:750
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:755
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:760
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:738
+#: src/lib/authui/sssd/params.rb:765
msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:770
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr ""
-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:774
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/yauthclient/params.rb:752
+#: src/lib/authui/sssd/params.rb:779
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 ""
-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:780
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:785
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr ""
-#: src/lib/yauthclient/params.rb:763
+#: src/lib/authui/sssd/params.rb:790
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 ""
-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:795
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:800
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/yauthclient/params.rb:778
+#: src/lib/authui/sssd/params.rb:805
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 ""
-#: src/lib/yauthclient/params.rb:783
+#: src/lib/authui/sssd/params.rb:810
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 ""
-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:820
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:825
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:830
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:835
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:840
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:845
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:850
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:829
+#: src/lib/authui/sssd/params.rb:856
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 ""
-#: src/lib/yauthclient/params.rb:835
+#: src/lib/authui/sssd/params.rb:862
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 ""
-#: src/lib/yauthclient/params.rb:841
+#: src/lib/authui/sssd/params.rb:868
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 ""
-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:874
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:880
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:885
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:890
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:895
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:905
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:910
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr ""
-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:915
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:920
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:899
+#: src/lib/authui/sssd/params.rb:926
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/yauthclient/params.rb:904
+#: src/lib/authui/sssd/params.rb:931
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 ""
-#: src/lib/yauthclient/params.rb:909
+#: src/lib/authui/sssd/params.rb:936
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 ""
-#: src/lib/yauthclient/params.rb:914
+#: src/lib/authui/sssd/params.rb:941
msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr ""
-#: src/lib/yauthclient/params.rb:919
+#: src/lib/authui/sssd/params.rb:946
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr ""
-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:951
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr ""
-#: src/lib/yauthclient/params.rb:929
+#: src/lib/authui/sssd/params.rb:956
msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr ""
-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:961
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/yauthclient/params.rb:938
+#: src/lib/authui/sssd/params.rb:965
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr ""
-#: src/lib/yauthclient/params.rb:943
+#: src/lib/authui/sssd/params.rb:970
msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:977
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:981
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr ""
-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:985
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr ""
-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:993
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:998
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:1003
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr ""
-#: src/lib/yauthclient/params.rb:981
+#: src/lib/authui/sssd/params.rb:1008
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 ""
-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1012
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1017
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1022
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:1000
+#: src/lib/authui/sssd/params.rb:1027
msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr ""
-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1032
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1037
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1042
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1047
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1052
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1057
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1034
+#: src/lib/authui/sssd/params.rb:1061
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1039
+#: src/lib/authui/sssd/params.rb:1066
msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
msgstr ""
-#: src/lib/yauthclient/params.rb:1044
+#: src/lib/authui/sssd/params.rb:1071
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 ""
-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1076
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1082
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1087
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/yauthclient/params.rb:1065
+#: src/lib/authui/sssd/params.rb:1092
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr ""
-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1105
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1109
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 ""
-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1114
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr ""
-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1128
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1133
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1138
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr ""
-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1143
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1148
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1126
+#: src/lib/authui/sssd/params.rb:1153
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 ""
-#: src/lib/yauthclient/params.rb:1130
+#: src/lib/authui/sssd/params.rb:1157
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1134
+#: src/lib/authui/sssd/params.rb:1161
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1165
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1170
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1174
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1179
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1191
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1196
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1173
+#: src/lib/authui/sssd/params.rb:1200
msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1209
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:1194
+#: src/lib/authui/sssd/params.rb:1222
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1199
+#: src/lib/authui/sssd/params.rb:1227
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1240
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1217
+#: src/lib/authui/sssd/params.rb:1245
msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1257
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1262
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1238
-msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1272
#, fuzzy
#| msgid "The automounter package will be installed.\n"
msgid "The automounter location this IPA client will be using."
msgstr "Isixhakathisi esisebenza ngokuzenzakalelayo sizofakwa.\n"
-#: src/lib/yauthclient/params.rb:1248
+#: src/lib/authui/sssd/params.rb:1277
msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
msgstr ""
-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1282
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1286
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
-#. 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 ""
+#, fuzzy
+#~| msgid "Authentication Method"
+#~ msgid "Authentication Client Configuration"
+#~ msgstr "Indlela Yokugunyaza"
-#: src/modules/AuthClient.rb:232
-msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
-msgstr ""
+#, fuzzy
+#~| msgid "Create Service"
+#~ msgid "Delete Service/Domain"
+#~ msgstr "Yakha Isevisi"
-#. end Export
-#. ################################################################
-#. ################################################################
-#. Summary()
-#. returns html formated configuration summary
-#. @return summary
-#: src/modules/AuthClient.rb:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Modem Parameters"
+#~ msgid "More Parameters"
+#~ msgstr "Amapharamitha Emodemu"
-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Really delete section %1?"
+#~ msgid "You may not delete section SSSD."
+#~ msgstr "Uyayisula ngempela le ngxenye'%1'?"
-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Would you like to open this profile in editing mode?"
+#~ msgid "Would you like to enable another service or join a domain?"
+#~ msgstr "Ungathanda ukuvula le phrofayili kwimodi yokuhlela?"
-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr ""
+#~ msgid "Service"
+#~ msgstr "Isevisi"
+#, fuzzy
+#~| msgid "Identification:"
+#~ msgid "Identification provider:"
+#~ msgstr "I-ID:"
+
+#, fuzzy
+#~| msgid "These services will be enabled"
+#~ msgid "There are no more services to be enabled."
+#~ msgstr "La masevisi azovulwa"
+
#~ msgid "Cancel"
#~ msgstr "Khansela"
@@ -1187,6 +1797,3 @@
#~ msgid "Edit"
#~ msgstr "Hlela"
-
-#~ msgid "Delete"
-#~ msgstr "Susa"
Modified: trunk/yast/zu/po/auth-server.zu.po
===================================================================
--- trunk/yast/zu/po/auth-server.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/auth-server.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -293,8 +293,7 @@
msgstr ""
#. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
msgid "Firewall Settings"
msgstr "Amasethingi Esihenqo Esiyisivikelo"
@@ -437,12 +436,12 @@
msgid "Configure Account for Replication"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
msgid "is not a valid LDAP DN"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
msgid "Password"
msgstr "Iphasiwedi"
@@ -468,8 +467,8 @@
msgid "Provider Details"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
msgid "Protocol"
msgstr "Iphrothokholi"
@@ -477,7 +476,7 @@
msgid "Provider Hostname"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
msgid "Use StartTLS"
msgstr ""
@@ -558,8 +557,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
msgid "The test returned the following error messages:"
msgstr ""
@@ -1822,8 +1821,7 @@
#. Initialization dialog contents
#. Initialization dialog contents
#: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
#: src/include/auth-server/wizards.rb:207
#: src/include/auth-server/wizards.rb:300
msgid "Initializing..."
@@ -2197,7 +2195,7 @@
msgid "Index Cache (IDL cache)"
msgstr ""
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
msgid "Checkpoint Settings"
msgstr ""
@@ -2267,7 +2265,7 @@
msgstr ""
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
msgid "Password Policy Settings"
msgstr "Amasethingi Enqubomgomo Yephasiwedi"
@@ -2428,237 +2426,237 @@
msgstr ""
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
msgid "The error message was: '"
msgstr ""
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
msgid "Try again?"
msgstr "Phinda uzame?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
msgid "Available Attribute Types"
msgstr ""
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
msgid "Selected Attribute Types"
msgstr ""
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
msgid "Who should this rule apply to"
msgstr ""
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
msgid "Entry DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
msgid "Select"
msgstr ""
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
msgid "Define the Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
msgid "Stop access control evaluation here (default)"
msgstr ""
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
msgid "Continue with next access control rule (\"break\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
msgid "Continue evaluation of this rule (\"continue\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
msgid "Please enter a DN in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
msgid "Subtree DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
msgid "Group DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
msgid "Edit Access Control Rule"
msgstr ""
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
msgid "Target Objects"
msgstr ""
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
msgid "Matching the filter:"
msgstr ""
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
msgid "LDAP Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
msgid "Apply this rule only to the listed attribute"
msgstr ""
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
msgid "Attributes"
msgstr "Ama-athribhuthi"
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
msgid "Edit"
msgstr "Hlela"
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
msgid "Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
msgid "Who"
msgstr ""
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
msgid "DN"
msgstr "DN"
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
msgid "Flow Control"
msgstr ""
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
msgid "Up"
msgstr ""
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
msgid "Down"
msgstr ""
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
msgid "Enter valid a LDAP filter in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
msgid "You must add at least one item to the \"Access Level\" list."
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Target"
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
msgid "This database is a Replication Consumer."
msgstr ""
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
msgid "Provider Name"
msgstr ""
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
msgid "Port"
msgstr "I-Port"
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
msgid "Replication Type"
msgstr ""
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
msgid "Replication Interval"
msgstr ""
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
msgid "Days"
msgstr "Izinsuku"
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
msgid "Hours"
msgstr "Amahora"
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
msgid "Minutes"
msgstr "Imizuzu"
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
msgid "Seconds"
msgstr "Imizuzwana"
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
msgid "Authentication DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
msgid "Custom update referral"
msgstr ""
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
msgid "Target Host"
msgstr ""
#. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
msgid "Invalid replication interval specified"
msgstr ""
#. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
msgid "Checking LDAP connectivity to the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
msgid "Do you still want to continue?"
msgstr ""
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr ""
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
msgid "Enable ldapsync provider for this database"
msgstr ""
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
msgid "Operations"
msgstr ""
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
msgid "Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
msgid "Enable Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
msgid "Replication Settings"
msgstr ""
Modified: trunk/yast/zu/po/autoinst.zu.po
===================================================================
--- trunk/yast/zu/po/autoinst.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/autoinst.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -29,7 +29,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
msgid "This may take a while"
msgstr "Lokhu kungase kuthathe isikhashana"
@@ -51,14 +51,13 @@
#. command line options
#. Init variables
-#. Import users configuration from the profile
-#.
+#. unique id
#. 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:410
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
@@ -269,7 +268,7 @@
msgstr "Khetha ifayela ethebuleni kuqala."
#. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -280,75 +279,59 @@
" </p>"
#. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
msgid "Progress"
msgstr "Intuthuko"
#. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
msgid "Configuring System according to auto-install settings"
msgstr "Isistimu Yokuhlela ngokuvumelana namasethingi okuzifaka kohlela (auto-install)"
#. 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."
+#: src/clients/inst_autoconfigure.rb:94
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>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:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
msgid "Configuring %1"
msgstr "Iyahlela %1"
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
msgid "Not Configuring %1"
msgstr "Ayihleli %1"
#. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
msgid "Executing Post-Scripts"
msgstr "Irana (executing) Imibhalo Nezithombe Zekhasi (Post-Scripts)"
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
+#. Do not restart NetworkManager* services
+#. bnc#955260
#: src/clients/inst_autoconfigure.rb:304
#, fuzzy
#| msgid "Restarting services"
msgid "Restarting all running services"
msgstr "Iqala kabusha amasevisi"
-#: src/clients/inst_autoconfigure.rb:327
+#. Filtering out all services which must not to be restarted
+#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr ""
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
msgid "Finishing Configuration"
msgstr "Iphothula Ukuhlela"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:447
#, fuzzy
msgid "Processing resource %1"
msgstr "Ihlola umthombo %1"
@@ -409,8 +392,15 @@
"%1"
msgstr "Umbhalo we-SuSEconfig uhlulekile."
-#. import "Arch";
#. encoding: utf-8
+#. File: clients/inst_autoinit.ycp
+#. Package: Auto-installation
+#. Summary: Parses XML Profile for automatic installation
+#. Authors: Anas Nashif <nashif(a)suse.de>
+#.
+#. $Id$
+#.
+#. encoding: utf-8
#. File: clients/autoinst_post.ycp
#. Package: Auto-installation
#. Author: Anas Nashif <nashif(a)suse.de>
@@ -418,7 +408,7 @@
#. the system as described in the profile file.
#.
#. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
msgid ""
"<p>\n"
"Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -426,59 +416,45 @@
"<p>\n"
"Sicela ulinde ngesikhathi isistimu izilungisela ukufakwa kohlelo ngokuzenzekelayo (autoinstallation).</p>\n"
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
msgid "Probe hardware"
msgstr "Phenyisisa i-hardware"
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
msgid "Retrieve & Read Control File"
msgstr "Thola Ufunda Ifayela Elawulayo (Read Control File)"
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
msgid "Parse control file"
msgstr "Nqamunqamula ifayela elawulayo"
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
msgid "Initial Configuration"
msgstr "Ukuhlela Kokuqala"
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
msgid "Preparing System for Automatic Installation"
msgstr "Ilungiselela Isistimu Ukuba Izifakele Ngokwayo Uhlelo"
#. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
msgid "Preprobing stage"
msgstr "Isigaba sangaphambi kokuphenyisisa"
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
msgid "Probing hardware..."
msgstr "Iphenyisisa i-hardware..."
+#. 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_autoinit.rb:128
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+
#. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
msgid "Parsing control file"
msgstr "Ukunqamunqamula ifayela elawulayo"
@@ -522,59 +498,69 @@
#. Uwe Gansert <ug(a)suse.de>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>Sicela ulinde ngesikhathi isistimu izilungisela ukufakwa kohlelo ngokuzenzekelayo (autoinstallation).</P>"
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
msgid "Execute pre-install user scripts"
msgstr "Isingatha ama-script omsebenzisi afakwa ngaphambi kohlelo "
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
msgid "Configure General Settings "
msgstr "Hlela Amasethingi Avamile"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
msgid "Set up language"
msgstr "Hlela ulimi"
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:58
msgid "Create partition plans"
msgstr "Yakha izinhlelo zokuhlukanisa ugalaza (partition plans)"
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
msgid "Configure Bootloader"
msgstr "Hlela i-Bootloader"
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
#, fuzzy
#| msgid "Registration Code"
msgid "Registration"
msgstr "Ikhodi Yokubhalisa"
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure Software selections"
msgstr "Hlela Ama-software owakhethile"
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:62
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:63
#, fuzzy
#| msgid "Configure Volume Groups"
msgid "Configure users and groups"
msgstr "Hlela Ama-Volume Group"
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "Hlela (configure) Ama-drive"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
msgid "Executing pre-install user scripts..."
msgstr "Isingatha ama-script omsebenzisi afakwa ngaphambi kohlelo..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configuring general settings..."
msgstr "Ukuhlela amasethingi avamile..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
#, fuzzy
#| msgid "Set up language"
msgid "Setting up language..."
@@ -584,17 +570,17 @@
msgid "Creating partition plans..."
msgstr "Yakha izinhlelo zokuhlukanisa ugalaza (partition plans)..."
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
msgid "Configuring Bootloader..."
msgstr "Ihlela i-Bootloader..."
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
#, fuzzy
#| msgid "Repairing file system..."
msgid "Registering the system..."
msgstr "Ilungisa isistimu yefayela..."
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring Software selections..."
msgstr "Ihlela Ama-software owakhethile..."
@@ -608,7 +594,19 @@
msgid "Importing users and groups configuration..."
msgstr ""
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "Ikudlulisa Ifayela Yokuqalisa..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "Ihlela Ulimi"
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
msgid "Preparing System for Automated Installation"
msgstr "Ilungiselela Isistimu Ukuba Izifakele Ngokwayo Uhlelo"
@@ -617,7 +615,7 @@
#. while the general inst_finish process at the end of the
#. first stage. But for the installation workflow the linuxrc
#. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#: src/clients/inst_autosetup.rb:185
#, fuzzy
#| msgid "Signing the Add-On Product"
msgid "Handling Add-On Products..."
@@ -626,12 +624,12 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
msgid "Configuring language..."
msgstr "Ihlela Ulimi"
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:298
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -639,8 +637,9 @@
"Kwenzeke iphutha ngesikhathi ihlela ukuhlukanisa i-hard drive.\n"
"Phinde uzame.\n"
-#. Software
-#: src/clients/inst_autosetup.rb:344
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -720,11 +719,11 @@
#. Select packages
#. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
msgid "Software Selection"
msgstr "Ukukhethwa Kwe-software"
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
msgid ""
"<p>\n"
"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
@@ -739,21 +738,21 @@
#. AutoinstSoftware::pmInit();
#. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
#. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
msgstr ""
-#: src/clients/software_auto.rb:128
+#: src/clients/software_auto.rb:129
msgid "The inst-source of this system (you can't create images if you choose this)"
msgstr ""
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
#, fuzzy
#| msgid "&Installation source"
msgid "using that installation source failed"
msgstr "&Imithombo yokufaka uhlelo"
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
msgid "Reading package database..."
msgstr "Ifunda idathabhesi yephakheji..."
@@ -1040,6 +1039,11 @@
msgid "Volgroup device name"
msgstr "&Igama Ledivayisi"
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
#. Shows a dialog when 'control file' can't be found
#. @param [String] original Original value
#. @return [String] new value
@@ -1543,8 +1547,7 @@
msgid "Settings"
msgstr "Amasethingi"
-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
msgid "Select Directory"
msgstr "Khetha i-Directory"
@@ -1668,7 +1671,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
msgid "Checking XML with RNG validation..."
msgstr "Ukuhlola i-XML ngokufakazela nge-RNG..."
@@ -1679,7 +1682,7 @@
msgstr "Ingxenye %1 ayitholakalanga."
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
msgid "Checking XML with RNC validation..."
msgstr "Ukuhlola i-XML ngokufakazela nge-RNC..."
@@ -2077,67 +2080,6 @@
" ukulungiselela.\n"
" </p>\n"
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "Ayiyitholi i-URL'%1' nge-phrothokholi i-HTTP(S) Isiphakelalwazi sibuyise ikhodi %2."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "Ayiyitholi i-URL'%1' nge-phrothokholi i-FTP. Isiphakelalwazi sibuyise ikhodi %2."
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "Ukufunda ifayela kwi-%1/%2 akuphumelelanga.\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr "Ukufunda ifayela kwi-%1 akuphumelelanga.\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:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "Ukumisa (mounting) %1 akuphumelelanga."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "Ukufunda ifayela kwi-CD akuphumelelanga. Umgudu: %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:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "Ifayela ekude %1 ayivumi ukutholakala"
-
-#. this is workaround for bnc#849767
-#. 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: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:505
-msgid "File %1 cannot be found"
-msgstr "Ifayela %1 ayitholakali"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "Ayiyitholi i-URL'%1' nge-phrothokholi i-TFTP."
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "Iphrothokholi engaziwa %1."
-
#. Script Configuration
#. @return script configuration dialog
#: src/include/autoinstall/script_dialogs.rb:30
@@ -2423,12 +2365,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:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "Isinqamunqamuli se-XML sibike iphutha elenzekile ngesikhathi sinqamula iphrofayili ye-autoyast. Umyalezo wephutha yilona:\n"
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
msgid ""
"\n"
"User-defined classes could not be retrieved. Make sure all classes \n"
@@ -2444,46 +2386,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:278
+#: src/modules/AutoinstConfig.rb:279
#, fuzzy
msgid "Choose Profile"
msgstr "&Sebenzisa Iphrofayli"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:335
msgid "Retrieving control file from floppy."
msgstr "Ukuthola ifayela yokulawula kwi-floppy."
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "Ukuthola ifayela yokulawula (%1) esiphakelalwazini se-TFTP: %2."
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "Ukuthola ifayela yokulawula (%1) esiphakelalwazini se-NFS: %2."
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "Ukuthola ifayela yokulawula (%1) esiphakelalwazini se-HTTP: %2."
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:356
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "Ukuthola ifayela yokulawula (%1) esiphakelalwazini se-FTP: %2."
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:362
msgid "Copying control file from file: %1."
msgstr "Ukukopisha ifayela yokulawula uyilanda kwifayela: %1."
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:367
msgid "Copying control file from device: /dev/%1."
msgstr "Ukukopisha ifayela yokulawula uyilanda kwidivayisi: /dev/%1."
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:371
msgid "Copying control file from default location."
msgstr "Ukukopisha ifayela yokulawula endaweni efakwe kuyo ohlelweni (default location)"
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:373
msgid "Source unknown."
msgstr "Umthombo awaziwa."
@@ -2493,7 +2435,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:453
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2503,7 +2445,7 @@
"<p>Cishe yonke imithombo yefayela yokulawula\n"
" ingahlelwa (configured) kusetshenziswa uhlelo lokulawula ukuhlela.</p>\n"
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:458
#, fuzzy
msgid ""
"<p>Most of the modules used to create the configuration are identical to those available\n"
@@ -2518,7 +2460,7 @@
" ukufaka enye isistimu kwi-AutoYaST.\n"
" </p>\n"
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:465
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2628,24 +2570,24 @@
msgstr "Ayizidlulisi izikhiya ezintsha ze-GPG"
#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
+#: src/modules/AutoinstGeneral.rb:419
#, fuzzy
#| msgid "Saving time zone..."
msgid "Syncing time..."
msgstr "Igcina izoni yesikhathi..."
#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
+#: src/modules/AutoinstGeneral.rb:421
msgid "Syncing time with %s."
msgstr ""
-#: src/modules/AutoinstGeneral.rb:420
+#: src/modules/AutoinstGeneral.rb:425
#, fuzzy
#| msgid "Image creation failed."
msgid "Time syncing failed."
msgstr "Ukwakhiwa komfanekiso kuhlulekile."
-#: src/modules/AutoinstGeneral.rb:424
+#: src/modules/AutoinstGeneral.rb:429
#, fuzzy
#| msgid "Cannot mount file system."
msgid "Cannot update system time."
@@ -2671,18 +2613,18 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
msgid "Drives"
msgstr "Ama-drive"
#. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
msgid "%s drive in total"
msgid_plural "%s drives in total"
msgstr[0] ""
msgstr[1] ""
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
#, fuzzy
#| msgid "Not detected."
msgid "Not yet cloned."
@@ -2690,23 +2632,23 @@
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
msgid "Preinstallation Scripts"
msgstr "Ama-Script Afakwa Ngaphambi Kokufakwa Kohlelo"
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
msgid "Postinstallation Scripts"
msgstr "Ama-Script Afakwa Ngemva Kokufakwa Kohlelo"
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
msgid "Chroot Scripts"
msgstr "Ama-Chroot Script"
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
msgid "Init Scripts"
msgstr "Ama-Script Okuqala"
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
#, fuzzy
msgid "Postpartitioning Scripts"
msgstr "Ama-Script Afakwa Ngemva Kokufakwa Kohlelo"
@@ -2714,33 +2656,33 @@
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
msgid "Pre"
msgstr "Ngaphambi"
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
msgid "Post"
msgstr "Ngemva"
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
msgid "Init"
msgstr "Okuqala"
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
msgid "Chroot"
msgstr "E-Chroot"
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
#, fuzzy
msgid "Postpartitioning"
msgstr "Ukwenza amaphathishini "
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
msgid "Unknown"
msgstr "Akwaziwa"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:174
#, fuzzy
msgid ""
"These packages could not be found in the software repositories:\n"
@@ -2751,29 +2693,29 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
#, fuzzy
#| msgid "Reading file on %1 failed.\n"
msgid "Adding repo %1 failed"
msgstr "Ukufunda ifayela kwi-%1 akuphumelelanga.\n"
#. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:377
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:385
#, fuzzy
#| msgid "Checking installed packages..."
msgid "Creating Image - installing packages"
msgstr "Ihlola amaphakheji afakiwe..."
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:395
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:404
+#: src/modules/AutoinstSoftware.rb:406
#, fuzzy
#| msgid "Retrieving image file..."
msgid "Store image to ..."
@@ -2781,60 +2723,60 @@
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:435
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:447
+#: src/modules/AutoinstSoftware.rb:449
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:456
#, fuzzy
#| msgid "Archive created successfully"
msgid "Image created successfully"
msgstr "Inqolobane yakhiwe ngempumelelo"
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:492
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:524
+#: src/modules/AutoinstSoftware.rb:526
#, fuzzy
#| msgid "Image creation failed."
msgid "can not read '%1'. Try again?"
msgstr "Ukwakhiwa komfanekiso kuhlulekile."
#. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:544
#, fuzzy
#| msgid "Image creation failed."
msgid "can not read '%1'. ISO creation failed"
msgstr "Ukwakhiwa komfanekiso kuhlulekile."
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:574
#, fuzzy
#| msgid "Creating ISO image directory..."
msgid "Preparing ISO Filestructure ..."
msgstr "Yakha umkhombandlela wemifanekiso ye-ISO..."
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:623
msgid "boot config for the DVD"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:627
msgid "Ok"
msgstr "Ok"
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:630
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."
@@ -2842,19 +2784,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:647
+#: src/modules/AutoinstSoftware.rb:649
#, fuzzy
#| msgid "Creating ISO image..."
msgid "Store ISO image to ..."
msgstr "Yakha i-Imeji ye-ISO..."
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:650
#, fuzzy
#| msgid "Creating ISO image..."
msgid "Creating ISO File ..."
msgstr "Yakha i-Imeji ye-ISO..."
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:671
#, fuzzy
#| msgid "Successfully Tested %1"
msgid "ISO successfully created at %1"
@@ -2862,30 +2804,30 @@
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:753
msgid "Selected Patterns"
msgstr "Amaphethini Akhethiwe"
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:763
msgid "Individually Selected Packages"
msgstr "Amaphakheji Akhethwe Ngamanye"
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:769
msgid "Packages to Remove"
msgstr "Amaphakheji Okumelwe Asuswe"
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:776
msgid "Force Kernel Package"
msgstr "Iphakheji Ye-Force Kernel"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:871
#, fuzzy
msgid "Could not set patterns: %1."
msgstr "Ayikwazanga ukusetha amaphethini noma okukhethiwe: %1."
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:932
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr "Ukusebenza kwesixazululi sephakheji kuhlulekile. Sicela uhlole ingxenye ye-software yephrofayili ye-autoyast."
@@ -2933,14 +2875,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:363
msgid "Collecting configuration data..."
msgstr "Iqoqa ukwaziswa kokuhlela..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:466
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr ""
@@ -2948,7 +2890,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:540
#, fuzzy
msgid "Could not write section %1 to file %2."
msgstr "Ayikwazi ukubhala okuphawuliwe kwifayela %1."
@@ -2956,7 +2898,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
@@ -2974,6 +2916,36 @@
msgid "&OK"
msgstr "&OK"
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "Ayiyitholi i-URL'%1' nge-phrothokholi i-HTTP(S) Isiphakelalwazi sibuyise ikhodi %2."
+
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "Ayiyitholi i-URL'%1' nge-phrothokholi i-FTP. Isiphakelalwazi sibuyise ikhodi %2."
+
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "Ukufunda ifayela kwi-%1/%2 akuphumelelanga.\n"
+
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "Ukufunda ifayela kwi-%1 akuphumelelanga.\n"
+
+#~ msgid "Mounting %1 failed."
+#~ msgstr "Ukumisa (mounting) %1 akuphumelelanga."
+
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "Ukufunda ifayela kwi-CD akuphumelelanga. Umgudu: %1/%2."
+
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "Ifayela ekude %1 ayivumi ukutholakala"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "Ifayela %1 ayitholakali"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "Ayiyitholi i-URL'%1' nge-phrothokholi i-TFTP."
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "Iphrothokholi engaziwa %1."
+
#~ msgid "Configure runlevel"
#~ msgstr "Hlela i-runlevel"
@@ -3107,9 +3079,6 @@
#~ " Ukuze uthole ukwaziswa okwengeziwe, xhumana nezincwadi eziqukethe ulwazi (documentation).\n"
#~ " </P>\n"
-#~ msgid "Configure Drives"
-#~ msgstr "Hlela (configure) Ama-drive"
-
#~ msgid "&Drive"
#~ msgstr "&I-drive"
Modified: trunk/yast/zu/po/base.zu.po
===================================================================
--- trunk/yast/zu/po/base.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/base.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -75,79 +75,79 @@
msgstr "Le moduli ye-YaST2 ayiyisekeli i-command line interface."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
msgid "Use 'help' for a complete list of available commands."
msgstr "Sebenzisa 'usizo' ukuze uthole uhlu oluphelele lwamakhomandi atholakalayo."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
msgid "Use 'yast2 %1 help' for a complete list of available commands."
msgstr "Sebenzisa i-'usizo lwe-yast2 %1' ukuze uthole uhlu oluphelele lwamakhomandi atholakalayo."
#. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
msgid "Unknown Command: %1"
msgstr "Ikhomandi Engaziwa: %1"
#. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
msgid "Option '%1' is missing value."
msgstr "Okukhethile i-'%1' kune-value elahlekile."
#. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
msgid "Unknown option for command '%1': %2"
msgstr "Okukhethiwe okungaziwa kwekhomandi '%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:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
msgid "Invalid value for option '%1': %2"
msgstr "I-value eyiphutha yokukhethiwe i-'%1': %2"
#. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
msgid "Invalid value for option '%1' -- expected '%2', received %3"
msgstr "I-value eyiphutha yokukhethiwe i-'%1' - bekulindeleke i-'%2', kwatholakala i-%3"
#. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
msgid "Option '%1' cannot have a value. Given value: %2"
msgstr "Okukhethiwe i-'%1' akukwazi ukuba ne-value. I-value enikeziwe: %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:541
+#: library/commandline/src/modules/CommandLine.rb:533
msgid "Use '%1 %2 help' for a complete list of available options."
msgstr "Sebenzisa i'usizo lwe-%1 %2' ukuze uthole uhlu oluphelele lwamakhomandi atholakalayo."
#. 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:551
+#: library/commandline/src/modules/CommandLine.rb:543
msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
msgstr "Sebenzisa i'usizo lwe-yast2%1 %2' ukuze uthole uhlu oluphelele lwamakhomandi atholakalayo."
#. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
msgid "YaST Configuration Module %1\n"
msgstr "IModuli Yokuhlela Ye-YaST i-%1\n"
#. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
msgid "No help available"
msgstr "Alukho usizo olutholakalayo"
#. Process <command> "help"
#. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
msgid "Command '%1'"
msgstr "Ikhomandi '%1'"
#. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
msgid ""
"\n"
" Options:"
@@ -156,14 +156,14 @@
" Ongakhetha kukho:"
#. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
msgid ""
"\n"
" Options of the [string] type must be written in the form 'option=value'."
msgstr ""
#. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
msgid ""
"\n"
" Example:"
@@ -172,139 +172,139 @@
" Isibonelo:"
#. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
#, fuzzy
#| msgid "This is a YaST2 module."
msgid "This is a YaST module."
msgstr "Lena yimoduli ye-YaST2."
#. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
msgid "Basic Syntax:"
msgstr "I-Syntax Eyisisekelo:"
#. translators: module command line help, %1 is the module name
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
msgid " yast2 %1 <command> [verbose] [options]"
msgstr "I-yast2 %1 <command> [ulimi oluyinkimbinkimbi] [ongakhetha kukho]"
#. translators: module command line help, %1 is the module name
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
msgid " yast2 %1 <command> help"
msgstr "Usizo <command> lwe-yast2 %1"
#. translators: module command line help
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
msgid " <command> [options]"
msgstr "<command> [ngakhetha kukho]"
#. translators: module command line help
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
msgid " <command> help"
msgstr "<command> usizo"
#. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
msgid "Commands:"
msgstr "Amakhomandi:"
#. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
msgid "No help available."
msgstr "Alukho usizo olutholakalayo."
#. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
msgid "<Error: invalid help>"
msgstr ""
#. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
msgid "Run 'yast2 %1 <command> help' for a list of available options."
msgstr "Qalisa 'usizo lwe-yast2%1 <command>' ukuze uthole uhlu oluphelele lwalokho ongakhetha kukho."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
+#: library/commandline/src/modules/CommandLine.rb:930
msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option."
msgstr "Igama lefayela oyifunayo (i-'xmlfile') ilahlekile. Sebenzisa i-command line option ethi xmlfile=<target_XML_file>."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
+#: library/commandline/src/modules/CommandLine.rb:942
msgid "Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> command line option."
msgstr "Igama lefayela oyifunayo (i-'xmlfile') alinalutho. Sebenzisa i-command line option ethi xmlfile=<target_XML_file>."
#. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
msgid "unknown"
msgstr "akwaziwa"
#. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
msgid "or '%1'"
msgstr "noma '%1'"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
msgid "Specify the command '%1'."
msgstr "Cacisa ikhomandi '%1'."
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
msgid "Specify one of the commands: %1."
msgstr "Cacisa enye yamakhomandi: %1."
#. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
msgid "Specify only one of the commands: %1."
msgstr "Cacisa eyodwa kuphela yamakhomandi: %1."
#. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
msgid "There is no user interface available for this module."
msgstr "Ayikho i-user interface etholakalayo yale moduli."
#. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
msgid "Ready"
msgstr "Isilungele"
#. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
msgid "Initializing"
msgstr "Ilungiselela ukuqala..."
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
msgid "Finishing"
msgstr "Iyaphothula"
#. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
msgid "Done"
msgstr "Kwenziwe."
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
msgid "Quitting (without changes)"
msgstr "Iyayeka (ngaphandle kwezinguquko)"
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
msgid "yes or no?"
msgstr "yebo noma cha?"
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
msgid "yes"
msgstr "yebo"
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
msgid "no"
msgstr "cha"
@@ -385,7 +385,7 @@
#. 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:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1435
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr ""
@@ -399,7 +399,7 @@
#. from YaST logs.
#.
#. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
msgid "Installation Error"
msgstr "Iphutha Ekufakeni Uhlelo"
@@ -424,7 +424,7 @@
msgstr ""
#. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1244
msgid "No workflow defined for this installation mode."
msgstr "Ayikho i-workflow echaziwe ngalesi simo sokufakwa kohlelo (installation mode)."
@@ -442,14 +442,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
msgid "&Continue Installation"
msgstr "&Qhubeka Nokufaka Uhlelo"
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
msgid "&Abort Installation"
msgstr "&Yeka Ukufaka Uhlelo"
@@ -483,13 +483,13 @@
#. make sure that every workflow is merged only once
#. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
#, fuzzy
msgid "An internal error occurred when integrating additional workflow."
msgstr "Kwenzeke iphutha ngesikhathi wakha umthombo wokufaka amafayela (installation source)."
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
msgid "The value of %1 is invalid."
msgstr "I-value ka-%1 inephutha."
@@ -536,7 +536,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:255
#: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
msgid "During Boot"
msgstr "Ngesikhathi Iqaliswa Kabusha"
@@ -545,7 +545,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:257
#: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
msgid "Manually"
msgstr "Lapho uzenzela mathupha"
@@ -556,23 +556,23 @@
msgstr "I-Xinetd"
#. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
#, fuzzy
msgid "Via &xinetd"
msgstr "&I-Xinetd"
#. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
msgid "Service Start"
msgstr "Ukuqalisa Isevisi"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
msgid "Service is running"
msgstr "Isevisi imatasa"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
msgid "Service is not running"
msgstr "Isevisi ayisebenzi"
@@ -581,7 +581,7 @@
#. %1 is eg. "Start the Service Now"
#. %2 is eg. "Stop the Service Now"
#. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
msgid ""
"<p><b><big>Switch On or Off</big></b><br>\n"
"To start or stop the service immediately, use \n"
@@ -595,7 +595,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:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
msgid ""
"<p>To save all changes and restart the\n"
"service immediately, use <b>%3</b>.</p>\n"
@@ -604,48 +604,48 @@
"isevisi ngokushesha, sebenzisa <b>%3</b>.</p>\n"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
msgid "Start the Service Now"
msgstr "Qala Isevisi Manje"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
msgid "Stop the Service Now"
msgstr "Misa Isevisi Manje"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
msgid "Save Changes and Restart Service Now"
msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
#. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
msgid "&Start the Service Now"
msgstr "&Qala Isevisi Manje"
#. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
msgid "S&top the Service Now"
msgstr "M&isa Isevisi Manje"
#. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
msgid "S&ave Changes and Restart Service Now"
msgstr "G&cina Izinguquko Bese Uqala Kabusha Isevisi Manje"
#. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
msgid "Switch On and Off"
msgstr "Vula bese Ucisha"
#. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
msgid "Current Status: "
msgstr "Isimo Samanje:"
#. help text for LDAP enablement widget
#. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
msgid ""
"<p><b><big>LDAP Support</big></b><br>\n"
"To store the settings in LDAP instead of native configuration files,\n"
@@ -656,12 +656,12 @@
" setha <b>%1</b>.</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
msgid "LDAP Support Active"
msgstr "Usizo Lwe-LDAP Luyasebenza"
#. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
msgid "&LDAP Support Active"
msgstr "&Usizo Lwe-LDAP Luyasebenza"
@@ -673,7 +673,7 @@
#. push button
#. push button
#. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
#: library/cwm/src/modules/TablePopup.rb:940
#: library/general/src/modules/Label.rb:166
msgid "&Up"
@@ -681,7 +681,7 @@
#. push button
#. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
#: library/cwm/src/modules/TablePopup.rb:942
msgid "&Down"
msgstr "&Phansi"
@@ -723,12 +723,12 @@
msgstr "Ifayela ebonisiwe ikhona. Yibhale kabusha?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
msgid "The TSIG key ID was not specified."
msgstr "Isikhiye se-TSIG asizange siboniswe."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
msgid ""
"The key with the specified ID exists and is used.\n"
"Remove it?"
@@ -737,7 +737,7 @@
"Sisuse?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
msgid ""
"A key with the specified ID was found\n"
"on your disk. Remove it?"
@@ -746,27 +746,27 @@
"ediskini yakho Sisuse?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
msgid "The key will be created now. Continue?"
msgstr "Isikhiye sizokwakhiwa manje. Qhubeka?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
msgid "Creating the TSIG key failed."
msgstr "Ukwakha isikhiye se-TSIG kuhlulekile."
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
msgid "The specified file does not exist."
msgstr "Ifayela ebonisiwe ayikho."
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
msgid "The specified file does not contain any TSIG key."
msgstr "Ifayela ebonisiwe ayinaso isikhiye se-TSIG."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
msgid ""
"The specified file contains a TSIG key with the same\n"
"identifier as some of already present keys.\n"
@@ -777,7 +777,7 @@
" Izikhiye ezindala zizosuswa. Qhubeka?"
#. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
msgid ""
"<p><big><b>TSIG Key Management</b></big><br>\n"
"Use this dialog to manage the TSIG keys.</p>\n"
@@ -786,7 +786,7 @@
"Sebenzisa lesi sikhiye ukuze ulawule izikhiye ze-TSIG.</p>\n"
#. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
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"
@@ -797,7 +797,7 @@
" enesikhiye bese uchofoza u-<b>Nezela</b>.</p>\n"
#. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
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"
@@ -810,7 +810,7 @@
" <b>Akha</b>.</p>\n"
#. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
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"
@@ -827,27 +827,27 @@
" ekuhleleni kuqala.</p>\n"
#. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
msgid "Add an Existing TSIG Key"
msgstr "Nezela Isikhiye se-TSIG Esesikhona"
#. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
msgid "Create a New TSIG Key"
msgstr "Yakha Isikhiye Esisha se-TSIG"
#. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
msgid "&Key ID"
msgstr "&I-ID Yesikhiye"
#. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
msgid "&Generate"
msgstr "&Akha"
#. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
msgid "Current TSIG Keys"
msgstr "Izikhiye Ze-TSIG Zamanje"
@@ -855,7 +855,7 @@
#. table header - GPG key ID
#. table header - GPG key ID
#. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
#: library/gpg/src/modules/GPGWidgets.rb:192
#: library/gpg/src/modules/GPGWidgets.rb:224
#: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -863,22 +863,22 @@
msgstr "I-ID Yesikhiye"
#. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
msgid "Filename"
msgstr "Igama lefayela"
#. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
msgid "&Selected Option"
msgstr "&Okukhethile"
#. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
msgid "Current Option: "
msgstr "Okukhethwe Njengamanje:"
#. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
msgid "The selected option is already present."
msgstr "Okukhethiwe sekukhona kakade."
@@ -942,19 +942,19 @@
" ohlwini.</p>"
#. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
msgid "&Other"
msgstr "&Okunye"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
msgid "The device is not configured"
msgstr "Idivayisi ayihleliwe"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
msgid "Press <B>Edit</B> to configure"
msgstr "Cindezela u-<B>Hlela</B> ukuze uhlele"
@@ -1111,9 +1111,89 @@
"<p>Kwezinye izimo, wonke noma amanye\n"
"ama-F key awatholakali.</p>"
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+#, fuzzy
+#| msgid "Reading %1 Settings"
+msgid "Restart After Saving Settings"
+msgstr "Ifunda awe- %1 Amasethingi"
+
+#: library/general/src/lib/ui/service_status.rb:61
+#, fuzzy
+#| msgid "Reading %1 Settings"
+msgid "Reload After Saving Settings"
+msgstr "Ifunda awe- %1 Amasethingi"
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+msgid "Service Status"
+msgstr "Isimo Sesevisi"
+
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:129
+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_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</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
+#: library/general/src/lib/ui/service_status.rb:155
+#, fuzzy
+#| msgid "Current Status: "
+msgid "Current status:"
+msgstr "Isimo Samanje:"
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:168
+#, fuzzy
+#| msgid "Activate During Boot"
+msgid "Start During System Boot"
+msgstr "Yenza Kusebenze Ngesikhathi Uqalisa"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:192
+#, fuzzy
+#| msgid "Running"
+msgid "running"
+msgstr "Iyasebenza"
+
+#: library/general/src/lib/ui/service_status.rb:194
+#, fuzzy
+#| msgid "S&top now ..."
+msgid "Stop now"
+msgstr "Y&ima manje..."
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:199
+msgid "stopped"
+msgstr ""
+
+#: library/general/src/lib/ui/service_status.rb:201
+#, fuzzy
+#| msgid "&Start now ..."
+msgid "Start now"
+msgstr "&Qala manje..."
+
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
msgid ""
"Although the path %1 exists, it is not a directory.\n"
"Continue or cancel the operation?\n"
@@ -1123,7 +1203,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:306
+#: library/general/src/modules/FileUtils.rb:300
msgid ""
"The path %1 does not exist.\n"
"Create it now?\n"
@@ -1133,7 +1213,7 @@
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
msgid ""
"Failed to create the directory %1.\n"
"Continue or cancel the current operation?\n"
@@ -1311,7 +1391,7 @@
#. 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:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "&Kweqe"
@@ -1334,7 +1414,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2221
msgid "&Password"
msgstr "&Iphasiwedi"
@@ -1557,27 +1637,27 @@
msgstr ""
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
msgid "Really abort the installation?"
msgstr "Uyakuyeka ngempela ukufaka lolu hlelo?"
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
msgid "Really abort YaST System Repair?"
msgstr "Uyakuyeka Ngempela Ukulungisa Isistimu Ye-YaST?"
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
msgid "Abort System Repair"
msgstr "Kuyeke Ukulungisa Isistimu"
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
msgid "&Continue System Repair"
msgstr "&Qhubeka Nokulungisa Isistimu"
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1590,7 +1670,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:766
+#: library/general/src/modules/Popup.rb:759
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1604,7 +1684,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:775
+#: library/general/src/modules/Popup.rb:768
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1615,18 +1695,18 @@
" Kungase kudingeke uyifake kabusha."
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
msgid "Really abort?"
msgstr "Uyayeka ngempela?"
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
msgid "All changes will be lost!"
msgstr "Zonke izinguquko zizolahleka!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
msgid "&Details..."
msgstr "&Imininingwane..."
@@ -1654,7 +1734,7 @@
#: 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/network/src/modules/NetworkPopup.rb:90
#: library/types/src/modules/String.rb:101
msgid "Yes"
msgstr "&Yebo"
@@ -1665,7 +1745,7 @@
#: 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/network/src/modules/NetworkPopup.rb:89
#: library/types/src/modules/String.rb:101
msgid "No"
msgstr "&Cha"
@@ -1729,7 +1809,7 @@
msgstr "Loga Amaphutha: %1"
#. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
#, fuzzy
#| msgid "Warning:"
#| msgid_plural "Warnings:"
@@ -1737,7 +1817,7 @@
msgstr "Isexwayiso:"
#. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
#, fuzzy
#| msgid "Error:"
#| msgid_plural "Errors:"
@@ -1746,8 +1826,8 @@
#. translators: message summary header
#. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
#, fuzzy
#| msgid "Message:"
#| msgid_plural "Messages:"
@@ -1803,7 +1883,7 @@
msgstr "Su&sa"
#. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
msgid "&Variable"
msgstr "&Ivariyebuli"
@@ -1900,7 +1980,7 @@
msgstr "Faka I-Passphrase"
#. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
msgid "Enter Passphrase to Unlock GPG Key %1: "
msgstr "Faka I-Passphrase ukuze Uvule Isikhiye %1 se-GPG:"
@@ -2007,6 +2087,239 @@
msgid "Error occurred while reading the log."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "Izoni Engaziwa"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"I-Interface '%1' ayabelwanga kunoma yimaphi amazoni efayawoli.\n"
+"Qalisa iFayawoli ye-YaST2 bese uyaba.\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "Izoni Yangaphandle"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "Izoni Yangaphakathi"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "Izoni Engahlonyisiwe"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+#, fuzzy
+msgid "TCP"
+msgstr "I-UTC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+#, fuzzy
+msgid "UDP"
+msgstr "I-UID"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+#, fuzzy
+msgid "RPC"
+msgstr "PCM"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+#, fuzzy
+msgid "IP"
+msgstr "I-IPv6"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"I-Interface '%1' ifakiwe kumazoni amaningi efayawoli.\n"
+"Ukuqhubeka nokuhlela kungaveza amaphutha.\n"
+" \n"
+" Kuyatuseka ukushiya ukuhlela (configuration) bese uyilunisa mathupha\n"
+" kwifayela '/etc/sysconfig/SuSEFirewall'."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "Ilungiselela Ukuqala Ukuhlela IFayawoli"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "Hlola amadivayisi enethiwekhi"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "Funda ukuhlela kwamanje"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "Hlola amasevisi okungenzeka ayangqubuzana"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "Ihlola amadivayisi enethiwekhi..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "Ifunda ukuhlela kwamanje..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "Ihlola amasevisi okungenzeka ayangqubuzana..."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "Ibhala Ukuhlela KweFayawoli"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "Bhala amasethingi efayawoli"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "Lungisa isevisi yefayawoli"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "Ibhala amasethingi efayawoli..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "Ilungisa isevisi yefayawoli..."
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "Ukubhala amasethingi kuhlulekile"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+#, fuzzy
+msgid "Unknown protocol (%1)"
+msgstr "Iphrothokholi engaziwa %1."
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" => [ ],
+#. "rpc_ports" => [ "portmap", "ypbind" ],
+#. "ip_protocols" => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr ""
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+#, fuzzy
+msgid "Service: %{filename}"
+msgstr "Isevisi %1"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "Izikhiye Zasobala ze-GPG"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "Isevisi engaziwa '%1'"
+
#. label
#: library/network/src/modules/CWMFirewallInterfaces.rb:109
msgid "Firewall cannot be adjusted during first stage installation."
@@ -2051,20 +2364,20 @@
msgstr "Awekho ama-interface abelwe kule zoni."
#. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
msgid "&Network Interfaces with Open Port in Firewall"
msgstr "&Ama-Interface eNethiwekhi Ane-Port Evulekile Kwifayawoli"
#. Check the INT zone, it's not protected by default
#. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
msgid ""
"These network interfaces assigned to internal network cannot be deselected:\n"
"%1\n"
msgstr ""
#. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -2077,7 +2390,7 @@
" Qhubeka?"
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces will additionally be open:\n"
@@ -2093,8 +2406,8 @@
#. yes-no popup
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces cannot be opened:\n"
@@ -2109,29 +2422,29 @@
" Qhubeka?"
#. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
msgid "Network &Interfaces with Open Port in Firewall"
msgstr "Ama-Interface &eNethiwekhi Ane-Port Evulekile Kwifayawoli"
#. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
msgid "Select &All"
msgstr "Khetha &Wonke"
#. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
msgid "Select &None"
msgstr "Ungakhethi &Lutho"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
msgid ""
"Error checking service status:\n"
"%{details}"
msgstr ""
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
msgid ""
"Error setting service status:\n"
"%{details}"
@@ -2139,7 +2452,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:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
"To open the firewall to allow access to the service from remote computers,\n"
@@ -2152,7 +2465,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:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
msgid ""
"To select interfaces on which to open the port,\n"
"click <b>%2</b>.<br>"
@@ -2161,7 +2474,7 @@
"chofoza <b>%2</b>.<br>"
#. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
@@ -2170,47 +2483,49 @@
"ivuliwe.</p> "
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
msgid "Open Port in Firewall"
msgstr "Vula i-Port KwiFayawoli"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
msgid "Firewall Details"
msgstr "Imininingwane YeFayawoli"
#. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
msgid "Open Port in &Firewall"
msgstr "Vula i-Port &KwiFayawoli"
#. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
#, fuzzy
msgid "Firewall &Details..."
msgstr "Imininingwane &YeFayawoli"
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
msgstr "Amasethingi Esihenqo Esiyisivikelo"
#. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
msgid "Firewall is open"
msgstr "IFayawoli ivuliwe"
#. pppN must be tried before pN, modem before netcard
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
#: library/system/src/include/hwinfo/classnames.rb:108
#: library/system/src/include/hwinfo/classnames.rb:198
msgid "Modem"
msgstr "I-modem"
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
msgid "Network Card"
msgstr "Ikhadi Lenethiwekhi"
@@ -2218,27 +2533,27 @@
#. Device type label
#. Device type label
#. Device type label
-#: 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:425
#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN"
msgstr "I-ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL"
msgstr "I-DSL"
-#: 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
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
msgid "Unknown"
msgstr "Akwaziwa"
@@ -2248,395 +2563,395 @@
#. are represented as its sub-interfaces.
#. And also we frequently confuse "device" and "interface"
#. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
msgid "Additional Address"
msgstr "Amakheli Engeziwe"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet"
msgstr "ARCnet"
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet Network Card"
msgstr "Ikhadi Lenethiwekhi Le-ARCnet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
msgid "ATM"
msgstr "ATM"
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
msgid "Asynchronous Transfer Mode (ATM)"
msgstr "Imodi Yokudlulisa Enejubane Eliyinqaba"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
msgid "Bluetooth"
msgstr "I-Bluetooth"
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
msgid "Bluetooth Connection"
msgstr "Ukuxhumana Nge-Bluetooth"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond Network"
msgstr "Inethiwekhi Ye-bond"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
msgid "CLAW"
msgstr "CLAW"
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
msgid "Common Link Access for Workstation (CLAW)"
msgstr "I-Common Link Access for Workstation (CLAW)"
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
msgid "ISDN Card"
msgstr "Ikhadi Le-ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
#: library/system/src/include/hwinfo/classnames.rb:223
msgid "CTC"
msgstr "I-CTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
msgid "Channel to Channel Interface (CTC)"
msgstr "I-Interface Esuka Esiteshini Iye Esiteshin (CTC)"
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL Connection"
msgstr "Ukuxhumana Nge-DSL"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy"
msgstr "Isithipha"
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy Network Device"
msgstr "Idivayisi Yenethiwekhi Eyisithipha"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
#: library/system/src/include/hwinfo/classnames.rb:227
msgid "ESCON"
msgstr "ESCON"
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
msgid "Enterprise System Connector (ESCON)"
msgstr "I-Enterprise System Connector (ESCON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
#: library/system/src/include/hwinfo/classnames.rb:220
msgid "Ethernet"
msgstr "I-Ethernet"
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
msgid "Ethernet Network Card"
msgstr "Ikhadi Lenethiwekhi Ye-Ethernet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
#: library/system/src/include/hwinfo/classnames.rb:222
msgid "FDDI"
msgstr "I-FDDI"
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
msgid "FDDI Network Card"
msgstr "Ikhadi Lenethiwekhi Ye-FDDI"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
msgid "FICON"
msgstr "FICON"
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
msgid "Fiberchannel System Connector (FICON)"
msgstr "I-Fiberchannel System Connector (FICON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
msgid "HIPPI"
msgstr "HIPPI"
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
msgid "HIgh Performance Parallel Interface (HIPPI)"
msgstr "I-HIgh Performance Parallel Interface (HIPPI)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
msgid "Hipersockets"
msgstr "Ama-hipersocket"
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
msgid "Hipersockets Interface (HSI)"
msgstr "I-Hipersockets Interface (HSI)"
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN Connection"
msgstr "Ukuxhumana Nge-ISDN"
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "IrDA"
msgstr "IrDA"
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
msgid "Infrared Network Device"
msgstr "Idivayisi Yenethiwekhi Ye-Infrared"
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "Infrared Device"
msgstr "Idivayisi Ye-Infrared"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
#: library/system/src/include/hwinfo/classnames.rb:224
msgid "IUCV"
msgstr "I-IUCV"
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
msgid "Inter User Communication Vehicle (IUCV)"
msgstr "I-Inter User Communication Vehicle (IUCV)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS"
msgstr "OSA LCS"
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS Network Card"
msgstr "Ikhadi Lenethiwekhi Le-OSA LCS"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
#: library/system/src/include/hwinfo/classnames.rb:219
msgid "Loopback"
msgstr "I-loopback"
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
msgid "Loopback Device"
msgstr "Idivayisi Ye-Loopback"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
#: library/system/src/include/hwinfo/classnames.rb:228
msgid "Myrinet"
msgstr "I-Myrinet"
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
msgid "Myrinet Network Card"
msgstr "Ikhadi Lenethiwekhi Ye-Myrinet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
msgid "Parallel Line"
msgstr "Umugqa Olinganisene"
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
msgid "Parallel Line Connection"
msgstr "Ukuxhumana Ngomugqa Olinganisene"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
#: library/system/src/include/hwinfo/classnames.rb:226
msgid "QETH"
msgstr "I-QETH"
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
msgid "OSA-Express or QDIO Device (QETH)"
msgstr "I-OSA-Express noma Idivayisi Ye-QDIO (QETH)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
msgid "IPv6-in-IPv4"
msgstr "IPv6-in-IPv4"
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
msgid "IPv6-in-IPv4 Encapsulation Device"
msgstr "Idivayisi Yamagobolondo i-IPv6-in-IPv4"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
msgid "Serial Line"
msgstr "I-Serial Line"
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
msgid "Serial Line Connection"
msgstr "Ukuxhumana Nge-serial Line"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
msgid "Token Ring"
msgstr "I-Token Ring"
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
msgid "Token Ring Network Card"
msgstr "Ikhadi Lenethiwekhi Le-Token Ring"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB"
msgstr "I-USB"
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB Network Device"
msgstr "Idivayisi Yenethiwekhi Ye-USB"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare"
msgstr "I-VMWare"
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare Network Device"
msgstr "Idivayisi Yenethiwekhi Ye-VMWare"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
msgid "Wireless"
msgstr "Esebenza Ngamaza Omoya"
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
msgid "Wireless Network Card"
msgstr "Ikhadi Lenethiwekhi Esebenza Ngamaza Omoya"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XPNET"
msgstr "XPNET"
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XP Network"
msgstr "Inethiwekhi Ye-XP"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "VLAN"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
#, fuzzy
msgid "Virtual LAN"
msgstr "Abasebenzisi Abaqhelelene"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#: library/system/src/include/hwinfo/classnames.rb:89
#: library/system/src/include/hwinfo/classnames.rb:101
msgid "Bridge"
msgstr "Hlanganisa"
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#, fuzzy
msgid "Network Bridge"
msgstr "Ikhadi Lenethiwekhi"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "TUN"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
#, fuzzy
msgid "Network TUNnel"
msgstr "Imodi Yenethiwekhi"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
#, fuzzy
msgid "TAP"
msgstr "I-UTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
#, fuzzy
msgid "Network TAP"
msgstr "Ikhadi Lenethiwekhi"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#: library/system/src/include/hwinfo/classnames.rb:152
msgid "InfiniBand"
msgstr "I-InfiniBand"
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#, fuzzy
msgid "InfiniBand Device"
msgstr "Idivayisi Ye-Infrared"
#. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
msgid "Unknown device"
msgstr "Idivayisi engaziwa"
#. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
msgid "DHCP address"
msgstr "Ikheli le-DHCP"
#. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
msgid "No IP address assigned"
msgstr "Alikho ikheli le-IP elabelwe"
#. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
msgid "Device Type"
msgstr "Uhlobo Lwedivayisi"
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
msgid "Device Name"
msgstr "Igama Ledivayisi"
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
msgid "IP Address"
msgstr "Ikheli Le-IP"
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
msgid "Device ID"
msgstr "I-ID Yedivayisi"
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
msgid "Connected"
msgstr "Kuxhunyiwe"
#. label message
#. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
msgid "Scanning for hosts on this LAN..."
msgstr "Iskenela ukuthola iziphakeli (hosts) kule LAN..."
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
msgid "&NFS Servers"
msgstr "&Iziphakelalwazi Ze-NFS"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
msgid "Re&mote Hosts"
msgstr "Izi&phakeli Ezikude"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
msgid "&Exported Directories"
msgstr "&Ama-Directory Aguquliwe (Exported Directories)"
#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
msgid ""
"Your network interfaces are currently controlled by NetworkManager\n"
"but the service to configure might not work well with it.\n"
@@ -2651,14 +2966,14 @@
#. 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:348
+#: library/network/src/modules/NetworkService.rb:346
msgid ""
"No running network detected.\n"
"Restart installation and configure network in Linuxrc\n"
"or continue without network."
msgstr ""
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
msgid ""
"No running network detected.\n"
"Configure network with YaST or Network Manager plug-in\n"
@@ -2677,147 +2992,6 @@
"Inombolo ye-port ingase ibe yinombolo esukela ku-0 kuya ku-65535.\n"
" Azikho izikhala ezivunyelwe.\n"
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
-msgid "External Zone"
-msgstr "Izoni Yangaphandle"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
-msgid "Internal Zone"
-msgstr "Izoni Yangaphakathi"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
-msgid "Demilitarized Zone"
-msgstr "Izoni Engahlonyisiwe"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
-#, fuzzy
-msgid "TCP"
-msgstr "I-UTC"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
-#, fuzzy
-msgid "UDP"
-msgstr "I-UID"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
-#, fuzzy
-msgid "RPC"
-msgstr "PCM"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:252
-#, fuzzy
-msgid "IP"
-msgstr "I-IPv6"
-
-#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1158
-msgid "Unknown Zone"
-msgstr "Izoni Engaziwa"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"I-Interface '%1' ifakiwe kumazoni amaningi efayawoli.\n"
-"Ukuqhubeka nokuhlela kungaveza amaphutha.\n"
-" \n"
-" Kuyatuseka ukushiya ukuhlela (configuration) bese uyilunisa mathupha\n"
-" kwifayela '/etc/sysconfig/SuSEFirewall'."
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: 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"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"I-Interface '%1' ayabelwanga kunoma yimaphi amazoni efayawoli.\n"
-"Qalisa iFayawoli ye-YaST2 bese uyaba.\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
-msgid "Initializing Firewall Configuration"
-msgstr "Ilungiselela Ukuqala Ukuhlela IFayawoli"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
-msgid "Check for network devices"
-msgstr "Hlola amadivayisi enethiwekhi"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Read current configuration"
-msgstr "Funda ukuhlela kwamanje"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Check possibly conflicting services"
-msgstr "Hlola amasevisi okungenzeka ayangqubuzana"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
-msgid "Checking for network devices..."
-msgstr "Ihlola amadivayisi enethiwekhi..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Reading current configuration..."
-msgstr "Ifunda ukuhlela kwamanje..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Checking possibly conflicting services..."
-msgstr "Ihlola amasevisi okungenzeka ayangqubuzana..."
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
-msgid "Writing Firewall Configuration"
-msgstr "Ibhala Ukuhlela KweFayawoli"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
-msgid "Write firewall settings"
-msgstr "Bhala amasethingi efayawoli"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
-msgid "Adjust firewall service"
-msgstr "Lungisa isevisi yefayawoli"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
-msgid "Writing firewall settings..."
-msgstr "Ibhala amasethingi efayawoli..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
-msgid "Adjusting firewall service..."
-msgstr "Ilungisa isevisi yefayawoli..."
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
-msgid "Writing settings failed"
-msgstr "Ukubhala amasethingi kuhlulekile"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
-#, fuzzy
-msgid "Unknown protocol (%1)"
-msgstr "Iphrothokholi engaziwa %1."
-
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
#: library/network/src/modules/SuSEFirewallProposal.rb:167
msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2914,62 +3088,14 @@
msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
msgstr "Ufaka isistimu nge-SSH, kodwa awuzange uyivule i-port ye-SSH kwifayawoli."
-#. Returns service definition.
-#. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
-#.
-#. @param [String] service name
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param map <string, list <string> > of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. $[
-#. "tcp_ports" : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports" : [ ],
-#. "rpc_ports" : [ "portmap", "ypbind" ],
-#. "ip_protocols" : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: 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:430
-#, fuzzy
-msgid "Service: %{filename}"
-msgstr "Isevisi %1"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
-msgid "Unknown service '%1'"
-msgstr "Isevisi engaziwa '%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:106
#: library/packages/src/include/packages/common.rb:135
msgid "These packages need to be installed:"
msgstr "La maphakheji kudingeka afakwe (installed):"
+#. the message is followed by list of required packages
#. Popup Text
#: library/packages/src/include/packages/common.rb:109
#: library/packages/src/include/packages/common.rb:137
@@ -2984,36 +3110,78 @@
msgid "&Uninstall"
msgstr "&Faka"
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
+#, fuzzy
+#| msgid "Checking possibly conflicting services..."
+msgid "Checking file conflicts..."
+msgstr "Ihlola amasevisi okungenzeka ayangqubuzana..."
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
msgid "Downloading package %1 (%2)..."
msgstr "Ilanda iphakheji %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
msgid "Downloading Package"
msgstr "Ilanda Iphakheji"
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
#, fuzzy
msgid "Package %1 is broken, integrity check has failed."
msgstr "Ukuhlolwa kobuqotho befayela kuhlulekile:"
#. 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:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
msgid "Retry installation of the package?"
msgstr "Phinda uzame ukufaka amaphakheji?"
#. 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:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
msgid "Abort the installation?"
msgstr "Ingabe ufuna ukuyeka ukufaka uhlelo?"
@@ -3022,57 +3190,57 @@
#. 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:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2136
msgid "Error: %1:"
msgstr "Kunephutha: %1:"
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
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:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
msgid "Uninstalling package %1 (%2)..."
msgstr "Ikhipha iphakheji %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
msgid "Installing package %1 (%2)..."
msgstr "Ifaka iphakheji %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Uninstalling Package"
msgstr "Ikhipha Iphakheji"
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Installing Package"
msgstr "Ifaka Iphakheji"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
msgid "Removal of package %1 failed."
msgstr "Ukususwa kwephakheji %1 akuphumelelanga."
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
msgid "Installation of package %1 failed."
msgstr "Ukufakwa kwephakheji %1 akuphumelelanga."
#. 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:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
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:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
#, fuzzy
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
@@ -3088,29 +3256,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:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
msgid "Side A"
msgstr "Ingxenye A"
#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
msgid "Side B"
msgstr "Ingxenye 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:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
#, 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:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
#, fuzzy
msgid "%1 (Medium %2)"
msgstr "%1 (%2)"
#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
msgid ""
"Insert\n"
"'%1'"
@@ -3119,7 +3287,7 @@
"'%1'"
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
#, fuzzy
msgid ""
"Cannot access installation media\n"
@@ -3132,7 +3300,7 @@
" Hlola ukuthi I-directory iyatholakala yini."
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
#, fuzzy
msgid ""
"Cannot access installation media \n"
@@ -3146,53 +3314,53 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1835
msgid "Skip Autorefresh"
msgstr ""
#. 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:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
msgid "&Eject"
msgstr "&Khipha"
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
#, fuzzy
msgid "A&utomatically Eject CD or DVD Medium"
msgstr "&Buyisa I-DNS Ngokuzenzakalelayo"
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
msgid "Retry the installation?"
msgstr "Ingabe ufuna ukuphinde uzame ukufaka uhlelo?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
msgid "Skip the medium?"
msgstr "Ingabe ufuna ukuyeqa imidiyamu?"
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
msgid "Ignoring the bad medium..."
msgstr "Iyishaya indiva imidiyamu engasebenzi..."
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
msgid "&URL"
msgstr "I-&URL"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
#, fuzzy
msgid "Creating Repository %1"
msgstr "Yakha umthombo %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
#, fuzzy
msgid "An error occurred while creating the repository."
msgstr "Kwenzeke iphutha lapho yakha ikhathalogi."
@@ -3200,9 +3368,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:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
#, fuzzy
msgid "Unable to retrieve the remote repository description."
msgstr "Ayikwazi ukuthola incazelo yekhathalogi ekude."
@@ -3210,24 +3378,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:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
msgid "An error occurred while retrieving the new metadata."
msgstr "Kwenzeke iphutha lapho ilanda i-metadata entsha."
#. 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:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
#, fuzzy
msgid "The repository is not valid."
msgstr "Lo mthombo awusebenzi."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
#, fuzzy
msgid "The repository metadata is invalid."
msgstr "Umthombo we-metadata awusebenzi."
@@ -3236,97 +3404,97 @@
#. 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:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2090
msgid "Retry?"
msgstr "Ufuna ukuzama futhi?"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
#, fuzzy
msgid "Probing Repository %1"
msgstr "Ihlola umthombo %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
#, fuzzy
msgid "Error occurred while probing the repository."
msgstr "Kwenzeke iphutha lapho isahlola umthombo."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
#, fuzzy
msgid "Repository probing details."
msgstr "Imininingwane yokuhlola umthombo."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
#, fuzzy
msgid "Repository metadata is invalid."
msgstr "Umthombo we-metadata awusebenzi."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
#, fuzzy
msgid "Repository %1"
msgstr "&Inqolobane Yephrofayili:"
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "Ilanda iphakheji i-delta RPM %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
msgid "Downloading Delta RPM package"
msgstr "Ilanda Iphakheji I-Delta RPM"
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
msgid "Applying delta RPM package %1..."
msgstr "Yenza iphakheji i-delta RPM %1 ukuba isebenze..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
msgid "Applying delta RPM package"
msgstr "Yenza iphakheji I-delta RPM ukuba isebenze"
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3070
msgid "Package: "
msgstr "Iphakheji:"
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
msgid "Starting script %1 (patch %2)..."
msgstr "Iqala i-script %1 (patch %2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
msgid "Running Script"
msgstr "Yenza I-Script Sisebenze"
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
msgid "Patch: "
msgstr "I-patch:"
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
msgid "Script: "
msgstr "I-script:"
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
msgid "Output of the Script"
msgstr "Imininingwane Ekhishwe Yi-script"
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
msgid ""
"Patch: %1\n"
"\n"
@@ -3335,7 +3503,7 @@
"\n"
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3345,38 +3513,38 @@
msgstr ""
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
#, fuzzy
msgid "&Skip Refresh"
msgstr "Refresha"
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
#, fuzzy
msgid "Downloading"
msgstr "&Ukulanda"
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1770
msgid "Downloading: %1"
msgstr "Iyalanda: %1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
msgid "Checking Package Database"
msgstr "Ihlola Isizinda Sokwazisa Sephakheji"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1875
msgid "Rebuilding package database. This process can take some time."
msgstr "Yakha Kabusha Isizinda Sokwazisa Sephakheji. Le nqubo ingathatha isikhashana."
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1908
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3385,16 +3553,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Converting package database. This process can take some time."
msgstr "Iguqula isizinda sokwazisa sephakheji. Le nqubo ingathatha isikhashana."
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1954
msgid "Status"
msgstr "Isimo"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1978
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3403,13 +3571,13 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2014
#, fuzzy
msgid "Reading RPM database..."
msgstr "If i-database..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2023
#, fuzzy
msgid "Reading Installed Packages"
msgstr "Qinisekisa Amaphakheji Afakiwe"
@@ -3421,30 +3589,30 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
#, fuzzy
msgid "Scanning RPM database..."
msgstr "If i-database..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2079
#, fuzzy
msgid "Initialization of the target failed."
msgstr "Ihlulekile ukulungiselela ukuqalisa i-directory eyi-back up"
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2171
#, fuzzy
msgid "RPM database read"
msgstr "Isizinda sokwaziswa se-MySQL"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2203
msgid "User Authentication"
msgstr "Ukufakazelwa Komsebenzisi"
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2209
#, fuzzy
msgid ""
"URL: %1\n"
@@ -3453,20 +3621,20 @@
msgstr "I-URL: %1"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid "&User Name"
msgstr "&Igama Lomsebenzisi"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3005
msgid "Show &details"
msgstr "Bonisa &imininingwane"
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3071
msgid "Size: "
msgstr "Usayizi:"
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3094
msgid "Remaining time to automatic retry: %1"
msgstr ""
@@ -3540,12 +3708,12 @@
msgstr ""
#. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:418
msgid "Installing required packages failed."
msgstr "Ukufaka amaphakheji adingekayo kuhlulekile."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:422
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3556,12 +3724,12 @@
" i-YaST ingase ingasebenzi kahle.\n"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
msgid "Cannot continue without installing required packages."
msgstr "Ngeke ikwazi ukuqhubeka ngaphandle kokufakwa kwamaphakheji adingekayo."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
@@ -3570,22 +3738,22 @@
"amaphakheji adingekayo, i-YaST ingase ingasebenzi kahle.\n"
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
msgid "Confirm Package License: %1"
msgstr "Qinisekisa Ilayisensi Yephakheji: %1"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
msgid "I &Agree"
msgstr "Mina &Ngiyavuma"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
msgid "I &Disagree"
msgstr "Mina &Angivumi"
#. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
#, fuzzy
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
@@ -3608,7 +3776,7 @@
" samalayisensi awo, chofoza ingxenye ethi <b>Angivumi kukho Konke</b>.</p>"
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3622,7 +3790,7 @@
" \t\t olungakwesobunxele. Ukuze ubone incazelo yokuthile kokuboniswe ohlwini, yikhethe.\n"
" I-\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3636,7 +3804,7 @@
" \t\t Nge-menu yezithombe eziqukethwe yilolu hlelo, ungakwazi ukushintsha yonke imifanekiso yezinto ongazisebenzisa kulolu hlelo.\n"
" I-\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3648,7 +3816,7 @@
" \t\t lapho ungabona futhi ukhethe khona amaphakheji e-software yakho.\n"
" I-\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
msgid ""
"<p>\n"
"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3668,149 +3836,149 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
msgid "Software Selection and System Tasks"
msgstr "I-software Ongakhetha Kuyo Nemisebenzi Eyenziwa Isistimu"
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
#, fuzzy
msgid "(more)"
msgstr "okwengeziwe..."
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
#, fuzzy
msgid "Installation Successfully Finished"
msgstr "Ukufakwa kohlelo sekuphelile.\n"
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
#, fuzzy
msgid "Package Installation Failed"
msgstr "Ukufakwa Kwamaphakheji"
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
#, fuzzy
msgid "Error Message: %1"
msgstr "Loga Imiyalezo: %1"
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
#, fuzzy
msgid "Failed Packages: %1"
msgstr "Amasevisi ahlulekile: %1."
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
#, fuzzy
msgid "Installed Packages: %1"
msgstr "Amaphakheji &Afakiwe"
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
#, fuzzy
msgid "Updated Packages: %1"
msgstr "Ingqikithi Yamaphakheji Abuyiselwe:"
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
#, fuzzy
msgid "Removed Packages: %1"
msgstr "Ingqikithi Yamaphakheji Abuyiselwe:"
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
#, fuzzy
msgid "Not Installed Packages: %1"
msgstr "Inani Lamaphakheji Afakiwe:"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
msgid "Packages"
msgstr "Amaphakheji"
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
#, fuzzy
msgid "Elapsed Time: %1"
msgstr "Igama lomsebenzisi: %1"
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
#, fuzzy
msgid "Total Installed Size: %1"
msgstr "Usayizi Ofakiwe:"
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
#, fuzzy
msgid "Total Downloaded Size: %1"
msgstr "Usayizi Wokuphaka Usuwonke:"
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
#, fuzzy
msgid "Statistics"
msgstr "Izibalo zebhekhaphu:"
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:713
#, fuzzy
msgid "Installation log"
msgstr "Ukufaka Uhlelo"
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
#, fuzzy
msgid "Details"
msgstr "&Imininingwane..."
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
#, fuzzy
#| msgid "Installing Package"
msgid "After Installing Packages"
msgstr "Ifaka Iphakheji"
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Show This Report"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:682
#, fuzzy
#| msgid "&Finish"
msgid "Finish"
msgstr "&Phothula"
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:683
msgid "Continue in the Software Manager"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:688
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:696
#, fuzzy
#| msgid "Installation Error"
msgid "Installation Report"
msgstr "Iphutha Ekufakeni Uhlelo"
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:718
#, fuzzy
msgid "Installed Packages"
msgstr "Amaphakheji &Afakiwe"
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:723
#, fuzzy
msgid "Updated Packages"
msgstr "Amaphakheji Ashintshiwe"
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:728
#, fuzzy
msgid "Removed Packages"
msgstr "Amaphakheji Ashintshiwe"
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:733
#, fuzzy
msgid "Remaining Packages"
msgstr "Amaphakheji Alahlekile"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:754
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -3822,7 +3990,7 @@
#. popup question, %1 stands for the package name
#. %2 is a repository name
#. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
#, fuzzy
msgid ""
"The package %1 from repository %2\n"
@@ -3842,7 +4010,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:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
#, fuzzy
msgid ""
"The file %1 from repository %2\n"
@@ -3860,18 +4028,18 @@
" Nakuba kunjalo, ingabe ufuna ukulisebenzisa?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
#, fuzzy
msgid "Unsigned Package"
msgstr "Amaphakheji Ashintshiwe"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
#, fuzzy
msgid "Unsigned File"
msgstr "Yamukela &Amafayela Angasayiniwe"
#. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
#, fuzzy
msgid ""
"No checksum for package %1 was found in the repository.\n"
@@ -3889,7 +4057,7 @@
" Noma kunjalo, ingabe ufuna ukuyisebenzisa?"
#. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
#, fuzzy
msgid ""
"No checksum for file %1 was found in the repository.\n"
@@ -3907,70 +4075,70 @@
" Nakuba kunjalo, ingabe ufuna ukulisebenzisa?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
msgid "No Checksum Found"
msgstr "Ayikho I-Checksum Etholakele"
#. 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:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
msgid "ID: %1"
msgstr "I-ID: %1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
-#: library/packages/src/modules/SignatureCheckDialogs.rb:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
msgid "Fingerprint: %1"
msgstr "I-fingerprint: %1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
msgid "Name: %1"
msgstr "Igama: %1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
#, fuzzy
msgid "Created: %1"
msgstr "Yakha i-%1$s"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
#, fuzzy
msgid "Expires: %1"
msgstr "i-rsh: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
#, fuzzy
#| msgid "ID: %1"
msgid "ID: "
msgstr "I-ID: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
#, fuzzy
#| msgid "Name: %1"
msgid "Name: "
msgstr "Igama: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
msgid "Fingerprint: "
msgstr "Amafingaphrinti"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
#, fuzzy
msgid "Created: "
msgstr "Yakha i-%1$s"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
#, fuzzy
msgid "Expires: "
msgstr "i-rsh: %1"
#. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
#, fuzzy
msgid ""
"Package %1 from repository %2\n"
@@ -3992,7 +4160,7 @@
" Nakuba kunjalo, ingabe ufuna ukuyifaka?"
#. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
#, fuzzy
msgid ""
"File %1 from repository %2\n"
@@ -4015,12 +4183,12 @@
" Nakuba kunjalo, ingabe ufuna ukulisebenzisa?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
msgid "Validation Check Failed"
msgstr "Ihlulekile Ukuhlola Ukuthi Ifayela Liyasebenza"
#. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
msgid ""
"The package %1 is digitally signed\n"
"with the following unknown GnuPG key: %2.\n"
@@ -4041,7 +4209,7 @@
" Nakuba kunjalo, ingabe ufuna ukuyifaka?"
#. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
msgid ""
"The file %1\n"
"is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -4062,12 +4230,12 @@
" Nakuba kunjalo, ingabe ufuna ukulisebenzisa?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
msgid "Unknown GnuPG Key"
msgstr "Ukhiye Ongaziwa I-GnuPG"
#. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
#, fuzzy
msgid ""
"The package %1 is digitally signed\n"
@@ -4093,7 +4261,7 @@
" uyeqe le phakheji."
#. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
#, fuzzy
msgid ""
"The file %1 is digitally signed\n"
@@ -4119,17 +4287,17 @@
" ukuba uleqe."
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
msgid "Signed with Untrusted Public Key"
msgstr "Isayinwe Ngokhiye Womphakathi Ongathembekile"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
msgid "&Trust and Import the Key"
msgstr ""
#. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
msgid ""
"<p>The owner of the key may distribute updates,\n"
"packages, and package repositories that your system will trust and offer\n"
@@ -4144,7 +4312,7 @@
" ukuba abe nesilinganiso esithile sokulawula i-software yesistimu yakho.</p>"
#. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
#, fuzzy
#| msgid ""
#| "<p>A warning dialog opens for every package that\n"
@@ -4160,7 +4328,7 @@
" amaphakheji akhiwe ngomnikazi wokhiye<tt>%1</tt> abonisa lesi sixwayiso.</p>"
#. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
msgid ""
"The following GnuPG key has been found in repository\n"
"%1\n"
@@ -4168,7 +4336,7 @@
msgstr ""
#. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
#, fuzzy
#| msgid ""
#| "The GnuPG key %1\n"
@@ -4193,17 +4361,17 @@
" lo khiye ungowalowo owuthumlayo ngempela."
#. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
msgid "WARNING: The key has expired!"
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
msgid "Import Untrusted GnuPG Key"
msgstr "Thumela Ukhiye I-GnuPG Ongathenjwa"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
#, fuzzy
#| msgid "Trust"
msgid "&Trust"
@@ -4211,7 +4379,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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
#, fuzzy
msgid ""
"The expected checksum of file %1\n"
@@ -4234,13 +4402,13 @@
" Nakuba kunjalo, ingabe ufuna ukulisebenzisa?"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
#, fuzzy
msgid "Wrong Digest"
msgstr "Izexwayiso"
#. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
#, fuzzy
msgid ""
"The checksum of file %1\n"
@@ -4259,7 +4427,7 @@
" Nakuba kunjalo, ingabe ufuna ukulisebenzisa?"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
#, fuzzy
msgid "Unknown Digest"
msgstr "Isistimu yefayela engaziwa"
@@ -4269,85 +4437,85 @@
#. Return the description for the current stage.
#. @return [String] localized string description
#. 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:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
#, fuzzy
msgid "Installing..."
msgstr "Ifaka i-driver..."
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
msgid "Media"
msgstr "Imidiya"
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
#, fuzzy
msgid "Remaining"
msgstr "Amaphakheji Alahlekile"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
msgid "Time"
msgstr "Isikhathi"
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
#, fuzzy
msgid "Actions performed:"
msgstr "Izinyathelo Ezivumelekile Kubasebenzisi:\n"
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
#, fuzzy
msgid "<p>Packages are being installed.</p>"
msgstr "<p>Sicela ulinde njengoba kusafakwa amaphakheji.</p>"
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
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:652
+#: library/packages/src/modules/SlideShow.rb:653
#, fuzzy
msgid "%s Release Notes"
msgstr "Ukwaziswa Okuphathelene Nohlelo"
#. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
+msgid "&Details"
+msgstr "&Imininingwane..."
+
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
msgid "Slide Sho&w"
msgstr "Umbukiso &Wama-slide"
-#. tab
-#: library/packages/src/modules/SlideShow.rb:666
-msgid "&Details"
-msgstr "&Imininingwane..."
-
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:708
#, fuzzy
#| msgid "Perform Update"
msgid "Performing Upgrade"
msgstr "Vuselela Uhlelo"
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:711
#, fuzzy
#| msgid "Perform Installation"
msgid "Performing Installation"
msgstr "Faka Uhlelo"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:746
msgid "Package Installation"
msgstr "Ukufakwa Kwamaphakheji"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:818
msgid ""
"Do you really want\n"
"to quit the installation?"
@@ -4356,7 +4524,7 @@
"ukuyeka ukufaka amaphakheji?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:830
msgid "Aborted"
msgstr "Iyekiwe"
@@ -4951,38 +5119,46 @@
msgid "Bluetooth device"
msgstr "Idivayisi ye-Bluetooth"
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
msgstr ""
#. Continue/Cancel question, %1 is a coma separated list of file names
-#: library/system/src/modules/FileChanges.rb:180
+#: library/system/src/modules/FileChanges.rb:178
msgid ""
"Files %1 have been changed manually.\n"
"YaST might lose some of the changes"
msgstr ""
-#: library/system/src/modules/FileChanges.rb:193
+#. Continue/Cancel question, %1 is a file name
+#: library/system/src/modules/FileChanges.rb:180
+msgid ""
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
+msgstr ""
+
+#: library/system/src/modules/FileChanges.rb:192
#, fuzzy
msgid "Do not show this message anymore"
msgstr "Ungawubonisi Lo Myalezo &Futhi"
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
msgid ""
"File %s has been created manually.\n"
"YaST might lose this file."
-msgstr ""
-
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-msgid ""
+msgid_plural ""
"Files %s have been created manually.\n"
"YaST might lose these files."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
#. error report
#: library/system/src/modules/Initrd.rb:415
@@ -4990,7 +5166,7 @@
msgstr "Kwenzeke iphutha ngesikhathi kwakhiwa i-initrd."
#. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
msgid ""
"Reboot your system\n"
"to activate the new kernel.\n"
@@ -5026,7 +5202,7 @@
"ezinombolo zeqhezu lokweshumi nesithupha (hexadecimal) ezihlukaniswe yi-colon."
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -5037,7 +5213,7 @@
" ingaqali noma iphethe i-component futhi i-component yokugcina ingase ingaqali ngenombolo."
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -5141,13 +5317,13 @@
#. 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:738
+#: library/types/src/modules/String.rb:730
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
+#: library/types/src/modules/String.rb:846
msgid "%1/s"
msgstr ""
@@ -5235,8 +5411,8 @@
#. fallback name for the dialog title
#. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
#, fuzzy
#| msgid "Modules"
msgid "Module"
@@ -5994,67 +6170,7 @@
"Hostname %2 cannot be added."
msgstr ""
-#: src/lib/ui/srv_status_component.rb:60
-msgid "Service Status"
-msgstr "Isimo Sesevisi"
-
-#. 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
#, fuzzy
-#| msgid "Current Status: "
-msgid "Current status:"
-msgstr "Isimo Samanje:"
-
-#. 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 "Yenza Kusebenze Ngesikhathi Uqalisa"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-#, fuzzy
-#| msgid "Reading %1 Settings"
-msgid "Reload After Saving Settings"
-msgstr "Ifunda awe- %1 Amasethingi"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-#, fuzzy
-#| msgid "Running"
-msgid "running"
-msgstr "Iyasebenza"
-
-#: src/lib/ui/srv_status_component.rb:220
-#, fuzzy
-#| msgid "S&top now ..."
-msgid "Stop now"
-msgstr "Y&ima manje..."
-
-#. 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 "&Qala manje..."
-
-#, fuzzy
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "Ihlulekile ukumawunta imidiyamu yekhathalogi enembile."
Modified: trunk/yast/zu/po/bootloader.zu.po
===================================================================
--- trunk/yast/zu/po/bootloader.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/bootloader.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -15,695 +15,575 @@
"Content-Transfer-Encoding: 8bit\n"
#. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
msgid "Boot loader configuration module"
msgstr "Imoduli yokuhlela ye-boot loader"
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "Amabalengwe okuhlelwa kwe-boot loader"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+#, fuzzy
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "Ngenxa yokwakhiwa kwamakamelo, i-bootloader ayinakufakwa ngendlela efanele"
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "Amasethingi e-Boot Loader"
+
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
#, fuzzy
-msgid "Delete a global option"
-msgstr "&Isethingi Eningiliziwe Yendawo"
+msgid "Device map must contain at least one device"
+msgstr "Isigaba kumelwe siqukathe okungenani iphrinta eyodwa."
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
#, fuzzy
-msgid "Set a global option"
-msgstr "&Isethingi Eningiliziwe Yendawo"
+msgid "Disk order settings"
+msgstr "Amasethingi esisefo"
-#. command line help text for print action
-#: src/clients/bootloader.rb:75
-msgid "Print value of specified option"
-msgstr "Phrinta i-value yokukhethile okubonisiwe"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "Ama&diski"
-#. command line help text for an option
-#: src/clients/bootloader.rb:83
-msgid "The key of the option"
-msgstr "Isikhiye sokungakhethwa kukho"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "&Idivayisi"
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The value of the option"
-msgstr "I-value yokungakhethwa kukho"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+msgid "Selected bootloader partition %s is not available any more."
+msgstr ""
-#. command line error report
-#: src/clients/bootloader.rb:152
-msgid "Value was not specified."
-msgstr "I-value ayizange iboniswe."
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
+msgid "Saving bootloader configuration..."
+msgstr "Igcina ukuhlelwa kwe-boot loader..."
-#. command line error report
-#: src/clients/bootloader.rb:174
-msgid "Option was not specified."
-msgstr "Okukhethile akuzange kuboniswe."
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:102
+msgid ""
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
+msgstr ""
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
-#, fuzzy
-#| msgid "Value: %1"
-msgid "Value: %s"
-msgstr "I-value: %1"
+#. 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:115
+msgid "The system will reboot now..."
+msgstr "Isistimu manje isizoqalisa kabusha..."
-#. command line error report
-#: src/clients/bootloader.rb:183
-msgid "Specified option does not exist."
-msgstr "Okukhethile okubonisiwe akukho."
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "&I-Boot Loader"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>Imenu Yokuqalisa</b></big><br></p>"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:24
-#, fuzzy
-msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active even\n"
-"if the boot loader is installed in the MBR.</p>"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
msgstr ""
-"<b>Setha Ifulegi Kwiphathishini Yethebula Lephathishini Yokuqalisa</b><br>\n"
-"Ukuze uqalise iphathishini ene-boot loader. Ikhodi ye-MBR yokuqalisa ibe\n"
-" isiqalisa iphathishini ematasa. I_BIOSes endala idinga iphathishini eyodwa ukuze ibe matasa ngisho noma\n"
-" i-boot loader ifakiwe kwi-MBR.</p>"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
-msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
msgstr ""
-"<p><b>Ukuphela kwesikhathi Ngamasekhondi</b><br>\n"
-"Kuchaza isikhathi esizolindwa yisilayishi sokuqalisa kuze kube isilayishiwe ikhenela eyidifolthi.</p>\n"
-#: src/include/bootloader/grub/helps.rb:33
+#: src/lib/bootloader/generic_widgets.rb:43
#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr "(default)"
+
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
msgstr ""
-"<p> Ngokucindezela okuthi <b>Setha njengeDifolthi</b> uphawula ekhethiwe \n"
-"ingxenye njengedifolthi. Uma uqalisa, isilayishi sokuqalisa sizohlinzeka \n"
-"a imenyu yokuqalisa bese silinda umsebenzisi ukuba akhethe ikheneli noma okunye\n"
-"OS kokuqalisa. Uma ungekho ukhiye ocindezelwayo ngaphambi kokuphela kwesikhathi, eyedifolthi \n"
-"ikheneli noma i-OS kuzoqaliswa. Ukulandelana kwezingxenye kusilayishi sokuqalisa\n"
-"kumenyu kungaguqulwa ngokusebenzisa athi <b>Phezulu</b> nathi <b>Phansi</b> amabhathini.</p>\n"
+"\n"
+"Uma ungayifaki i-boot loader, isistimu\n"
+" ingase ingavumi ukuqalisa.\n"
+" \n"
+" Qhubeka?\n"
-#: src/include/bootloader/grub/helps.rb:41
+#: src/lib/bootloader/generic_widgets.rb:75
#, fuzzy
msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
msgstr ""
-"<p><big><b>Bhala Ikhodi Yokuqalisa Esebenzisekayo Kwi-MBR</b></big><br>\n"
-"Ukuze ushintshe irekhodi le-master boot yediski yakho ngekhodi esebenzisekayo (ikhodi engancikile kwi-OS\n"
-" eqalisa iphathishini ematasa), khetha u-<b>Bhala Ikhodi Yokuqalisa Esebenzisekayo Kwi-MBR</b>.</p>"
+"<p><big><b>Uhlobo lwe-Boot Loader</b></big><br>\n"
+"Ukuze ukhethe ukuthi uyayifaka yini i-boot loader nokuthi iyiphi i-bootloader ozoyifaka,\n"
+" sebenzisa i-<b>Boot Loader</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
-"<b>Boot from Root Partition</b>.</p>"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "Uhlobo lwe-Boot Loader: %1"
+
+#: src/lib/bootloader/grub2.rb:109
+#, fuzzy
+#| msgid "LDAP secure port: %1"
+msgid "Enable Trusted Boot: %1"
+msgstr "I-port ephephile ye-LDAP: %1"
+
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+#, fuzzy
+#| msgid "Yes"
+msgid "yes"
+msgstr "Yebo"
+
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
msgstr ""
-"Okuthi <p><b>Qalisa Kwiphathishini Yokuqalisa</b> ngokunye okuncomeka kakhulu ukuba kukhethwe, okunye yilokhu okuthi\n"
-"<b>Qalisa Kwiphathishini Yomqondisi</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
-"installed on your computer</p>"
+#: src/lib/bootloader/grub2.rb:116
+#, fuzzy
+msgid "Status Location: %1"
+msgstr "Indawo: %1"
+
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "Ukuhlelwa Kogalaza (Hard Disks): %1"
+
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
msgstr ""
-"Okuthi <p><b>Qalisa Erekhodini Le-Master Boot</b> akuncomeki ukuya kukho uma unenye i-operating system\n"
-"efakwe ekhompuyutheni yakho</p>"
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
-"to start this section.</p>"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
msgstr ""
-"Okuthi <p><b>Qalisa Kwiphathishini Yomqondisi</b> ngenye indlela encomekayo uma kunephathishini\n"
-"efanelekayo. Khetha u-<b>Setha Ifulegi Kwiphathishini Yethebula Lephathishini Yokuqalisa</b> bese kuba okuthi <b>Bhala Ikhodi Yokuqalisa Kwi-MBR</b>\n"
-" kokuthi <b>Okukhethwa Kukho Kwe-Boot Loader</b> ukuze uvuselele irekhodi le-master boot uma lokho kudingekile ukuze uhlele esinye isilawuli sakho sokuqalisa\n"
-" ukuze uqalise le ngxenye.</p>"
-#: src/include/bootloader/grub/helps.rb:56
-msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
-"logical partition and the /boot partition is missing</p>"
+#: src/lib/bootloader/grub2.rb:216
+msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p><b>Iphathishin Yokuqalisa Evunyelaniswe Nezidingo</b> ikwenza ukwazi ukukhetha iphathishini ozoqalisa kuyo</p>"
+#: src/lib/bootloader/grub2.rb:220
+msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:62
-msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:65
-#, fuzzy
-msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+#: src/lib/bootloader/grub2.rb:235
+msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
msgstr ""
-"<p><b>Amapharamitha Okuxhumana E-serial</b> akuvumela ukuba uchaze amapharamitha ozowasebenzisa\n"
-"kwi-serial console. Sicela ubheke incwadi ye-grub (<code>i-grub enokwaziswa)</code>) ukuze uthole imininingwane.</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 (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>"
+#: src/lib/bootloader/grub2.rb:241
+msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
msgstr ""
-"<p><b>Incazelo Yetheminali</b></p><br>\n"
-"Ichaza uhlobo lwetheminali ofuna ukulusebenzisa. Ngetheminali eyi-serial (isib. i-serial console),\n"
-" kufanele ubonise <code>i-serial</code>. Ungase futhi udlulisele <code>i-console</code> kuyikhomandi\n"
-" njenge<code>serial console</code>. Kulokhu, itheminali \n"
-" ocindezela kuyo inkinobho izokhethwa njengetheminali ye-GRUB.</p>"
-#: src/include/bootloader/grub/helps.rb:75
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
+#: src/lib/bootloader/grub2.rb:246
+msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
msgstr ""
-"<p><b>Izingxenye Ze-Fallback uma i-default Ihluleka</b> iqukethe uhlu lwezinombolo zengxenye\n"
-"ezizosetshenziselwa ukuqalisa uma ingxenye eyi-default ingenakuqaliswa.</p>"
-#: src/include/bootloader/grub/helps.rb:78
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>Ukukhetha <b>Imenu Yokufihla Ekuqaliseni</b> kuzofihla imenu yokuqalisa</p>"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:81
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
#, fuzzy
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"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>Iphasiwedi Ye-Menu Interface</b><br>\n"
-"Ichaza iphasiwedi ezodingeka ukungena kwimenu yokuqalisa. I-YaST izokwamukela kuphela iphasiwedi uma uyiphinda\n"
-" kokuthi <b>Phinda Uthayiphe Iphasiwedi</b>.</p>"
+msgid "Change Location: %s"
+msgstr "Indawo: %1"
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
#, fuzzy
+msgid "&Timeout in Seconds"
+msgstr "Ukuphela Kwesikhathi Ngemizuzwana"
+
+#: src/lib/bootloader/grub2_widgets.rb:57
msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"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.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
msgstr ""
-"<p><big><b>Ukuhlelwa Kwamadiski</b></big><br>\n"
-"Ukuze ubonise ukuhlelwa kwamadiski ngokuvumelana nohlelo olukwi-BIOS, sebenzisa inkinobho\n"
-" ethi <b>Phezulu</b> nethi <b>Phansi</b> ukuze uwahlele kabusha amadiski.</p>"
+"<p><b>Ukuphela kwesikhathi Ngamasekhondi</b><br>\n"
+"Kuchaza isikhathi esizolindwa yisilayishi sokuqalisa kuze kube isilayishiwe ikhenela eyidifolthi.</p>\n"
-#: src/include/bootloader/grub/helps.rb:101
-msgid "Boot Loader Locations"
-msgstr "Izindawo Ze-Boot Loader"
-
-#: src/include/bootloader/grub/helps.rb:102
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
#, fuzzy
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr "Setha iFulegi esebenzayo kwiThebula Lamakamelo Ukuze Wenze i-Boot Partition "
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
+#: src/lib/bootloader/grub2_widgets.rb:93
#, fuzzy
-msgid "&Timeout in Seconds"
-msgstr "Ukuphela Kwesikhathi Ngemizuzwana"
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
+msgstr ""
+"<b>Setha Ifulegi Kwiphathishini Yethebula Lephathishini Yokuqalisa</b><br>\n"
+"Ukuze uqalise iphathishini ene-boot loader. Ikhodi ye-MBR yokuqalisa ibe\n"
+" isiqalisa iphathishini ematasa. I_BIOSes endala idinga iphathishini eyodwa ukuze ibe matasa ngisho noma\n"
+" i-boot loader ifakiwe kwi-MBR.</p>"
-#: src/include/bootloader/grub/helps.rb:106
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
#, fuzzy
-msgid "&Default Boot Section"
-msgstr "Ingxenye Yokuqalisa (Boot) Yohlelo"
-
-#: src/include/bootloader/grub/helps.rb:107
-#, fuzzy
msgid "Write &generic Boot Code to MBR"
msgstr "Bhala iKhodi Yokuqalisa (Boot Code) Kwi-MBR"
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Custom Boot Partition"
-msgstr "Ikamelo le-Custom Boot"
-
-#: src/include/bootloader/grub/helps.rb:109
-msgid "Boot from Master Boot Record"
-msgstr "Qalisa kwi-Master Boot Record"
-
-#: src/include/bootloader/grub/helps.rb:110
-msgid "Boot from Root Partition"
-msgstr "Qalisa kwi-Root Partition"
-
-#: src/include/bootloader/grub/helps.rb:111
-msgid "Boot from Boot Partition"
-msgstr "Qalisa kwi-Boot Partition"
-
-#: src/include/bootloader/grub/helps.rb:112
+#: src/lib/bootloader/grub2_widgets.rb:124
#, fuzzy
-msgid "Boot from Extended Partition"
-msgstr "Qalisa kwi-Root Partition"
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
+msgstr ""
+"<p><big><b>Bhala Ikhodi Yokuqalisa Esebenzisekayo Kwi-MBR</b></big><br>\n"
+"Ukuze ushintshe irekhodi le-master boot yediski yakho ngekhodi esebenzisekayo (ikhodi engancikile kwi-OS\n"
+" eqalisa iphathishini ematasa), khetha u-<b>Bhala Ikhodi Yokuqalisa Esebenzisekayo Kwi-MBR</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:113
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
#, fuzzy
-msgid "Serial Connection &Parameters"
-msgstr "Ama-Pharamitha eSerial Connection"
-
-#: src/include/bootloader/grub/helps.rb:114
-#, fuzzy
-msgid "Fallback Sections if Default fails"
-msgstr "Izingxenye ze-Fallback uma i-default Ingaphumeleli"
-
-#: src/include/bootloader/grub/helps.rb:115
-#, fuzzy
msgid "&Hide Menu on Boot"
msgstr "Fihla Imenu lapho Kuqaliswa (Boot)"
-#: src/include/bootloader/grub/helps.rb:116
-#, fuzzy
-msgid "Pa&ssword for the Menu Interface"
-msgstr "Iphasiwedi ye-Interface YeMenu"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>Ukukhetha <b>Imenu Yokufihla Ekuqaliseni</b> kuzofihla imenu yokuqalisa</p>"
-#: src/include/bootloader/grub/helps.rb:117
-#, fuzzy
-msgid "Debugg&ing Flag"
-msgstr "Ifulegi Yokususa Amaphutha"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+msgid "Pro&be Foreign OS"
+msgstr ""
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
-msgid "Prot&ect Boot Loader with Password"
-msgstr "Vik&ela i-Boot Loader Ngephasiwedi"
+#: src/lib/bootloader/grub2_widgets.rb:176
+msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+msgstr ""
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
#, fuzzy
-#| msgid "Security Event Notification"
-msgid "P&rotect Entry Modification Only"
-msgstr "Isaziso Sezenzakalo Eziphathelene Nokuphepha"
+msgid "O&ptional Kernel Command Line Parameter"
+msgstr "Ipharamitha Yomugqa Wekhomandi Yekheneli Ongayikhetha Uma Uthanda"
-#. text entry
-#: src/include/bootloader/grub/options.rb:85
-msgid "&Password"
-msgstr "&Iphasiwedi"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr " <p><b>Ipharamitha Yomugqa Wekhomandi Yekheneli Oyikhetha Uma uthanda</b> ikwenza ukwazi ukuchaza amanye amapharamitha ukuze udlulise ikheneli</p>"
-#. text entry
-#: src/include/bootloader/grub/options.rb:88
-msgid "Re&type Password"
-msgstr "Yi&thayiphe Kabusha Iphasiwedi"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+msgid "&Protective MBR flag"
+msgstr ""
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
-#, fuzzy
-msgid "Boot from &Root Partition"
-msgstr "Qalisa kwi-Root Partition"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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/grub/options.rb:224
+#. TRANSLATORS: set flag on disk
+#: src/lib/bootloader/grub2_widgets.rb:246
#, fuzzy
-msgid "Boo&t from Boot Partition"
-msgstr "Qalisa kwi-Boot Partition"
+#| msgid "1st"
+msgid "set"
+msgstr "Mhla ka-1"
-#: src/include/bootloader/grub/options.rb:235
+#. TRANSLATORS: remove flag from disk
+#: src/lib/bootloader/grub2_widgets.rb:248
#, fuzzy
-msgid "C&ustom Boot Partition"
-msgstr "Ikamelo le-Custom Boot"
+#| msgid "Remove"
+msgid "remove"
+msgstr "Susa"
-#: 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 "Indawo Ye-Boot Loader"
-
-#: 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 "Qalisa kwi-Master Boot Record"
-
-#: src/include/bootloader/grub/options.rb:263
-#, fuzzy
-msgid "Boot from &Extended Partition"
-msgstr "Qalisa kwi-Root Partition"
-
-#: src/include/bootloader/grub/options.rb:312
-msgid "Enable Red&undancy for MD Array"
+#. TRANSLATORS: do not change flag on disk
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
+msgid "do not change"
msgstr ""
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
#, fuzzy
-#| msgid "Boot Loader Options"
-msgid "Boot Code Options"
-msgstr "Ongakhetha Kukho Kwe-Boot Loader"
+#| msgid "Enable &Layer 2 Support"
+msgid "Enable &Secure Boot Support"
+msgstr "Vumela &I-Layer 2 Support"
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
+#: src/lib/bootloader/grub2_widgets.rb:272
#, fuzzy
-#| msgid "Other Kernel &Parameters"
-msgid "Kernel Parameters"
-msgstr "Amanye Amapharamitha eKheneli"
+#| msgid "LDAP secure port: %1"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "I-port ephephile ye-LDAP: %1"
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
#, fuzzy
-#| msgid "Boot Loader Options"
-msgid "Bootloader Options"
-msgstr "Ongakhetha Kukho Kwe-Boot Loader"
-
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-msgid "Boot Loader Options"
-msgstr "Ongakhetha Kukho Kwe-Boot Loader"
-
-#: src/include/bootloader/grub2/dialogs.rb:190
-#, fuzzy
-#| msgid "Secure"
-msgid "Secure Boot"
-msgstr "Kuphephile"
-
-#: src/include/bootloader/grub2/dialogs.rb:196
-#, fuzzy
#| msgid "Enable &Layer 2 Support"
-msgid "Enable &Secure Boot Support"
+msgid "Enable &Trusted Boot Support"
msgstr "Vumela &I-Layer 2 Support"
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
-#, fuzzy
-#| msgid "Boot Loader Location"
-msgid "Boot &Loader Location"
-msgstr "Indawo Ye-Boot Loader"
-
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
-msgid "Choose partition where is boot sequence installed."
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
msgstr ""
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
-msgstr " <p><b>Ipharamitha Yomugqa Wekhomandi Yekheneli Oyikhetha Uma uthanda</b> ikwenza ukwazi ukuchaza amanye amapharamitha ukuze udlulise ikheneli</p>"
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
+msgid "Prot&ect Boot Loader with Password"
+msgstr "Vik&ela i-Boot Loader Ngephasiwedi"
-#: src/include/bootloader/grub2/helps.rb:26
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
#, fuzzy
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
-msgstr "<p><b>Imodi Ye-Vga</b> ichaza imodi ye-VGA ye-<i>console</i> ikheneli okufanele iyisethe lapho iqalisa</p>"
+#| msgid "Security Event Notification"
+msgid "P&rotect Entry Modification Only"
+msgstr "Isaziso Sezenzakalo Eziphathelene Nokuphepha"
-#: src/include/bootloader/grub2/helps.rb:29
-msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
msgstr ""
-#: 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 ""
+#. text entry
+#: src/lib/bootloader/grub2_widgets.rb:339
+msgid "Re&type Password"
+msgstr "Yi&thayiphe Kabusha Iphasiwedi"
-#: src/include/bootloader/grub2/helps.rb:38
-#, fuzzy
-msgid "O&ptional Kernel Command Line Parameter"
-msgstr "Ipharamitha Yomugqa Wekhomandi Yekheneli Ongayikhetha Uma Uthanda"
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "Iphasiwedi akumelwe ingabi nalutho."
-#: src/include/bootloader/grub2/helps.rb:39
-#, fuzzy
-msgid "&Vga Mode"
-msgstr "Imodi ye-Vga"
-
-#: src/include/bootloader/grub2/helps.rb:40
-msgid "Probe Foreign OS"
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
msgstr ""
+"'Iphasiwedi' nokuthi 'Yithayiphe kabusha iphasiwedi'\n"
+"akuhambisani. Yithayiphe kabusha iphasiwedi."
-#: src/include/bootloader/grub2/helps.rb:41
-msgid "Protective MBR flag"
-msgstr ""
-
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2, %3 bits (mode %4)"
-
-#: src/include/bootloader/grub2/options.rb:68
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
#, fuzzy
-msgid "Standard 8-pixel font mode."
-msgstr "Iphrinta Evamile"
-
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-msgid "Text Mode"
-msgstr "Imodi Yombhalo"
-
-#: src/include/bootloader/grub2/options.rb:72
-#, fuzzy
-#| msgid "&Unspecified"
-msgid "Unspecified"
-msgstr "&Okungacacisiwe"
-
-#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
-#, fuzzy
-#| msgid "1st"
-msgid "set"
-msgstr "Mhla ka-1"
-
-#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
-#, fuzzy
-#| msgid "Remove"
-msgid "remove"
-msgstr "Susa"
-
-#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
-msgid "do not change"
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"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>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
msgstr ""
+"<p><b>Iphasiwedi Ye-Menu Interface</b><br>\n"
+"Ichaza iphasiwedi ezodingeka ukungena kwimenu yokuqalisa. I-YaST izokwamukela kuphela iphasiwedi uma uyiphinda\n"
+" kokuthi <b>Phinda Uthayiphe Iphasiwedi</b>.</p>"
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
#, fuzzy
-#| msgid "Autodetected card"
-msgid "Autodetect by grub2"
-msgstr "Izitholele yona ikhadi"
-
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
-#, fuzzy
msgid "Choose new graphical theme file"
msgstr "Ifayela Yemenu Yezithombe"
-#: src/include/bootloader/grub2/options.rb:258
+#: src/lib/bootloader/grub2_widgets.rb:498
#, fuzzy
msgid "Use &graphical console"
msgstr "Isilawuli Se-Console"
-#: src/include/bootloader/grub2/options.rb:265
+#: src/lib/bootloader/grub2_widgets.rb:503
#, fuzzy
#| msgid "Conflict Resolution:"
msgid "&Console resolution"
msgstr "Ikhambi Lokungqubuzana"
-#: src/include/bootloader/grub2/options.rb:273
+#: src/lib/bootloader/grub2_widgets.rb:508
#, fuzzy
msgid "&Console theme"
msgstr "izimpikiswano ezingasebenzi"
-#: src/include/bootloader/grub2/options.rb:292
+#: src/lib/bootloader/grub2_widgets.rb:539
#, fuzzy
+#| msgid "Autodetected card"
+msgid "Autodetect by grub2"
+msgstr "Izitholele yona ikhadi"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
+#, fuzzy
msgid "Use &serial console"
msgstr "Isilawuli Se-Console"
-#: src/include/bootloader/grub2/options.rb:299
+#: src/lib/bootloader/grub2_widgets.rb:554
#, fuzzy
msgid "&Console arguments"
msgstr "izimpikiswano ezingasebenzi"
-#. 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."
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+#, fuzzy
+msgid "&Default Boot Section"
+msgstr "Ingxenye Yokuqalisa (Boot) Yohlelo"
+
+#: src/lib/bootloader/grub2_widgets.rb:575
+#, fuzzy
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
msgstr ""
+"<p> Ngokucindezela okuthi <b>Setha njengeDifolthi</b> uphawula ekhethiwe \n"
+"ingxenye njengedifolthi. Uma uqalisa, isilayishi sokuqalisa sizohlinzeka \n"
+"a imenyu yokuqalisa bese silinda umsebenzisi ukuba akhethe ikheneli noma okunye\n"
+"OS kokuqalisa. Uma ungekho ukhiye ocindezelwayo ngaphambi kokuphela kwesikhathi, eyedifolthi \n"
+"ikheneli noma i-OS kuzoqaliswa. Ukulandelana kwezingxenye kusilayishi sokuqalisa\n"
+"kumenyu kungaguqulwa ngokusebenzisa athi <b>Phezulu</b> nathi <b>Phansi</b> amabhathini.</p>\n"
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
-msgid "Select File"
-msgstr "Khetha Ifayela"
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "Indawo Ye-Boot Loader"
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
+
+#: src/lib/bootloader/grub2_widgets.rb:692
#, fuzzy
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "Ngenxa yokwakhiwa kwamakamelo, i-bootloader ayinakufakwa ngendlela efanele"
+msgid "Boo&t from Boot Partition"
+msgstr "Qalisa kwi-Boot Partition"
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
-msgid "Boot Loader Settings"
-msgstr "Amasethingi e-Boot Loader"
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "Qalisa kwi-Root Partition"
-#. message
-#: src/include/bootloader/routines/dialogs.rb:142
-msgid "There are no options to set for the current boot loader."
-msgstr "Akukho okukhethwa kukho ongakusetha kule boot loader yamanje."
+#: src/lib/bootloader/grub2_widgets.rb:694
+#, fuzzy
+msgid "Boot from &Master Boot Record"
+msgstr "Qalisa kwi-Master Boot Record"
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
-msgid "&Boot Loader"
-msgstr "&I-Boot Loader"
+#: src/lib/bootloader/grub2_widgets.rb:695
+#, fuzzy
+msgid "Boot from &Extended Partition"
+msgstr "Qalisa kwi-Root Partition"
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
+#: src/lib/bootloader/grub2_widgets.rb:706
+#, fuzzy
+msgid "C&ustom Boot Partition"
+msgstr "Ikamelo le-Custom Boot"
+
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "Ukuhlelwa Kwediski"
+
+#: src/lib/bootloader/grub2_widgets.rb:725
+#, fuzzy
msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
+"<p><big><b>Disks Order</b></big><br>\n"
+"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.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
msgstr ""
-"\n"
-"Uma ungayifaki i-boot loader, isistimu\n"
-" ingase ingavumi ukuqalisa.\n"
-" \n"
-" Qhubeka?\n"
+"<p><big><b>Ukuhlelwa Kwamadiski</b></big><br>\n"
+"Ukuze ubonise ukuhlelwa kwamadiski ngokuvumelana nohlelo olukwi-BIOS, sebenzisa inkinobho\n"
+" ethi <b>Phezulu</b> nethi <b>Phansi</b> ukuze uwahlele kabusha amadiski.</p>"
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "H&lela Amafayela Okuhlela"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+#| msgid "Other Kernel &Parameters"
+msgid "&Kernel Parameters"
+msgstr "Amanye Amapharamitha eKheneli"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
-msgid "&Propose New Configuration"
-msgstr "&Songoza Ukuhlela Okusha"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+#| msgid "Boot Loader Options"
+msgid "Boot Co&de Options"
+msgstr "Ongakhetha Kukho Kwe-Boot Loader"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
-msgid "&Start from Scratch"
-msgstr "&Qala Ekuqaleni Zibekwa Nje"
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+#| msgid "Boot Loader Options"
+msgid "Boot&loader Options"
+msgstr "Ongakhetha Kukho Kwe-Boot Loader"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
-msgid "&Reread Configuration from Disk"
-msgstr "&Phinde Ufunde Ukuhlela Ediskini"
+#: src/lib/bootloader/grub2efi.rb:81
+#, fuzzy
+#| msgid "LDAP secure port: %1"
+msgid "Enable Secure Boot: %1"
+msgstr "I-port ephephile ye-LDAP: %1"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
-msgid "Restore MBR of Hard Disk"
-msgstr "Buyisela i-MBR Kagalaza (Hard Disk)"
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+#, fuzzy
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr ""
+"Ngenxa yokwakhiwa kwamakamelo, i-bootloader\n"
+"ayinakufakwa ngendlela efanele"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
-msgid "Write bootloader boot code to disk"
-msgstr "Bhala ikhodi yokuqalisa ye-boot loader kwidiski"
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "Ungayifaki i-boot laoder"
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "Okunye"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "Ukuqalisa"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
-msgid "MBR restored successfully."
-msgstr "I-MBR ibuyiselwe ngempumelelo."
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "&Ukuqalisa"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Failed to restore MBR."
-msgstr "Ihlulekile ukubuyisela i-MBR."
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "Ayikho i-boot loader ekhethiwe yokufaka uhlelo. Isistimu yakho ingase ingaqaliseki."
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
-#, fuzzy
-msgid "Writing bootloader settings failed."
-msgstr "Ukubhala amasethingi enethiwekhi kuhlulekile."
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Ngenxa yokwakhiwa kwamakamelo, i-bootloader ayinakufakwa ngendlela efanele"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
-msgid "Boot &Loader Options"
-msgstr "Ongakhetha &Kukho Kwe-Boot Loader"
-
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-msgid "Boot Loader Installation &Details"
-msgstr "Imininingwane Yokufakwa &Kwe-Boot Loader"
-
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
msgid ""
"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
+"Reading current configuration...</P>"
msgstr ""
"<P><BIG><B>Ithuluzi Lokuhlela i-Boot Loader</B></BIG><BR>\n"
"Shintsha amasethingi e-boot loader yakho.</P>"
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
msgid ""
"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
"Please wait...<br></p>"
@@ -711,655 +591,616 @@
"<P><B><BIG>Igcina Ukuhlelwa Kwe-Boot Loader</BIG></B><BR>\n"
"Sicela ulinde wait...<br></p>"
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the current \n"
-"configuration and propose a new configuration, start from scratch, or reread\n"
-"the configuration saved on your disk. %1</P>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
msgstr ""
-"<P>Kusukela kokuthi <B>Okunye</B>,\n"
-"ungazihlela mathupha amafayela okuhlela e-boot loader, usule \n"
-" ukuhlela kwamanje bese usongoza ukuhlela okusha, uqale ekuqaleni, noma ufunde kabusha\n"
-" ukuhlela okugcinwe ediskini yakho. %1</P>"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+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 ""
-"<P>Ukuze uhlele amafayela okuhlela e-boot loader\n"
-"mathupha, chofoza u-<B>Hlela Amafayela</B>.</P>"
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr ""
-"<P> Ethebuleni, ingxenye ngayinye imelela into eyodwa\n"
-"kwimenu yokuqalisa (boot menu).</P>"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+#, fuzzy
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "Ayikho idivayisi yomqondisi etholakele"
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
msgstr ""
-"<P> Cindezela u-<B>Hlela</B> ukuze ubonise ama-property\n"
-"engxenye ekhethiwe.</P>"
-#. help 3/4
-#: 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"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
-"<P> Ngokucindezela u-<b>Hlela Njenge-Default</b>, phawula ingxenye \n"
-"ekhethiwe njenge-default. Lapho uqala kabusha ikhompuyutha, i-boot loader izohlinzeka \n"
-" ngemenu yokuqalisa bese ilindela umsebenzisi akhethe ikheneli noma enye \n"
-" i-S ukuze iqalise. Uma ingekho inkinobho ecindezelwe ngaphambi kokuba kuphele isikhathi, ikheneli \n"
-" eyi-default noma i-OS izoqalisa kabusha. Ukulandelana kwezingxenye kwimenu ye-boot loader\n"
-" kungashintshwa usebenzisa izinkinobho u-<B>Phezulu</B> no-<B>Phansi</B>.</P>"
-#. help 4/4
-#: 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>"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
msgstr ""
-"<P>Cindezela u-<B>Faka</B> ukuze wakhe ingxenye entsha ye-boot loader \n"
-"noma u-<B>Susa</B> ukuze ususe ingxenye ekhethiwe.</P>"
-#. 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:107
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
+#: src/modules/BootSupportCheck.rb:207
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
msgstr ""
-"<p><big><b>Indawo Ye-Boot Loader</b></big><br>\n"
-"I-boot manager (%1) ingafakwa ngezindlela ezilandelayo:</p>"
-#. custom bootloader help text, 2 of 7
-#: 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"
-"on the computer.</p>"
-msgstr ""
-"<p>- Kokuthi <b>Master Boot Record</b> (MBR).\n"
-"Lokhu akutuseki uma kunenye i-operating system efakiwe\n"
-" ekhompuyutheni.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "Hlola i-boot loader"
-#. custom bootloader help text, 3 of 7
-#: 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"
-"partition. This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- Kokuthi <b>Boot Sector</b> ye-<tt>/boot</tt> noma <tt>/</tt> (root) \n"
-" partition. Lokhu kuyancomeka ukukukhetha lapho kunekamelo\n"
-" elifanelekile. Ungasetha okuthi <b>Yenza Ikamelo Le-Boot Loader Lisebenze</b> futhi\n"
-" <b>Faka i-Generic Code Esikhundleni se-MBR</b> kokuthi <b>Imininingwane Yokufaka i-Boot Loader</b>\n"
-" ukuze uvuselele i-master boot record\n"
-" uma kudingekile ukuze uhlele enye i-boot manager yakho\n"
-" ukuze uqalise &umkhiqizo;.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "Funda ukuhlukanisa ngamakamelo"
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- Kokuthi <b>Elinye</b> ikamelo. Cabangela imingcele yesistimu yakho\n"
-" lapho ukhetha lokhu.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "Faka amasething e-boot loader"
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>ngokwesibonelo, ama-PC amaningi anomgcele we-BIOS\n"
-"olinganisela ukuqalisa (booting)\n"
-" amasilinda e-hard disk angaphansi kuka-1024. Kuye nge-boot manager esetshenzisiwe,\n"
-" ungase ukwazi noma ungakwazi ukuqalisa (boot) kuyi-logical partition.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "Ihlola i-boot loader..."
-#. custom bootloader help text, 7 of 7
-#: 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"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"Faka igama ledivayisi yekamelo (partition) (ngokwesibonelo, <tt>/dev/hda3</tt> or\n"
-" <tt>/dev/sdb</tt>) esikhaleni okumelwe ubhale kuso.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "Ifunda ukuhlukanisa ngamakamelo..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
-#, fuzzy
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><big><b>Imininingwane Yokufaka I-Boot Loader</b></big><br>\n"
-"Ukuze ulungise okukhethwa kukho okuthuthukisiwe kokufaka i-boot loader (njenge-device\n"
-" mapping), chofoza okuthi <b>Imininingwane Yokufaka I-Boot Loader</b>.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "Ifaka amasething e-boot loader..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
-#, fuzzy
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><big><b>Uhlobo lwe-Boot Loader</b></big><br>\n"
-"Ukuze ukhethe ukuthi uyayifaka yini i-boot loader nokuthi iyiphi i-bootloader ozoyifaka,\n"
-" sebenzisa i-<b>Boot Loader</b>.</p>"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "Ukulungiselela Ukuqalisa Ukuhlelwa Kwe-Boot Loader"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "Yakha i-initrd"
+
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
#, fuzzy
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><big><b>Ongakhetha Kukho Kwe-Boot Loader</b></big><br>\n"
-"Ukuze ulungise okukhethwe kukho kwe-boot loader, njengokuphela kwesikhathi, chofoza okuthi\n"
-" <b>Okukhethwa Kukho Kwe-Boot Loader</b>.</p>"
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "Gcina amafayela okuhlela e-boot loader"
-#. help text 1/1
-#: 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"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>Ukuzihlelela Mathupha Kongoti</B><BR>\n"
-"Lapha, hlela mathupha ukuhlelwa kwe-boot loader.</P>\n"
-" <P>Phawula: Ifayela yokugcina yokuhlela ingase ibe ne-indenting ehlukile.</P>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "Yakha i-initrd..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
#, fuzzy
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b><big>Igama Lengxenye</big></b><br>\n"
-"Sebenzisa<b>Igama Lengxenye</b> ukuze ubonise igama lengxenye ye-boot loader. Igama\n"
-" lengxenye kumelwe elihluke kakhulu kwamanye.</p>"
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "Igcina ukuhlelwa kwe-boot loader..."
-#. help text 1/5
-#: 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>"
-msgstr ""
-"<p><big><b>Uhlobo Lwengxenye Entsha</b></big><br>\n"
-"Khetha uhlobo lwengxenye entsha ozoyakha.</p>"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "Igcina Ukuhlelwa Kwe-Boot Loader"
-#. help text 2/5
-#: 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"
-"selected section.</p>"
-msgstr ""
-"<p>Khetha <b>Yenza Ikhophi Yengxenye Ekhethiwe</b> ukuze wenze ikhophi yengxenye oyikhethile\n"
-"njengamanje. Khona-ke yibe usulungisa okungakhethwa kukho okufanele kuhluke\n"
-" engxenyeni ekhethiwe.</p>"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "Amabalengwe okuhlelwa kwe-boot loader"
-#. help text 3/5
-#: 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"
-"to load and start.</p>"
-msgstr ""
-"<p>Khetha okuthi <b>IKheneli (Linux)</b> ukuze ufake ikheneli entsha yakwa-Linux noma omunye umfanekiso\n"
-"ukuze ufake uhlelo (load) futhi uqalise.</p>"
+#~ msgid "Delete a global option"
+#~ msgstr "&Isethingi Eningiliziwe Yendawo"
-#. help text 4/5
-#: 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"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>Khetha <b>Ingxenye Ye-Xen</b> ukuze unezele ikheneli entsha ye-Linux noma omunye umfanekiso,\n"
-"kodwa ukuze uqalise isimo se-XEN .</p>"
+#~ msgid "Set a global option"
+#~ msgstr "&Isethingi Eningiliziwe Yendawo"
-#. help text 5/5
-#: 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"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Khetha okuthi <b>Enye Isistimu (Chainloader)</b> ukuze ufake ingxenye\n"
-"efaka futhi iqalise i-boot sector yediski enekamelo. Lokhu kusetshenziselwa ukuqalisa\n"
-" amanye ama-operating sistimu.</p>"
+#~ msgid "Print value of specified option"
+#~ msgstr "Phrinta i-value yokukhethile okubonisiwe"
-#: src/include/bootloader/routines/helps.rb:254
-#, fuzzy
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Khetha okuthi <b>Enye Isistimu</b> ukuze ufake ingxenye\n"
-"efaka uhlelo futhi iqalise i-boot sector yediski enekamelo lenye isistimu. Lokhu kusetshenziselwa ukuqalisa\n"
-" amanye ama-operating sistimu.</p>"
+#~ msgid "The key of the option"
+#~ msgstr "Isikhiye sokungakhethwa kukho"
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
-msgid "Order of Hard Disks: %1"
-msgstr "Ukuhlelwa Kogalaza (Hard Disks): %1"
+#~ msgid "The value of the option"
+#~ msgstr "I-value yokungakhethwa kukho"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:51
-msgid "Do not install any boot loader"
-msgstr "Ungayifaki i-boot laoder"
+#~ msgid "Value was not specified."
+#~ msgstr "I-value ayizange iboniswe."
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
-msgid "Do Not Install Any Boot Loader"
-msgstr "Ungayifaki I-Boot Laoder"
+#~ msgid "Option was not specified."
+#~ msgstr "Okukhethile akuzange kuboniswe."
-#. summary string
-#: src/include/bootloader/routines/misc.rb:60
-msgid "Install the default boot loader"
-msgstr "Faka i-boot loader efike nohlelo (default)"
+#, fuzzy
+#~| msgid "Value: %1"
+#~ msgid "Value: %s"
+#~ msgstr "I-value: %1"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Install Default Boot Loader"
-msgstr "Faka I-Boot Loader Efike Nohlelo (default)"
+#~ msgid "Specified option does not exist."
+#~ msgstr "Okukhethile okubonisiwe akukho."
-#. summary string
-#: src/include/bootloader/routines/misc.rb:68
-msgid "Boot loader"
-msgstr "I-boot loader"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>Imenu Yokuqalisa</b></big><br></p>"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
-msgid "Boot Loader"
-msgstr "I-Boot Loader"
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr ""
+#~ "Okuthi <p><b>Qalisa Kwiphathishini Yokuqalisa</b> ngokunye okuncomeka kakhulu ukuba kukhethwe, okunye yilokhu okuthi\n"
+#~ "<b>Qalisa Kwiphathishini Yomqondisi</b>.</p>"
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr ""
-"Lolu hlelo alutholakali uma i-boot\n"
-"loader ingaboniswanga."
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr ""
+#~ "Okuthi <p><b>Qalisa Erekhodini Le-Master Boot</b> akuncomeki ukuya kukho uma unenye i-operating system\n"
+#~ "efakwe ekhompuyutheni yakho</p>"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"Ngempela ukushiya ungakugcinanga ukuhlelwa kwe-boot loader?\n"
-"Zonke izinguquko ebesezenziwe zizolahleka.\n"
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "Okuthi <p><b>Qalisa Kwiphathishini Yomqondisi</b> ngenye indlela encomekayo uma kunephathishini\n"
+#~ "efanelekayo. Khetha u-<b>Setha Ifulegi Kwiphathishini Yethebula Lephathishini Yokuqalisa</b> bese kuba okuthi <b>Bhala Ikhodi Yokuqalisa Kwi-MBR</b>\n"
+#~ " kokuthi <b>Okukhethwa Kukho Kwe-Boot Loader</b> ukuze uvuselele irekhodi le-master boot uma lokho kudingekile ukuze uhlele esinye isilawuli sakho sokuqalisa\n"
+#~ " ukuze uqalise le ngxenye.</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:57
-msgid "The password must not be empty."
-msgstr "Iphasiwedi akumelwe ingabi nalutho."
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p><b>Iphathishin Yokuqalisa Evunyelaniswe Nezidingo</b> ikwenza ukwazi ukukhetha iphathishini ozoqalisa kuyo</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:66
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr ""
-"'Iphasiwedi' nokuthi 'Yithayiphe kabusha iphasiwedi'\n"
-"akuhambisani. Yithayiphe kabusha iphasiwedi."
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~ "for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p><b>Amapharamitha Okuxhumana E-serial</b> akuvumela ukuba uchaze amapharamitha ozowasebenzisa\n"
+#~ "kwi-serial console. Sicela ubheke incwadi ye-grub (<code>i-grub enokwaziswa)</code>) ukuze uthole imininingwane.</p>"
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:82
#, fuzzy
-msgid "%1Set default boot loader location?\n"
-msgstr "Setha indawo ye-boot loader."
+#~| 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 (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>"
+#~ msgstr ""
+#~ "<p><b>Incazelo Yetheminali</b></p><br>\n"
+#~ "Ichaza uhlobo lwetheminali ofuna ukulusebenzisa. Ngetheminali eyi-serial (isib. i-serial console),\n"
+#~ " kufanele ubonise <code>i-serial</code>. Ungase futhi udlulisele <code>i-console</code> kuyikhomandi\n"
+#~ " njenge<code>serial console</code>. Kulokhu, itheminali \n"
+#~ " ocindezela kuyo inkinobho izokhethwa njengetheminali ye-GRUB.</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:90
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"Igama elikhethiwe liyasetshenziswa kakade.\n"
-"Seenzisa elihlukile.\n"
+#~ msgid ""
+#~ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
+#~ "that will be used for booting in case the default section is unbootable.</p>"
+#~ msgstr ""
+#~ "<p><b>Izingxenye Ze-Fallback uma i-default Ihluleka</b> iqukethe uhlu lwezinombolo zengxenye\n"
+#~ "ezizosetshenziselwa ukuqalisa uma ingxenye eyi-default ingenakuqaliswa.</p>"
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"Kwenzeke iphutha ngesikhathi kufakwa i-\n"
-"boot loader. Phinde uzame ukuhlela i-boot loader?\n"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "Izindawo Ze-Boot Loader"
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"Isexwayiso!\n"
-"\n"
-" I-MBR yamanje ye-%1 manje isizophinde ikopishelwe kwi-MBR\n"
-" egcinwe ku-%2.\n"
-" \n"
-" Yikhodi yokuqalisa kuphela eku-MBR ezokopishwa kabusha.\n"
-" Ithebula lekamelo (partition table) lizohlala lingashintshile.\n"
-" \n"
-" Qhubeka?\n"
+#~ msgid "Custom Boot Partition"
+#~ msgstr "Ikamelo le-Custom Boot"
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
-msgid "&Yes, Rewrite"
-msgstr "&Yebo, Kopisha Kabusha"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "Qalisa kwi-Master Boot Record"
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "Qalisa kwi-Boot Partition"
+
#, fuzzy
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr ""
-"Ngenxa yokwakhiwa kwamakamelo, i-bootloader\n"
-"ayinakufakwa ngendlela efanele"
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "Qalisa kwi-Root Partition"
-#. 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 "Isigaba kumelwe siqukathe okungenani iphrinta eyodwa."
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "Ama-Pharamitha eSerial Connection"
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
#, fuzzy
-msgid "Disk order settings"
-msgstr "Amasethingi esisefo"
+#~ msgid "Fallback Sections if Default fails"
+#~ msgstr "Izingxenye ze-Fallback uma i-default Ingaphumeleli"
-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "Ama&diski"
+#, fuzzy
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "Iphasiwedi ye-Interface YeMenu"
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "&Idivayisi"
+#, fuzzy
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "Ifulegi Yokususa Amaphutha"
-#. 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 ""
+#~ msgid "&Password"
+#~ msgstr "&Iphasiwedi"
-#. 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 ""
+#, fuzzy
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "Qalisa kwi-Root Partition"
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-msgid "Saving bootloader configuration..."
-msgstr "Igcina ukuhlelwa kwe-boot loader..."
+#~ msgid "Boot Loader Options"
+#~ msgstr "Ongakhetha Kukho Kwe-Boot Loader"
-#. 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 ""
+#, fuzzy
+#~| msgid "Secure"
+#~ msgid "Secure Boot"
+#~ msgstr "Kuphephile"
-#. 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 "Isistimu manje isizoqalisa kabusha..."
+#, fuzzy
+#~| msgid "Boot Loader Location"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "Indawo Ye-Boot Loader"
-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
-msgid "Booting"
-msgstr "Ukuqalisa"
+#, fuzzy
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>Imodi Ye-Vga</b> ichaza imodi ye-VGA ye-<i>console</i> ikheneli okufanele iyisethe lapho iqalisa</p>"
-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
-msgid "&Booting"
-msgstr "&Ukuqalisa"
+#, fuzzy
+#~ msgid "&Vga Mode"
+#~ msgstr "Imodi ye-Vga"
-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "Ayikho i-boot loader ekhethiwe yokufaka uhlelo. Isistimu yakho ingase ingaqaliseki."
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2, %3 bits (mode %4)"
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Ngenxa yokwakhiwa kwamakamelo, i-bootloader ayinakufakwa ngendlela efanele"
+#, fuzzy
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "Iphrinta Evamile"
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
-msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
-msgstr ""
+#~ msgid "Text Mode"
+#~ msgstr "Imodi Yombhalo"
-#: src/modules/BootGRUB2.rb:172
-msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
-msgstr ""
+#, fuzzy
+#~| msgid "&Unspecified"
+#~ msgid "Unspecified"
+#~ msgstr "&Okungacacisiwe"
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
-msgstr ""
+#~ msgid "Select File"
+#~ msgstr "Khetha Ifayela"
-#: src/modules/BootGRUB2.rb:189
-msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
-msgstr ""
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "Akukho okukhethwa kukho ongakusetha kule boot loader yamanje."
-#: src/modules/BootGRUB2.rb:195
-msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
-msgstr ""
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "H&lela Amafayela Okuhlela"
-#: src/modules/BootGRUB2.rb:199
-msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
-msgstr ""
+#~ msgid "&Propose New Configuration"
+#~ msgstr "&Songoza Ukuhlela Okusha"
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
+#~ msgid "&Start from Scratch"
+#~ msgstr "&Qala Ekuqaleni Zibekwa Nje"
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "&Phinde Ufunde Ukuhlela Ediskini"
+
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "Buyisela i-MBR Kagalaza (Hard Disk)"
+
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "Bhala ikhodi yokuqalisa ye-boot loader kwidiski"
+
+#~ msgid "Other"
+#~ msgstr "Okunye"
+
+#~ msgid "MBR restored successfully."
+#~ msgstr "I-MBR ibuyiselwe ngempumelelo."
+
+#~ msgid "Failed to restore MBR."
+#~ msgstr "Ihlulekile ukubuyisela i-MBR."
+
#, fuzzy
-msgid "Change Location: %s"
-msgstr "Indawo: %1"
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "Ukubhala amasethingi enethiwekhi kuhlulekile."
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
-msgid "Boot Loader Type: %1"
-msgstr "Uhlobo lwe-Boot Loader: %1"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "Ongakhetha &Kukho Kwe-Boot Loader"
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
-msgid " (extended)"
-msgstr ""
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "Imininingwane Yokufakwa &Kwe-Boot Loader"
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:245
-msgid " (MBR)"
-msgstr ""
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr ""
+#~ "<P>Kusukela kokuthi <B>Okunye</B>,\n"
+#~ "ungazihlela mathupha amafayela okuhlela e-boot loader, usule \n"
+#~ " ukuhlela kwamanje bese usongoza ukuhlela okusha, uqale ekuqaleni, noma ufunde kabusha\n"
+#~ " ukuhlela okugcinwe ediskini yakho. %1</P>"
-#: src/modules/BootGRUB2.rb:252
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr ""
+#~ "<P>Ukuze uhlele amafayela okuhlela e-boot loader\n"
+#~ "mathupha, chofoza u-<B>Hlela Amafayela</B>.</P>"
+
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr ""
+#~ "<P> Ethebuleni, ingxenye ngayinye imelela into eyodwa\n"
+#~ "kwimenu yokuqalisa (boot menu).</P>"
+
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr ""
+#~ "<P> Cindezela u-<B>Hlela</B> ukuze ubonise ama-property\n"
+#~ "engxenye ekhethiwe.</P>"
+
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P> Ngokucindezela u-<b>Hlela Njenge-Default</b>, phawula ingxenye \n"
+#~ "ekhethiwe njenge-default. Lapho uqala kabusha ikhompuyutha, i-boot loader izohlinzeka \n"
+#~ " ngemenu yokuqalisa bese ilindela umsebenzisi akhethe ikheneli noma enye \n"
+#~ " i-S ukuze iqalise. Uma ingekho inkinobho ecindezelwe ngaphambi kokuba kuphele isikhathi, ikheneli \n"
+#~ " eyi-default noma i-OS izoqalisa kabusha. Ukulandelana kwezingxenye kwimenu ye-boot loader\n"
+#~ " kungashintshwa usebenzisa izinkinobho u-<B>Phezulu</B> no-<B>Phansi</B>.</P>"
+
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>Cindezela u-<B>Faka</B> ukuze wakhe ingxenye entsha ye-boot loader \n"
+#~ "noma u-<B>Susa</B> ukuze ususe ingxenye ekhethiwe.</P>"
+
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>Indawo Ye-Boot Loader</b></big><br>\n"
+#~ "I-boot manager (%1) ingafakwa ngezindlela ezilandelayo:</p>"
+
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- Kokuthi <b>Master Boot Record</b> (MBR).\n"
+#~ "Lokhu akutuseki uma kunenye i-operating system efakiwe\n"
+#~ " ekhompuyutheni.</p>"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition. This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- Kokuthi <b>Boot Sector</b> ye-<tt>/boot</tt> noma <tt>/</tt> (root) \n"
+#~ " partition. Lokhu kuyancomeka ukukukhetha lapho kunekamelo\n"
+#~ " elifanelekile. Ungasetha okuthi <b>Yenza Ikamelo Le-Boot Loader Lisebenze</b> futhi\n"
+#~ " <b>Faka i-Generic Code Esikhundleni se-MBR</b> kokuthi <b>Imininingwane Yokufaka i-Boot Loader</b>\n"
+#~ " ukuze uvuselele i-master boot record\n"
+#~ " uma kudingekile ukuze uhlele enye i-boot manager yakho\n"
+#~ " ukuze uqalise &umkhiqizo;.</p>"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- Kokuthi <b>Elinye</b> ikamelo. Cabangela imingcele yesistimu yakho\n"
+#~ " lapho ukhetha lokhu.</p>"
+
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>ngokwesibonelo, ama-PC amaningi anomgcele we-BIOS\n"
+#~ "olinganisela ukuqalisa (booting)\n"
+#~ " amasilinda e-hard disk angaphansi kuka-1024. Kuye nge-boot manager esetshenzisiwe,\n"
+#~ " ungase ukwazi noma ungakwazi ukuqalisa (boot) kuyi-logical partition.</p>"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Faka igama ledivayisi yekamelo (partition) (ngokwesibonelo, <tt>/dev/hda3</tt> or\n"
+#~ " <tt>/dev/sdb</tt>) esikhaleni okumelwe ubhale kuso.</p>"
+
#, fuzzy
-msgid "Status Location: %1"
-msgstr "Indawo: %1"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Imininingwane Yokufaka I-Boot Loader</b></big><br>\n"
+#~ "Ukuze ulungise okukhethwa kukho okuthuthukisiwe kokufaka i-boot loader (njenge-device\n"
+#~ " mapping), chofoza okuthi <b>Imininingwane Yokufaka I-Boot Loader</b>.</p>"
-#: src/modules/BootGRUB2EFI.rb:108
#, fuzzy
-#| msgid "LDAP secure port: %1"
-msgid "Enable Secure Boot: %1"
-msgstr "I-port ephephile ye-LDAP: %1"
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Ongakhetha Kukho Kwe-Boot Loader</b></big><br>\n"
+#~ "Ukuze ulungise okukhethwe kukho kwe-boot loader, njengokuphela kwesikhathi, chofoza okuthi\n"
+#~ " <b>Okukhethwa Kukho Kwe-Boot Loader</b>.</p>"
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>Ukuzihlelela Mathupha Kongoti</B><BR>\n"
+#~ "Lapha, hlela mathupha ukuhlelwa kwe-boot loader.</P>\n"
+#~ " <P>Phawula: Ifayela yokugcina yokuhlela ingase ibe ne-indenting ehlukile.</P>"
+
#, fuzzy
-msgid "Unknown bootloader: %1"
-msgstr "Uhlobo Olungaziwa: %1"
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Igama Lengxenye</big></b><br>\n"
+#~ "Sebenzisa<b>Igama Lengxenye</b> ukuze ubonise igama lengxenye ye-boot loader. Igama\n"
+#~ " lengxenye kumelwe elihluke kakhulu kwamanye.</p>"
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr ""
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Uhlobo Lwengxenye Entsha</b></big><br>\n"
+#~ "Khetha uhlobo lwengxenye entsha ozoyakha.</p>"
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: 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 ""
+#~ 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"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>Yenza Ikhophi Yengxenye Ekhethiwe</b> ukuze wenze ikhophi yengxenye oyikhethile\n"
+#~ "njengamanje. Khona-ke yibe usulungisa okungakhethwa kukho okufanele kuhluke\n"
+#~ " engxenyeni ekhethiwe.</p>"
-#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:167
#, fuzzy
-msgid "The boot device is on raid type: %1. System will not boot."
-msgstr "Ayikho idivayisi yomqondisi etholakele"
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr ""
+#~ "<p>Khetha okuthi <b>IKheneli (Linux)</b> ukuze ufake ikheneli entsha yakwa-Linux noma omunye umfanekiso\n"
+#~ "ukuze ufake uhlelo (load) futhi uqalise.</p>"
-#. 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 ""
+#, fuzzy
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>Ingxenye Ye-Xen</b> ukuze unezele ikheneli entsha ye-Linux noma omunye umfanekiso,\n"
+#~ "kodwa ukuze uqalise isimo se-XEN .</p>"
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr ""
+#~ 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"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Khetha okuthi <b>Enye Isistimu (Chainloader)</b> ukuze ufake ingxenye\n"
+#~ "efaka futhi iqalise i-boot sector yediski enekamelo. Lokhu kusetshenziselwa ukuqalisa\n"
+#~ " amanye ama-operating sistimu.</p>"
-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Khetha okuthi <b>Enye Isistimu</b> ukuze ufake ingxenye\n"
+#~ "efaka uhlelo futhi iqalise i-boot sector yediski enekamelo lenye isistimu. Lokhu kusetshenziselwa ukuqalisa\n"
+#~ " amanye ama-operating sistimu.</p>"
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
-msgstr ""
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "Ungayifaki I-Boot Laoder"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
-msgid "Check boot loader"
-msgstr "Hlola i-boot loader"
+#~ msgid "Install the default boot loader"
+#~ msgstr "Faka i-boot loader efike nohlelo (default)"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
-msgid "Read partitioning"
-msgstr "Funda ukuhlukanisa ngamakamelo"
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "Faka I-Boot Loader Efike Nohlelo (default)"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
-msgid "Load boot loader settings"
-msgstr "Faka amasething e-boot loader"
+#~ msgid "Boot loader"
+#~ msgstr "I-boot loader"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
-msgid "Checking boot loader..."
-msgstr "Ihlola i-boot loader..."
+#~ msgid "Boot Loader"
+#~ msgstr "I-Boot Loader"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
-msgid "Reading partitioning..."
-msgstr "Ifunda ukuhlukanisa ngamakamelo..."
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr ""
+#~ "Lolu hlelo alutholakali uma i-boot\n"
+#~ "loader ingaboniswanga."
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
-msgid "Loading boot loader settings..."
-msgstr "Ifaka amasething e-boot loader..."
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "Ngempela ukushiya ungakugcinanga ukuhlelwa kwe-boot loader?\n"
+#~ "Zonke izinguquko ebesezenziwe zizolahleka.\n"
-#. dialog header
-#: src/modules/Bootloader.rb:162
-msgid "Initializing Boot Loader Configuration"
-msgstr "Ukulungiselela Ukuqalisa Ukuhlelwa Kwe-Boot Loader"
+#, fuzzy
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "Setha indawo ye-boot loader."
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
-msgid "Create initrd"
-msgstr "Yakha i-initrd"
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "Igama elikhethiwe liyasetshenziswa kakade.\n"
+#~ "Seenzisa elihlukile.\n"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
-msgid "Save boot loader configuration files"
-msgstr "Gcina amafayela okuhlela e-boot loader"
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "Kwenzeke iphutha ngesikhathi kufakwa i-\n"
+#~ "boot loader. Phinde uzame ukuhlela i-boot loader?\n"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
-msgid "Install boot loader"
-msgstr "Faka i-boot loader"
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "Isexwayiso!\n"
+#~ "\n"
+#~ " I-MBR yamanje ye-%1 manje isizophinde ikopishelwe kwi-MBR\n"
+#~ " egcinwe ku-%2.\n"
+#~ " \n"
+#~ " Yikhodi yokuqalisa kuphela eku-MBR ezokopishwa kabusha.\n"
+#~ " Ithebula lekamelo (partition table) lizohlala lingashintshile.\n"
+#~ " \n"
+#~ " Qhubeka?\n"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
-msgid "Creating initrd..."
-msgstr "Yakha i-initrd..."
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "&Yebo, Kopisha Kabusha"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
-msgid "Saving boot loader configuration files..."
-msgstr "Igcina amafayela okuhlela e-boot loader..."
+#, fuzzy
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "Uhlobo Olungaziwa: %1"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
-msgid "Installing boot loader..."
-msgstr "Ifaka i-boot loader..."
+#~ msgid "Install boot loader"
+#~ msgstr "Faka i-boot loader"
-#. progress line
-#: src/modules/Bootloader.rb:299
-msgid "Saving Boot Loader Configuration"
-msgstr "Igcina Ukuhlelwa Kwe-Boot Loader"
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "Igcina amafayela okuhlela e-boot loader..."
+#~ msgid "Installing boot loader..."
+#~ msgstr "Ifaka i-boot loader..."
+
#, fuzzy
#~| msgid "Distribution:"
#~ msgid "D&istributor"
@@ -1389,9 +1230,6 @@
#~ msgid "Section name must be specified."
#~ msgstr "Igama lengxenye kumelwe liboniswe."
-#~ msgid "Disk Order"
-#~ msgstr "Ukuhlelwa Kwediski"
-
#~ msgid "Boot Menu"
#~ msgstr "Imenu Yokuqalisa"
@@ -1813,9 +1651,6 @@
#~ msgid "Section &Name"
#~ msgstr "Igama &Lengxenye"
-#~ msgid " (default)"
-#~ msgstr "(default)"
-
#, fuzzy
#~ msgid "Sections:<br>%1"
#~ msgstr "Izingxenye: %1"
@@ -2397,9 +2232,6 @@
#~ msgid "image"
#~ msgstr "Umfanekiso"
-#~ msgid "Yes"
-#~ msgstr "Yebo"
-
#~ msgid "No"
#~ msgstr "Cha"
Modified: trunk/yast/zu/po/ca-management.zu.po
===================================================================
--- trunk/yast/zu/po/ca-management.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/ca-management.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -130,8 +130,7 @@
#: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
#: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
#: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
#, fuzzy
msgid "&Password:"
msgstr "&Iphasiwedi"
@@ -207,8 +206,7 @@
#: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
#: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
#: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
msgid "New passwords do not match."
msgstr ""
@@ -1954,44 +1952,43 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
msgid "Creating certificate..."
msgstr ""
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
msgstr ""
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
#, fuzzy
msgid "Finish"
msgstr "&Phothula"
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
#, fuzzy
msgid "Really save configuration ?"
msgstr "Gcina ukuhlela"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
msgid "Exit"
msgstr ""
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
msgid "Really exit configuration without saving ?"
msgstr ""
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
#, fuzzy
msgid "Details"
msgstr "Imininingwane:"
@@ -2288,8 +2285,7 @@
msgid "LDAP P&assword:"
msgstr "&Iphasiwedi"
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
#: src/include/ca-management/util.rb:1388
#, fuzzy
msgid "Certificate &Password:"
@@ -2339,28 +2335,23 @@
msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
msgstr ""
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
msgid "C&ertificate and the Key Encrypted in PEM Format"
msgstr ""
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
msgid "&Certificate in DER Format"
msgstr ""
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
msgid "Cer&tificate and the Key in PKCS12 Format"
msgstr ""
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
msgid "&Like PKCS12 and Include the CA Chain"
msgstr ""
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
#, fuzzy
msgid "&New Password"
msgstr "&Iphasiwedi"
Modified: trunk/yast/zu/po/cio.zu.po
===================================================================
--- trunk/yast/zu/po/cio.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/cio.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -43,13 +43,13 @@
msgstr "Osetshenzisiwe"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "cha"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "yes"
msgstr "yebo"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "cha"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
#, fuzzy
Modified: trunk/yast/zu/po/cluster.zu.po
===================================================================
--- trunk/yast/zu/po/cluster.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/cluster.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -147,7 +147,7 @@
msgstr "Dlala umsindo wokuhlola lapho ikhadi lihlelwa"
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
msgid "The Multicast Address has to be fulfilled"
msgstr ""
@@ -177,7 +177,7 @@
msgstr "Ukuhlela Ikheli Lenethiwekhi"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
#, fuzzy
#| msgid "Portal Address"
msgid "Multicast Address:"
@@ -237,149 +237,149 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
#, fuzzy
#| msgid "Enable Security Event Notification"
msgid "Enable Security Auth"
msgstr "Vula Isaziso Sezenzakalo Eziphathelene Nokuphepha"
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr ""
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr ""
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
msgid "Running"
msgstr "Iyasebenza"
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
#, fuzzy
#| msgid "No network running"
msgid "Not running"
msgstr "Ayikho inethiwekhi esebenzayo"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
msgid "Booting"
msgstr "Ukuqalisa"
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
#, fuzzy
#| msgid "Started manually"
msgid "On -- Start pacemaker during boot"
msgstr "Iqaliswe mathupha"
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
#, fuzzy
#| msgid "Started manually"
msgid "Off -- Start pacemaker manually"
msgstr "Iqaliswe mathupha"
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
msgid "Switch On and Off"
msgstr "Vula bese Ucisha"
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
msgid "Current Status: "
msgstr "Isimo Samanje:"
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
#, fuzzy
#| msgid "Start Firewall Now"
msgid "Start pacemaker Now"
msgstr "Qalisa i-Firewall Manje"
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
#, fuzzy
#| msgid "Stop Firewall Now"
msgid "Stop pacemaker Now"
msgstr "Misa i-Firewall Manje"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
#, fuzzy
#| msgid "Local Host"
msgid "Sync Host"
msgstr "Isiphakeli Esiseduze"
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Add"
msgstr "&Nezela"
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
#, fuzzy
#| msgid "Delay"
msgid "Del"
msgstr "Bambezela"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Edit"
msgstr "Hlela"
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
#, fuzzy
#| msgid "Select File"
msgid "Sync File"
msgstr "Khetha Ifayela"
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
#, fuzzy
#| msgid "Suggested fstab Lines"
msgid "Add Suggested Files"
msgstr "Imigqa ye-fstab Esikiselwayo"
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
msgid "Generate Pre-Shared-Keys"
msgstr ""
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
msgid "Csync2 Status Unknown"
msgstr ""
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
msgid "Turn csync2 ON"
msgstr ""
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 OFF"
msgstr ""
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
#, fuzzy
#| msgid "Enter a valid host name."
msgid "Enter a hostname"
msgstr "Faka igama lomnininhlangano eliyilo."
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
msgid "Edit the hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
#, fuzzy
#| msgid "Enter a new name for the %1 profile."
msgid "Enter a filename to synchronize"
msgstr "Faka igama elisha %1 lephrofayili."
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
#, fuzzy
#| msgid "Enter the file name"
msgid "Edit the filename"
msgstr "Faka igama lefayela"
#. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
#, fuzzy
#| msgid ""
#| "Archive %1 already exists.\n"
@@ -392,50 +392,50 @@
"Ngabe ufuna ngempela ukusicisha?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
#, fuzzy
#| msgid "Reading file on %1 failed.\n"
msgid "Delete key file %1 failed."
msgstr "Ukufunda ifayela kwi-%1 akuphumelelanga.\n"
#. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
msgstr ""
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
#, fuzzy
#| msgid "Image creation failed."
msgid "Key generation failed."
msgstr "Ukwakhiwa komfanekiso kuhlulekile."
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
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:1358
+#: src/include/cluster/dialogs.rb:1360
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
#, fuzzy
#| msgid "The value for clock skew must be a positive integer."
msgid "The Group Number must be a positive integer"
@@ -548,41 +548,41 @@
msgstr "Ilungiselela ukuqala..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
#, fuzzy
#| msgid "Initializing Printer Configuration"
msgid "Initializing cluster Configuration"
msgstr "Iqalisa Ukuhlelwa Kwephrinta"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
msgid "Read the database"
msgstr "Funda i-database"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
msgid "Read the previous settings"
msgstr "Funda amasethingi adlule"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
#, fuzzy
#| msgid "Read firewall settings"
msgid "Read SuSEFirewall Settings"
msgstr "Funda amasethingi esihenqo sokuvikela (firewall)"
#. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
msgid "Reading the database..."
msgstr "If i-database..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
msgid "Reading the previous settings..."
msgstr "Ifunda amasethingi adlule..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
#, fuzzy
#| msgid "Reading firewall settings..."
msgid "Reading SuSEFirewall settings..."
@@ -590,75 +590,75 @@
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
msgid "Finished"
msgstr "Iphothulile"
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
#, fuzzy
#| msgid "Cannot install required packages."
msgid "Cannot install required package"
msgstr "Ayikwazi ukufaka amaphakheji adingekayo."
#. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
#, fuzzy
#| msgid "Change existing configuration"
msgid "Cannot load existing configuration"
msgstr "Shintsha ukuhlelwa kwamanje"
#. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
#, fuzzy
#| msgid "Cannot read the database1."
msgid "Cannot read database1."
msgstr "Ayikwazi ukufund i-database1."
#. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
#, fuzzy
#| msgid "Cannot read the database2."
msgid "Cannot read database2."
msgstr "Ayikwazi ukufund i-database2"
#. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
msgid "Cannot detect devices."
msgstr "Ayikwazi ukuthungatha amadivayisi."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
#, fuzzy
#| msgid "Saving the Configuration"
msgid "Saving cluster Configuration"
msgstr "Ifunda Ukuhelwa"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
msgid "Write the settings"
msgstr "Bhala amasethingi"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
#, fuzzy
#| msgid "Save changes to the Profile"
msgid "Save changes to SuSEFirewall"
msgstr "Gcina izinguquko kwiProfayili"
#. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
msgid "Writing the settings..."
msgstr "Ibhala amasethingi..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
#, fuzzy
#| msgid "Saving changes to the files..."
msgid "Saving changes to SuSEFirewall..."
msgstr "Igcina izinguquko kumafayela..."
#. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "Ayikwazi ukubhala amasethingi."
Modified: trunk/yast/zu/po/control.zu.po
===================================================================
--- trunk/yast/zu/po/control.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/control.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -17,323 +17,659 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.novell.com/linux/.\n"
+#| "</p>\n"
+#| "\t"
msgid ""
"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-" "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
msgstr ""
"\n"
-"<p><b>Siyakuhalalisela!</b></p>\n"
-" <p>Ukufakwa kwe-openSUSE emshinini wakho kuphothuliwe.\n"
-" Ngemva kokuchofoza u-<b>Phothula</b>, ungaloga kwisistimu.</p>\n"
-" <p>Sivakashele e-%1.</p>\n"
-" <p>Sina uzibethele!<br>Iqembu Lakho Labasunguli Be-SUSE</p>\n"
-"\t"
+"<p>\n"
+" Ukufakwa kohlelo kuphothule ngempumelelo.\n"
+" Isistimu yakho isikulungele ukusetshenziswa.\n"
+" Chofoza u-Phothula ukuze ungene kwisistimu.\n"
+" </p>\n"
+" <p>\n"
+" Sicela usivakashele engosini ethi http://www.novell.com/linux/.\n"
+" </p>\n"
+" \t"
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments. The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:21
+#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
#, fuzzy
-msgid "GNOME Desktop"
-msgstr "Isendlalelo"
+#| msgid "IMAP Server"
+msgid "CIM Server"
+msgstr "Isiphakelalwazi se-IMAP"
-#: control/control.openSUSE.glade.translations.glade:22
-#, fuzzy
-msgid "KDE Desktop"
-msgstr "Isendlalelo"
-
-#: control/control.openSUSE.glade.translations.glade:23
-#, fuzzy
-msgid "XFCE Desktop"
-msgstr "Isendlalelo"
-
-#: control/control.openSUSE.glade.translations.glade:24
-#, fuzzy
-msgid "LXDE Desktop"
-msgstr "Isendlalelo"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:26
-#, fuzzy
-#| msgid "Alternate Desktops"
-msgid "Enlightenment Desktop"
-msgstr "Ezinye Izendlalelo"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
msgid "Installation Settings"
msgstr "Amasethingi Okufaka"
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
+msgid "Overview"
+msgstr "Amabalengwe"
+
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+msgid "Expert"
+msgstr "Ongoti"
+
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
#, fuzzy
msgid "Live Installation Settings"
msgstr "Amasethingi Okufaka"
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
msgid "Update Settings"
msgstr "Vuselela Amasethingi"
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Network Configuration"
msgstr "Ukuhlelwa Kwenethiwekhi"
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
msgid "Hardware Configuration"
msgstr "Ukuhlelwa Kwe-Hardware"
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
msgid "Preparation"
msgstr "Ukulungiselela"
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
#, fuzzy
#| msgid "Saving Network Configuration"
msgid "Load linuxrc Network Configuration"
msgstr "Igcina Ukuhlelwa Kwenethiwekhi"
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
#, fuzzy
#| msgid "Network Address Setup"
msgid "Network Autosetup"
msgstr "Ukuhlela Ikheli Lenethiwekhi"
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
msgid "Welcome"
msgstr "Siyakwamukela"
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
#, fuzzy
#| msgid "Disk Activation"
msgid "Network Activation"
msgstr "Ukwenza Idiski Isebenze"
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
msgid "Disk Activation"
msgstr "Ukwenza Idiski Isebenze"
-#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
msgid "System Analysis"
msgstr "Ukuhlaziya Isistimu"
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
-msgid "Disk"
-msgstr "Idiski"
-
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
-msgid "Time Zone"
-msgstr "Izoni Yesikhathi"
-
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
#, fuzzy
-msgid "Online Repositories"
+#| msgid "Online Update"
+msgid "Installer Update"
msgstr "Ukuvuselela Amafayela Kwi-Inthanethi"
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
msgid "Add-On Products"
msgstr "Imikhiqizo Eyenezelwayo"
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "Ukukhethwa Kwe-desktop"
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
+msgid "Disk"
+msgstr "Idiski"
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
#: control/control.openSUSE.glade.translations.glade:69
+msgid "Time Zone"
+msgstr "Izoni Yesikhathi"
+
+#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
#, fuzzy
msgid "User Settings"
msgstr "Amasethingi Esizinda"
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "Ukufaka Uhlelo"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
#, fuzzy
msgid "Installation Overview"
msgstr "Imediya Yokufaka Uhlelo"
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
#: control/control.openSUSE.glade.translations.glade:54
#: control/control.openSUSE.glade.translations.glade:55
#: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
#: control/control.openSUSE.glade.translations.glade:58
#: control/control.openSUSE.glade.translations.glade:59
#: control/control.openSUSE.glade.translations.glade:60
#: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
#: control/control.openSUSE.glade.translations.glade:75
#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
msgid "Perform Installation"
msgstr "Faka Uhlelo"
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "Ukufaka Uhlelo"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
+msgid "Installation"
+msgstr "Ukufaka Uhlelo"
+
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
msgid "System for Update"
msgstr "Isistimu Yokuvuselela"
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
msgid "Update"
msgstr "Vuselela Uhlelo"
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
+msgid "Update Summary"
+msgstr "Amabalengwe Okuvuselelwa Kohlelo"
+
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:122
#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
msgid "Perform Update"
msgstr "Vuselela Uhlelo"
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "Ukuhlela"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
msgid "Base Installation"
msgstr "Ukufaka i-Base"
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
msgid "AutoYaST Settings"
msgstr "Amasethingi e-Auto YaST"
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
+msgid "Configuration"
+msgstr "Ukuhlela"
+
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
msgid "System Configuration"
msgstr "Ukuhlelwa Kwesistimu"
+#: control/control.SLES.glade.translations.glade:3
#, fuzzy
-#~| msgid ""
-#~| "\n"
-#~| "<p>\n"
-#~| "The installation has completed successfully.\n"
-#~| "Your system is ready for use.\n"
-#~| "Click Finish to log in to the system.\n"
-#~| "</p>\n"
-#~| "<p>\n"
-#~| "Please visit us at http://www.novell.com/linux/.\n"
-#~| "</p>\n"
-#~| "\t"
-#~ msgid ""
-#~ "\n"
-#~ "<p>\n"
-#~ "The installation has completed successfully.\n"
-#~ "Your system is ready for use.\n"
-#~ "Click Finish to log in to the system.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ "<p>\n"
-#~ " Ukufakwa kohlelo kuphothule ngempumelelo.\n"
-#~ " Isistimu yakho isikulungele ukusetshenziswa.\n"
-#~ " Chofoza u-Phothula ukuze ungene kwisistimu.\n"
-#~ " </p>\n"
-#~ " <p>\n"
-#~ " Sicela usivakashele engosini ethi http://www.novell.com/linux/.\n"
-#~ " </p>\n"
-#~ " \t"
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.novell.com/linux/.\n"
+#| "</p>\n"
+#| "\t"
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
+msgstr ""
+"\n"
+"<p>\n"
+" Ukufakwa kohlelo kuphothule ngempumelelo.\n"
+" Isistimu yakho isikulungele ukusetshenziswa.\n"
+" Chofoza u-Phothula ukuze ungene kwisistimu.\n"
+" </p>\n"
+" <p>\n"
+" Sicela usivakashele engosini ethi http://www.novell.com/linux/.\n"
+" </p>\n"
+" \t"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
#, fuzzy
-#~| msgid "IMAP Server"
-#~ msgid "CIM Server"
-#~ msgstr "Isiphakelalwazi se-IMAP"
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "Isistimu Yokuvuselela"
-#~ msgid "Overview"
-#~ msgstr "Amabalengwe"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
-#~ msgid "Expert"
-#~ msgstr "Ongoti"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
#, fuzzy
-#~| msgid "Network Service Configuration (xinetd)"
-#~ msgid "Network Services Configuration"
-#~ msgstr "Ukuhlelwa Kwesivisi Yenethiwekhi (xinetd)"
+msgid "KVM Virtualization Host"
+msgstr "Ukubona ngeso lengqondo"
-#~ msgid "Installation Summary"
-#~ msgstr "Amabalengwe Okufaka Uhlelo"
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
-#~ msgid "Update Summary"
-#~ msgstr "Amabalengwe Okuvuselelwa Kohlelo"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+msgid "Xen Virtualization Host"
+msgstr "Ukubona ngeso lengqondo"
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:48
+#, fuzzy
+#| msgid "Network Service Configuration (xinetd)"
+msgid "Network Services Configuration"
+msgstr "Ukuhlelwa Kwesivisi Yenethiwekhi (xinetd)"
+
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Saving Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "Igcina Ukuhlelwa Kwenethiwekhi"
+
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "Amabalengwe Okufaka Uhlelo"
+
+#: control/control.openSUSE.glade.translations.glade:3
+#, fuzzy
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+"\n"
+"<p><b>Siyakuhalalisela!</b></p>\n"
+" <p>Ukufakwa kwe-openSUSE emshinini wakho kuphothuliwe.\n"
+" Ngemva kokuchofoza u-<b>Phothula</b>, ungaloga kwisistimu.</p>\n"
+" <p>Sivakashele e-%1.</p>\n"
+" <p>Sina uzibethele!<br>Iqembu Lakho Labasunguli Be-SUSE</p>\n"
+"\t"
+
+#: control/control.openSUSE.glade.translations.glade:10
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:21
+#, fuzzy
+msgid "GNOME Desktop"
+msgstr "Isendlalelo"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+msgid "KDE Plasma Desktop"
+msgstr "Isendlalelo"
+
+#: control/control.openSUSE.glade.translations.glade:23
+msgid "Server (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+msgid "Xfce Desktop"
+msgstr "Isendlalelo"
+
+#: control/control.openSUSE.glade.translations.glade:25
+#, fuzzy
+msgid "LXDE Desktop"
+msgstr "Isendlalelo"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:27
+#, fuzzy
+#| msgid "Alternate Desktops"
+msgid "Enlightenment Desktop"
+msgstr "Ezinye Izendlalelo"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+#, fuzzy
+msgid "Online Repositories"
+msgstr "Ukuvuselela Amafayela Kwi-Inthanethi"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "Ukukhethwa Kwe-desktop"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "Ukufakwa Kwemikhiqizo Eyenezelwayo"
@@ -400,9 +736,6 @@
#~ msgid "Customer Center"
#~ msgstr "Isikhungo Samakhasimende"
-#~ msgid "Online Update"
-#~ msgstr "Ukuvuselela Amafayela Kwi-Inthanethi"
-
#~ msgid "Release Notes"
#~ msgstr "Ukwaziswa Okuphathelene Nohlelo"
@@ -472,10 +805,6 @@
#~ msgid "Virtual Machine"
#~ msgstr "Ama-domain aqhelelene"
-#, fuzzy
-#~ msgid "XEN Virtualization Host"
-#~ msgstr "Ukubona ngeso lengqondo"
-
#~ msgid "Software Selection"
#~ msgstr "Ukukhethwa Kwe-software"
Modified: trunk/yast/zu/po/country.zu.po
===================================================================
--- trunk/yast/zu/po/country.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/country.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2005-07-27 11:49+0200\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -683,7 +683,9 @@
#. command line help text for 'set hwclock' option
#: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
msgstr "I-value entsha yewashi le-hardware"
#. summary label
@@ -861,8 +863,8 @@
"Usuku olunganembile (HH:MM:SS) %1.\n"
"Faka usuku olunembile.\n"
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
#, fuzzy
#| msgid "E&xpert Settings..."
msgid "Other &Settings..."
@@ -870,46 +872,46 @@
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
#, fuzzy
msgid "Date and Time (NTP is configured)"
msgstr "Iphrinta ayihlelwanga"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
#, fuzzy
msgid "Date and Time"
msgstr "Shintsha Usuku Nesikhathi Sesistimu"
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
#, fuzzy
msgid "&Hardware Clock Set to UTC"
msgstr "&Iwashi Le-Hardware Lisethwe Ku"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
msgid "&Region"
msgstr "&Isifundazwe"
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
msgid "Time &Zone"
msgstr "Izoni &Yesikhathi"
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
#, fuzzy
msgid "Date and Time:"
msgstr "Shintsha Usuku Nesikhathi Sesistimu"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -918,7 +920,7 @@
"<p><b><big>Amasethingi Ezoni Yesikhathi Nawewashi</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -933,7 +935,7 @@
" </p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -944,12 +946,12 @@
" </p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
msgid "Clock and Time Zone"
msgstr "Iwashi Nezoni Yesikhathi"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
msgid "Select a valid time zone."
msgstr "Khetha izoni yesikhathi enembile."
@@ -1038,181 +1040,188 @@
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "ISipanishi (saseLatin America)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Italian"
msgstr "IsiNtaliyane"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese"
msgstr "IsiPutukezi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil)"
msgstr "IsiPutukezi (saseBrazil)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Portuguese (Brazil -- US accents)"
msgstr "IsiPutukezi (saseBrazil - nge-accent yase-US)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Greek"
msgstr "IsiGreki"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Dutch"
msgstr "IsiDashi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Danish"
msgstr "IsiDanishi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Norwegian"
msgstr "IsiNorway"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Swedish"
msgstr "IsiSwidi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Finnish"
msgstr "IsiFinishi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
msgid "Czech"
msgstr "IsiCzech"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
msgid "Czech (qwerty)"
msgstr "IsiCzech (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
msgid "Slovak"
msgstr "IsiSlovak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
msgid "Slovak (qwerty)"
msgstr "IsiSlovak (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
msgid "Slovene"
msgstr "ISlovene"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "IsiHungary"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "IsiPolishi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "IsiRashiya"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "IsiSerbia"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "Isi-Estonia"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "IsiLithania"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "IsiTurkey"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "IsiCroatia"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "IsiJaphane"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "IsiBelgium"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "IsiDvorak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "Isi-Iceland"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "Isi-Ukrania"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "IsiKhmer"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "IsiKorea"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "Isi-Arabhu"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "IsiTajik"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "IsiShayina Sendabuko"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "IsiShayina Esenziwe Lula"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "IsiRomania"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
#, fuzzy
#| msgid "Internal Zone"
msgid "US International"
Modified: trunk/yast/zu/po/crowbar.zu.po
===================================================================
--- trunk/yast/zu/po/crowbar.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/crowbar.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -22,19 +22,9 @@
msgid "Configuration of crowbar"
msgstr "Umiso likamakhi weCD"
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr ""
-
#. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr ""
-
-#. target platform name
#: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
+msgid "SLES 12 SP1"
msgstr ""
#. combobox label
@@ -48,11 +38,11 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough 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"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-…</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
@@ -197,30 +187,33 @@
msgstr "&Ikheli Le-IP"
#. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
msgid "Name"
msgstr "Igama"
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
msgid "URL"
msgstr "I-URL"
#. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
msgid "Ask On Error"
msgstr ""
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
#, fuzzy
#| msgid "Target Name"
msgid "Target Platform"
msgstr "Igama Le-Target"
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
#. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
#, fuzzy
#| msgid ""
#| "Hardware configuration %1 already exists.\n"
@@ -233,90 +226,97 @@
"Khetha okuhlukile."
#. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
#, fuzzy
#| msgid "Server URL: "
msgid "Server &URL"
msgstr "Isiphakelalwazi I-URL:"
#. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
#, fuzzy
#| msgid "Report Name"
msgid "Repository Name"
msgstr "Igama Lombiko"
#. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
msgid "&Ask On Error"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
#, fuzzy
#| msgid "Package Repository"
msgid "Repository &URL"
msgstr "Okokugcina Iphakheji"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
#, fuzzy
#| msgid "&Enable Repository"
msgid "A&dd Repository"
msgstr "&Cupha Isilondi"
#. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
#, fuzzy
#| msgid "Remote WINS Server"
+msgid "Local SMT Server"
+msgstr "Isiphakelalwazi Esikude Se-WINS"
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
+#, fuzzy
+#| msgid "Remote WINS Server"
msgid "Remote SMT Server"
msgstr "Isiphakelalwazi Esikude Se-WINS"
#. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
#, fuzzy
#| msgid "Mail Server"
msgid "SUSE Manager Server"
msgstr "Isiphakelalwazi seMeyili"
#. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
msgid "Custom"
msgstr "I-Custom"
#. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
#, fuzzy
#| msgid "&User Name"
msgid "User Name"
msgstr "&Igama Lomsebenzisi"
#. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
msgid "Password"
msgstr "Iphasiwedi"
#. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
#, fuzzy
#| msgid "Set the password."
msgid "Repeat the Password"
msgstr "Setha iphasiwedi."
#. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
#, fuzzy
#| msgid "Share name cannot be empty."
msgid "User name cannot be empty."
msgstr "Igama lokokwabelana alikwazi ukungabi nalutho."
#. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -325,7 +325,7 @@
"Phinda uzame."
#. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
#, fuzzy
#| msgid ""
#| "Hardware configuration %1 already exists.\n"
@@ -338,19 +338,19 @@
"Khetha okuhlukile."
#. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
#, fuzzy
#| msgid "The search domain '%1' is invalid."
msgid "The interface format '%1' is not valid"
msgstr "I-domain yokucinga '%1' ayisebenzi."
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
msgid "disabled"
msgstr "kucishiwe"
#. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
#, fuzzy
#| msgid "The subnet mask is invalid."
msgid ""
@@ -360,7 +360,7 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
#, fuzzy
#| msgid "The IP address is invalid."
msgid ""
@@ -369,7 +369,7 @@
msgstr "Ikheli lomphakeli akulona"
#. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
#, fuzzy
#| msgid "The remote IP address is invalid."
msgid ""
@@ -378,97 +378,97 @@
msgstr "Ikheli lomphakeli okude akulona."
#. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
#, fuzzy
#| msgid "The format of server address '%1' is not correct."
msgid "The router address '%1' is not part of network '%2'."
msgstr "Ifomathi yekheli lesiphakelalwazi '%1' ayinembile."
#. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
#, fuzzy
#| msgid "The format of server address '%1' is not correct."
msgid "The IP address '%1' is not part of network '%2'."
msgstr "Ifomathi yekheli lesiphakelalwazi '%1' ayinembile."
#. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
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:1335
+#: src/include/crowbar/complex.rb:1326
#, fuzzy
#| msgid "IP Address"
msgid "Min IP Address"
msgstr "Ikheli Le-IP"
#. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
#, fuzzy
#| msgid "IP Address"
msgid "Max IP Address"
msgstr "Ikheli Le-IP"
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
msgid "The address '%1' is not part of network '%2'."
msgstr ""
#. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
#, fuzzy
#| msgid "The network name must be shorter than 32 characters."
msgid "The lowest address must be lower than the highest one."
msgstr "Igama lenethiwekhi kumelwe lingabi nezinhlamvu ezingaphezu kuka-32."
#. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
msgid "Ranges '%1' and '%2' are overlapping."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
#, fuzzy
#| msgid "&Other Settings"
msgid "&User Settings"
msgstr "&Amanye Amasethingi"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
#, fuzzy
#| msgid "Network Mode"
msgid "N&etwork Mode"
msgstr "Imodi Yenethiwekhi"
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
#, fuzzy
#| msgid "Bond Network"
msgid "Bastion Network"
msgstr "Inethiwekhi Ye-bond"
#. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
#, fuzzy
#| msgid "Network"
msgid "Net&works"
msgstr "Inethiwekhi"
#. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
#, fuzzy
#| msgid "&Countries"
msgid "Re&positories"
msgstr "&Amazwe"
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
msgid ""
"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
@@ -477,7 +477,7 @@
msgstr ""
#. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
#, fuzzy
#| msgid "Modem Configuration Overview"
msgid "Crowbar Configuration Overview"
@@ -544,44 +544,44 @@
msgstr "Ilungiselela ukuqala..."
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
#, fuzzy
#| msgid "Initializing Scanner Configuration"
msgid "Initializing crowbar Configuration"
msgstr "Ilungiselela Ukuqalisa Ukuhlelwa Kweskena"
#. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
#, fuzzy
#| msgid "Read the configuration"
msgid "Read the configuraton"
msgstr "Funda Ukuhlelwa Kohlelo"
#. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
msgid "Reading the configuration..."
msgstr "Ifunda ukuhlelwa kohlelo..."
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
msgid "Finished"
msgstr "Iphothulile"
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
#, fuzzy
#| msgid "Saving Configuration"
msgid "Saving crowbar Configuration"
msgstr "Igcina Ukuhlela"
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
msgid "Write the settings"
msgstr "Bhala amasethingi"
#. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
msgid "Writing the settings..."
msgstr "Ibhala amasethingi..."
Modified: trunk/yast/zu/po/dhcp-server.zu.po
===================================================================
--- trunk/yast/zu/po/dhcp-server.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/dhcp-server.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -59,9 +59,7 @@
msgstr ""
#. command line help text for an option
-#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
msgid "List all defined hosts with a fixed address"
msgstr ""
@@ -101,159 +99,165 @@
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
#, fuzzy
msgid "Select the network interface to use"
msgstr "Khetha i-Serial &Interface Ozoyisebenzisa:"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
msgid "Print the currently used interface and list other available interfaces"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
#, fuzzy
msgid "Print current options"
msgstr "Okukhethwe Njengamanje:"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
msgid "Set a global option"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
msgid "Option key (for example, ntp-servers)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
msgid "Option value (for example, IP address)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
msgid "Lowest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
msgid "Highest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
msgid "Default lease time in seconds"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
msgid "Maximum lease time in seconds"
msgstr ""
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
#, fuzzy
msgid "DHCP server is enabled"
msgstr "Isiphakelalwazi se-DHCP"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
#, fuzzy
msgid "DHCP server is disabled"
msgstr "Ifayawoli icishiwe"
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
#, fuzzy
msgid "Host: %1"
msgstr "&I-host:"
#. command-line text output, %1 is hardwarre address
#. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
msgid "Hardware: %1"
msgstr ""
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
#, fuzzy
msgid "IP Address: %1"
msgstr "Ikheli Le-IP"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
msgid "Hostname not specified."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
#, fuzzy
msgid "Specified host does not exist."
msgstr "Ifayela ebonisiwe ayikho."
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
msgid "None"
msgstr "Akukho lutho"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
#, fuzzy
msgid "Selected Interfaces: %1"
msgstr "Khetha i-Serial &Interface Ozoyisebenzisa:"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
msgid "Other Interfaces: %1"
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
#, fuzzy
msgid "Specified interface does not exist."
msgstr "Ifayela ebonisiwe ayikho."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
msgid "Operation with the interface not specified."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
msgid "Option key must be set."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
msgid "Value must be set."
msgstr ""
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
msgid "Address Range: %1-%2"
msgstr ""
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
msgid "Default Lease Time: %1"
msgstr ""
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
msgid "Maximum Lease Time: %1"
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
msgid "Saving the configuration failed. Change the settings?"
msgstr ""
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+msgid "Saving the configuration failed"
+msgstr "Igcina ukuhlelwa kwenethiwekhi..."
+
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
#, fuzzy
msgid "DHCP Server Configuration"
msgstr "Gcina ukuhlela"
@@ -261,98 +265,98 @@
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
#, fuzzy
msgid "Global Options"
msgstr "&Ongakhetha kukho"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
#, fuzzy
msgid "Subnet Configuration"
msgstr "Gcina ukuhlela"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
msgid "Host with Fixed Address"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
msgid "Shared Network"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
#, fuzzy
msgid "Pool of Addresses"
msgstr "Ikheli Le-IP"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
msgid "Group-Specific Options"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
msgid "Class"
msgstr "Isigaba"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
msgid "&Subnet"
msgstr ""
#. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
#, fuzzy
msgid "&Host"
msgstr "&I-host:"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
msgid "Shared &Network"
msgstr ""
#. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
msgid "&Group"
msgstr "&Iqembu"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
#, fuzzy
msgid "&Pool of Addresses"
msgstr "Ikheli Le-IP"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
msgid "&Class"
msgstr "&Isigaba"
#. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
msgid "Declaration Types"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
msgid "Declaration Type"
msgstr ""
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
#, fuzzy
msgid "Interface Configuration"
msgstr "Gcina ukuhlela"
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
msgid "TSIG Key Management"
msgstr ""
@@ -377,7 +381,7 @@
msgstr "Imizuzwana"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
#, fuzzy
msgid "DHCP Server: Start-Up"
msgstr "Isiphakelalwazi se-DHCP"
@@ -385,203 +389,155 @@
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
#, fuzzy
msgid "Start-Up"
msgstr "Qalisa &Vuselela"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
msgid "DHCP Server: Card Selection"
msgstr ""
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
#, fuzzy
msgid "Card Selection"
msgstr "Ukukhethwa Kwekhathalogi"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
msgid "DHCP Server: Global Settings"
msgstr ""
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
#, fuzzy
msgid "Global Settings"
msgstr "Amasethingi Okufaka"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
#, fuzzy
msgid "DHCP Server: Dynamic DHCP"
msgstr "Isiphakelalwazi se-DHCP"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
msgid "Dynamic DHCP"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
msgid "DHCP Server: Host Management"
msgstr ""
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
#, fuzzy
msgid "Host Management"
msgstr "&Igama lesiphakeli"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
msgid "DHCP Server: Expert Settings"
msgstr ""
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
msgid "Expert Settings"
msgstr "Amasethingi Enzelwe Ongoti"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
msgid "When &Booting"
msgstr "Lapho &Uqalisa Uhlelo"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
#, fuzzy
msgid "&Manually"
msgstr "Lapho uzenzela mathupha"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
msgid "When Booting"
msgstr "Lapho Uqalisa Uhlelo"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
msgid "Manually"
msgstr "Lapho uzenzela mathupha"
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
+#: src/include/dhcp-server/dialogs2.rb:334
#, fuzzy
-msgid "DHCP server is running"
-msgstr "Isevisi imatasa"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-#, fuzzy
-msgid "DHCP server is not running"
-msgstr "Isevisi ayisebenzi"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-#, fuzzy
-msgid "&Start DHCP Server Now"
-msgstr "&Qala Isevisi Manje"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-#, fuzzy
-msgid "S&top DHCP Server Now"
-msgstr "M&isa Isevisi Manje"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-#, fuzzy
-msgid "Start DHCP Server Now"
-msgstr "Qala Isevisi Manje"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-#, fuzzy
-msgid "Stop DHCP Server Now"
-msgstr "Misa Isevisi Manje"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
-
-#: src/include/dhcp-server/dialogs2.rb:371
-#, fuzzy
msgid "DHCP Server Start-up Arguments"
msgstr "Isiphakelalwazi se-DHCP"
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
msgid "Network Cards for DHCP Server"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
#, fuzzy
msgid "Selected"
msgstr "Ungakhethi &Lutho"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
#, fuzzy
msgid "Interface Name"
msgstr "Igama Ledivayisi"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
msgid "Device Name"
msgstr "Igama Ledivayisi"
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
msgid "IP"
msgstr ""
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
#, fuzzy
msgid "&Select"
msgstr "Khetha &Wonke"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
#, fuzzy
msgid "&Deselect"
msgstr "Sicela ukhethe"
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
msgid "DHCP address"
msgstr "Ikheli le-DHCP"
#. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
#, fuzzy
msgid "At least one network interface must be selected."
msgstr "Awekho ama-interface enethiwekhi ahleliwe"
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
msgid ""
"One or more selected network interfaces is not configured (no assigned IP address \n"
"and netmask)."
@@ -589,66 +545,66 @@
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
#, fuzzy
msgid "&LDAP Support"
msgstr "&Usizo Lwe-LDAP Luyasebenza"
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
#, fuzzy
msgid "DHCP Server &Name (optional)"
msgstr "Gcina ukuhlela"
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
#, fuzzy
msgid "&Domain Name"
msgstr "Igama Ledivayisi"
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
msgid "&Primary Name Server IP"
msgstr ""
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
msgid "&Secondary Name Server IP"
msgstr ""
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
msgid "Default &Gateway (Router) "
msgstr ""
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
#, fuzzy
msgid "NTP &Time Server"
msgstr "Isiphakelalwazi se-NTP"
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
#, fuzzy
msgid "&Print Server"
msgstr "Isiphakelalwazi se-IPP"
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
#, fuzzy
msgid "&WINS Server"
msgstr "&Iziphakelalwazi Ze-NFS"
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
msgid "Default &Lease Time"
msgstr ""
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
msgid "&Units"
msgstr ""
@@ -656,39 +612,39 @@
#. error popup
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
msgid "The specified value is not a valid hostname or IP address."
msgstr ""
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
#, fuzzy
msgid "Subnet Information"
msgstr "Gcina ukuhlela"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
#, fuzzy
msgid "Current &Network"
msgstr "Okukhethwe Njengamanje:"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
#, fuzzy
msgid "Current Net&mask"
msgstr "Isimo Samanje:"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
msgid "Netmask Bi&ts"
msgstr ""
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
#: src/include/dhcp-server/dns-server-dialogs.rb:81
#, fuzzy
msgid "Min&imum IP Address"
@@ -696,13 +652,13 @@
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
#: src/include/dhcp-server/dns-server-dialogs.rb:83
#, fuzzy
msgid "Ma&ximum IP Address"
msgstr "Ikheli Le-IP"
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
#, fuzzy
msgid "IP Address Range"
msgstr "Ikheli Le-IP"
@@ -711,10 +667,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
#, fuzzy
msgid "&First IP Address"
msgstr "Ikheli Le-IP"
@@ -723,63 +679,63 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
#, fuzzy
msgid "&Last IP Address"
msgstr "Ikheli Le-IP"
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
msgid "Allow Dynamic &BOOTP"
msgstr ""
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
msgid "Lease Time"
msgstr ""
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
msgid "&Default"
msgstr "&Okufike Nohlelo (default)"
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
msgid "&Maximum"
msgstr ""
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
msgid "Uni&ts"
msgstr ""
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
msgid "Create New DNS Zone from Scratch"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
msgid "Edit Current DNS Zone"
msgstr ""
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
#, fuzzy
msgid "Get Current Zone Information"
msgstr "Funda ukuhlela kwamanje"
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
msgid "&Synchronize DNS Server..."
msgstr ""
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -787,8 +743,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
msgid "Enter values for both ends of the IP address range."
msgstr ""
@@ -796,141 +752,141 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
msgid ""
"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
msgstr ""
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
#, fuzzy
msgid "Registered Host"
msgstr "Izi&phakeli Ezikude"
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
msgid "Name"
msgstr "Igama"
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
#, fuzzy
msgid "Hardware Address"
msgstr "Ikheli Le-IP"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
msgid "Type"
msgstr "Uhlobo"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
msgid "List Setup"
msgstr ""
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
msgid "&Name"
msgstr "&Igama"
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
#, fuzzy
msgid "&IP Address"
msgstr "Ikheli Le-IP"
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
msgid "&Hardware Address"
msgstr ""
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
#, fuzzy
msgid "&Ethernet"
msgstr "&Okunye"
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
msgid "&Token Ring"
msgstr ""
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
msgid "C&hange in List"
msgstr ""
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "Dele&te from List"
msgstr ""
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
msgid "Ethernet"
msgstr "I-Ethernet"
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
msgid "Token Ring"
msgstr "I-Token Ring"
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
#, fuzzy
msgid "The hardware address is invalid.\n"
msgstr "I-value ka-%1 inephutha."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
msgid "The hardware address must be unique."
msgstr ""
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
msgid "The hostname cannot be empty."
msgstr ""
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
msgid "A host named %1 already exists."
msgstr ""
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
msgid "Enter a host IP."
msgstr ""
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
msgid "The hardware address must be defined."
msgstr ""
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
msgid "Select a host first."
msgstr ""
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
#, fuzzy
msgid "The input value must be defined."
msgstr "Into kumelwe iphothulwe."
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -943,15 +899,15 @@
msgstr ""
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -963,7 +919,7 @@
msgstr ""
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
msgid "DHCP Server Wizard (%1 of 4)"
msgstr ""
@@ -1183,7 +1139,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
msgid "The last IP address must be higher than the first one."
msgstr ""
@@ -1207,7 +1163,7 @@
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
msgid "Invalid hostname."
msgstr ""
@@ -1218,9 +1174,9 @@
#. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
#: src/include/dhcp-server/dns-server-dialogs.rb:462
#: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
#, fuzzy
msgid "Invalid IP address."
msgstr "Ikheli Le-IP"
@@ -1237,51 +1193,51 @@
msgstr ""
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
msgid "Regenerating DNS zone entries..."
msgstr ""
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
msgid "Adding a New DNS Record"
msgstr ""
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "&Igama lesiphakeli"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr ""
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
msgid "Removing DNS Records Matching Range"
msgstr ""
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr ""
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
msgstr ""
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1289,84 +1245,84 @@
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
#: src/include/dhcp-server/dns-server-wizard.rb:1107
#, fuzzy
msgid "Cannot create zone %1."
msgstr "Ayikwazi ukwakha i-directory '%1'."
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
msgid "Synchronizing DNS reverse records..."
msgstr ""
#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
msgstr ""
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
msgid "&Domain"
msgstr "&I-Domain"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
#, fuzzy
msgid "&Network"
msgstr "ikhadi lenethiwekhi"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "Net&mask"
msgstr "I-Net&mask"
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
msgid "DNS Zone Records"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
#, fuzzy
msgid "Hostname"
msgstr "&Igama lesiphakeli"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Assigned IP"
msgstr ""
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
#, fuzzy
msgid "&Add..."
msgstr "&Nezela"
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
msgid "&Special Tasks"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
msgid "Add New Range of DNS Records"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr ""
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
msgid "Synchronize with Reverse Zone %1"
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
msgid "DHCP Server: DNS Server Synchronization"
msgstr ""
@@ -1660,8 +1616,7 @@
msgstr ""
#. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1683,21 +1638,9 @@
"Ukuvula ifayawoli ukuze uvumele ukungena kwisevisi ukusuka kumakhompuyutha akude,\n"
" setha <b>%1</b>.<br>"
-#. help text 1/5
+#. help text 2/5
#: src/include/dhcp-server/helps.rb:39
-#, fuzzy
msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>Ukuqala Kwesevisi</big></b><br>\n"
-"Ukuqala isevisi ngaso sonke isikhathi ikhompuyutha yakho iqaliswa kabusha, isethwa\n"
-" <b>%1</b>. Ngale kwalokho setha <b>%2</b>.</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-msgid ""
"<p>\n"
"To run the DHCP server in chroot jail, set\n"
"<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1705,7 +1648,7 @@
msgstr ""
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1713,7 +1656,7 @@
msgstr ""
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
"To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1723,7 +1666,7 @@
msgstr ""
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1733,14 +1676,14 @@
msgstr ""
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
"Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
msgstr ""
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
"Set the name of the host for which to set the fixed address or other\n"
@@ -1748,7 +1691,7 @@
msgstr ""
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
"Set the name of the group of declarations in <b>Group Name</b>. \n"
@@ -1757,7 +1700,7 @@
msgstr ""
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
"Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1766,7 +1709,7 @@
msgstr ""
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1775,14 +1718,14 @@
msgstr ""
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
msgstr ""
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
#, fuzzy
msgid ""
"<p>\n"
@@ -1795,14 +1738,14 @@
"okufunayo, kukhethe bese uchofoza u-<b>Susa</b>.</p>"
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
msgstr ""
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1810,7 +1753,7 @@
msgstr ""
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1820,7 +1763,7 @@
msgstr ""
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1829,7 +1772,7 @@
msgstr ""
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -1838,7 +1781,7 @@
msgstr ""
#. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
"Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -1847,7 +1790,7 @@
msgstr ""
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
#, fuzzy
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
@@ -1858,14 +1801,14 @@
" lungisa ukuhlelwa kwawo.<br></p>\n"
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
msgstr ""
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1873,14 +1816,14 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -1888,40 +1831,40 @@
msgstr ""
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
msgstr ""
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr ""
#. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
msgstr ""
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
msgid ""
"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
msgstr ""
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -1930,7 +1873,7 @@
msgstr ""
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -1941,7 +1884,7 @@
msgstr ""
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -1949,14 +1892,14 @@
msgstr ""
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
msgstr ""
#. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -1964,7 +1907,7 @@
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
#, fuzzy
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
@@ -1974,7 +1917,7 @@
"Sebenzisa lesi sikhiye ukuze ulawule izikhiye ze-TSIG.</p>\n"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -1984,7 +1927,7 @@
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
#, fuzzy
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr ""
@@ -1992,40 +1935,40 @@
"okufunayo, kukhethe bese uchofoza u-<b>Susa</b>.</p>"
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>Select the type of declaration to add.</p>"
msgstr ""
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
msgstr ""
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
msgstr ""
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
msgstr ""
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
msgstr ""
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2033,7 +1976,7 @@
msgstr ""
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
msgid ""
"<p>To create a condition class that can be used for\n"
"handling clients differently depending on the class to which they belong,\n"
@@ -2043,24 +1986,24 @@
#. selection box
#. selection box
#. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
#, fuzzy
msgid "A&ddresses"
msgstr "Ikheli Le-IP"
#. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
msgid "The entered address is not valid."
msgstr ""
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
msgid "At least one address must be specified."
msgstr ""
@@ -2070,107 +2013,107 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
#, fuzzy
msgid "&Values"
msgstr "I-value"
#. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
msgid "The entered addresses are not valid."
msgstr ""
#. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
msgid "At least one address pair must be specified."
msgstr ""
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
msgid "On"
msgstr "Vuliwe"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
msgid "Off"
msgstr "Valiwe"
#. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
msgid "A value must be specified."
msgstr ""
#. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
#, fuzzy
msgid "&New Address"
msgstr "Ikheli Le-IP"
#. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
#, fuzzy
msgid "&New Value"
msgstr "I-value"
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
msgid "Separate multiple addresses with spaces."
msgstr ""
#. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
msgid "&Add Address Pair"
msgstr ""
#. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
msgid "The lowest address must be lower than the highest one."
msgstr ""
#. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
msgid "If you change this, also update the syslog configuration."
msgstr ""
#. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
msgid "&Hardware Type"
msgstr ""
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
#, fuzzy
msgid "&MAC Address"
msgstr "Ikheli Le-IP"
#. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
#, fuzzy
msgid "&Lowest IP Address"
msgstr "Ikheli Le-IP"
#. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
#, fuzzy
msgid "&Highest IP Address"
msgstr "Ikheli Le-IP"
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2178,7 +2121,7 @@
msgstr ""
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
#, fuzzy
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
@@ -2189,7 +2132,7 @@
"Qalisa iFayawoli ye-YaST2 bese uyaba.\n"
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
#, fuzzy
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
@@ -2200,8 +2143,8 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
@@ -2209,221 +2152,207 @@
"Lolu hlelo alutholakali ngesikhathi\n"
"sokulungiselelwa ukufaka ngokuzenzakalelayo."
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-#, fuzzy
-msgid "Restart DHCP Server"
-msgstr "Isiphakelalwazi se-DHCP"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server"
-msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
-
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
#, fuzzy
msgid "&Configured Declarations"
msgstr "&Kweqe Ukuhlela"
#. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
msgid "&Dynamic DNS"
msgstr ""
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
#, fuzzy
msgid "Forward Zone TSIG &Key"
msgstr "Izikhiye Ze-TSIG Zamanje"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
#, fuzzy
msgid "Reverse Zone TSIG &Key"
msgstr "Izikhiye Ze-TSIG Zamanje"
#. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
#, fuzzy
msgid "Select File with Authentication Key"
msgstr "Khetha Ifayela Enesikhiye Sokuqinisekisa"
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-#, fuzzy
-msgid "&Start DHCP Server"
-msgstr "Isiphakelalwazi se-DHCP"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
msgid "&Run DHCP Server in Chroot Jail"
msgstr ""
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
msgid "Ad&vanced"
msgstr "Thu&thukisiwe"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
#, fuzzy
msgid "Display &Log"
msgstr "Veza Amaphutha: %1"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
#, fuzzy
msgid "&Interface Configuration"
msgstr "Gcina ukuhlela"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
#, fuzzy
msgid "&Network Address"
msgstr "Ikheli Le-IP"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
#, fuzzy
msgid "Network &Mask"
msgstr "ikhadi lenethiwekhi"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
msgid "Group &Name"
msgstr "Igama &Leqembu"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
msgid "Pool &Name"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
msgid "Shared Network &Name"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
msgid "Class &Name"
msgstr ""
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
#, fuzzy
msgid "Available Interfaces"
msgstr "O&kutholakalayo yilokhu:"
#. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
#, fuzzy
msgid "Open &Firewall for Selected Interfaces"
msgstr "I-port yefayawoli ivuliwe kuma-interface akhethiwe"
#. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
msgid "&Enable Dynamic DNS for This Subnet"
msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
msgid "&Update Global Dynamic DNS Settings"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
msgid "&Zone"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
#, fuzzy
msgid "&Primary DNS Server"
msgstr "Isiphakelalwazi se-DNS"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
msgid "Re&verse Zone"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
#, fuzzy
msgid "Pr&imary DNS Server"
msgstr "Isiphakelalwazi se-DNS"
#. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
#, fuzzy
msgid "DHCP Server &Expert Configuration..."
msgstr "Igcina ukuhlelwa kwe-proxy..."
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
#, fuzzy
msgid "Initializing DHCP Server Configuration"
msgstr "Ilungiselela Ukuqala Ukuhlela IFayawoli"
#. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
msgid "Check the environment"
msgstr "Hlola isimo"
#. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
#, fuzzy
msgid "Read firewall settings"
msgstr "Bhala amasethingi efayawoli"
#. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
msgid "Read DHCP server settings"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
msgid "Read DNS server settings"
msgstr ""
#. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
#, fuzzy
msgid "Checking the environment..."
msgstr "Hlola isimo"
#. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
#, fuzzy
msgid "Reading firewall settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
#, fuzzy
msgid "Reading DHCP server settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
#, fuzzy
msgid "Reading DNS server settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
msgid "Finished"
msgstr "Iphothulile"
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2434,109 +2363,109 @@
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:1475
+#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
msgstr ""
#. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
msgstr ""
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
#, fuzzy
msgid "Saving DHCP Server Configuration"
msgstr "Igcina ukuhlelwa kwenethiwekhi..."
#. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
#, fuzzy
msgid "Write DHCP server settings"
msgstr "Bhala amasethingi efayawoli"
#. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
msgid "Write firewall settings"
msgstr "Bhala amasethingi efayawoli"
#. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
#, fuzzy
msgid "Restart DHCP server"
msgstr "Isiphakelalwazi se-DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
#, fuzzy
msgid "Write DNS server settings"
msgstr "Bhala amasethingi efayawoli"
#. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
#, fuzzy
msgid "Writing DHCP server settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
msgid "Writing firewall settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
#, fuzzy
msgid "Restarting DHCP server..."
msgstr "Ifaka i-driver..."
#. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
#, fuzzy
msgid "Writing DNS server settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
#, fuzzy
msgid "Error occurred while restarting the DHCP daemon."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
msgid "The DHCP server is started at boot time"
msgstr ""
#. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
msgid "The DHCP server is not started at boot time"
msgstr ""
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
msgid "Listen On: %1"
msgstr ""
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
msgid "Dynamic Address Range: %1"
msgstr ""
#. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
#, fuzzy
msgid "DHCP service DN is not defined."
msgstr "Idivayisi ayihleliwe"
@@ -2545,26 +2474,80 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#: src/modules/DhcpServer.pm:2754
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
#, fuzzy
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
#, fuzzy
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
+
+#, fuzzy
+#~ msgid "DHCP server is running"
+#~ msgstr "Isevisi imatasa"
+
+#, fuzzy
+#~ msgid "DHCP server is not running"
+#~ msgstr "Isevisi ayisebenzi"
+
+#, fuzzy
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "&Qala Isevisi Manje"
+
+#, fuzzy
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "M&isa Isevisi Manje"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
+
+#, fuzzy
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "Qala Isevisi Manje"
+
+#, fuzzy
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "Misa Isevisi Manje"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Ukuqala Kwesevisi</big></b><br>\n"
+#~ "Ukuqala isevisi ngaso sonke isikhathi ikhompuyutha yakho iqaliswa kabusha, isethwa\n"
+#~ " <b>%1</b>. Ngale kwalokho setha <b>%2</b>.</p>"
+
+#, fuzzy
+#~ msgid "Restart DHCP Server"
+#~ msgstr "Isiphakelalwazi se-DHCP"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "Gcina Izinguquko Bese Uqala Kabusha Isevisi Manje"
+
+#, fuzzy
+#~ msgid "&Start DHCP Server"
+#~ msgstr "Isiphakelalwazi se-DHCP"
Modified: trunk/yast/zu/po/dns-server.zu.po
===================================================================
--- trunk/yast/zu/po/dns-server.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/dns-server.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -312,8 +312,7 @@
#. TRANSLATORS: commandline error message
#. Both Add and Remove defined => Error!
#: 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:999 src/include/dns-server/cmdline.rb:1049
#: src/include/dns-server/cmdline.rb:1108
#: src/include/dns-server/cmdline.rb:1244
#: src/include/dns-server/cmdline.rb:1303
@@ -386,11 +385,10 @@
#. Table header item - ACL-options
#. Table menu item - Records listing
#: 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:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
msgid "Value"
msgstr "I-value"
@@ -408,7 +406,7 @@
#. TRANSLATORS: commandline table header item
#. Textentry - DNS adding zone - Name
#: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
msgid "Name"
msgstr "Igama"
@@ -418,9 +416,9 @@
#. Table header item - DNS listing zones
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
msgid "Type"
msgstr "Uhlobo"
@@ -434,8 +432,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
#: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
msgid "Forwarders"
msgstr ""
@@ -465,12 +463,11 @@
#. TRANSLATORS: commandline table header item
#. TRANSLATORS: commandline table header item
#. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: 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:1905
+#: src/include/dns-server/dialog-main.rb:1639
msgid "Zone"
msgstr "Izoni"
@@ -502,14 +499,14 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
msgid "Mail Server"
msgstr "Isiphakelalwazi seMeyili"
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
msgid "Priority"
msgstr ""
@@ -576,8 +573,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:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
msgid "DNS Zones"
msgstr ""
@@ -600,7 +597,7 @@
#. check box
#. TRANSLATORS: checkbox label, turning LDAP support on or off
#: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
msgid "&LDAP Support Active"
msgstr "&Usizo Lwe-LDAP Luyasebenza"
@@ -627,143 +624,95 @@
msgstr "Igcina ukuhlelwa kwe-proxy..."
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
msgid "DNS Server"
msgstr "Isiphakelalwazi se-DNS"
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#, fuzzy
-#| msgid "Drop Changes"
-msgid "Apply Changes"
-msgstr "Yeka Ukwenza Izinguquko"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-#, fuzzy
-msgid "Start-Up"
-msgstr "Qalisa &Vuselela"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-#, fuzzy
-msgid "Basic Options"
-msgstr "&Ongakhetha kukho"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "Ukuloga"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: 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"
-msgstr ""
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-#, fuzzy
-msgid "TSIG Keys"
-msgstr "Izikhiye Ze-TSIG Zamanje"
-
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
msgid "Local DNS Resolution &Policy"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
msgid "Merging forwarders is disabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
msgid "Automatic merging"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
msgid "Merging forwarders is enabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
#, fuzzy
msgid "Custom configuration"
msgstr "Gcina ukuhlela"
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
#, fuzzy
msgid "Custom policy"
msgstr "Ukulungisa Okuvunyelaniswe Nezidingo"
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
msgid "Local DNS Resolution &Forwarder"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
#, fuzzy
msgid "Using system name servers"
msgstr "Isiphakelalwazi seMeyili"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
msgid "This name server (bind)"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
msgid "Local dnsmasq server"
msgstr ""
#. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
#, fuzzy
msgid "Add IP Address"
msgstr "Ikheli Le-IP"
#. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
#, fuzzy
msgid "IPv4 or IPv6 A&ddress"
msgstr "Ikheli le-IPv4 noma i-IPv6"
#. Selectionbox for listing current DNS-Forwarders
#. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
msgid "Forwarder &List"
msgstr ""
#. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
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:877
+#: src/include/dns-server/dialog-main.rb:611
#, fuzzy
#| msgid "Cannot create account for user %1."
msgid "Cannot find local equivalent for IP %1."
msgstr "Ayikwazi ukwakha i-akhawunti yomsebenzisi %1."
#. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
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"
@@ -771,12 +720,12 @@
msgstr ""
#. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
#, fuzzy
msgid "Invalid IPv4 or IPv6 address."
msgstr "Alikho ikheli le-IP elemukelekile"
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
#, fuzzy
msgid ""
"A valid IPv6 address consists of letters a-f, numbers,\n"
@@ -786,51 +735,51 @@
"ezisukela ku-0-255 ezihlukaniswe ngamachashaza."
#. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
#, fuzzy
msgid "The specified forwarder is already present."
msgstr "Okukhethiwe sekukhona kakade."
#. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
msgid "Add or Change Option"
msgstr ""
#. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
#, fuzzy
msgid "O&ption"
msgstr "Ongakhetha kukho"
#. Textentry for setting the basic-option value
#. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
#, fuzzy
msgid "&Value"
msgstr "I-value"
#. Pushbutton for changing the basic-option
#. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
#, fuzzy
msgid "C&hange"
msgstr "S&hintsha..."
#. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
#, fuzzy
msgid "Current Options"
msgstr "Okukhethwe Njengamanje:"
#. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
msgid "Option"
msgstr "Ongakhetha kukho"
#. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
#, fuzzy
msgid ""
"Really set this\n"
@@ -838,7 +787,7 @@
msgstr "Ngempela ufuna ukusetha kabusha yonke into ibuyele kuma-value ohlelo (default values)?"
#. 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:1173
+#: src/include/dns-server/dialog-main.rb:907
#, fuzzy
msgid ""
"Option %1 can only have a yes or no value set.\n"
@@ -846,123 +795,123 @@
msgstr "Okukhethiwe i-'%1' akukwazi ukuba ne-value. I-value enikeziwe: %2"
#. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1190
+#: src/include/dns-server/dialog-main.rb:924
msgid ""
"Option %1 can only be a number.\n"
"Really set it to %2?\n"
msgstr ""
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
msgid ""
"Quotes are not used correctly in this option.\n"
"Really set it to %1?\n"
msgstr ""
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
msgid ""
"Brackets are not used correctly in this option.\n"
"Really set it to %1?\n"
msgstr ""
#. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
msgid ""
"Option %1 should be set only once.\n"
"Really add another one?\n"
msgstr ""
#. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
msgid "Log Type"
msgstr ""
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
#, fuzzy
msgid "&System Log"
msgstr "Ukuhlola Kwesistimu"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
#, fuzzy
msgid "&File"
msgstr "&Igama lefayela"
#. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
msgid "Maximum &Size (MB)"
msgstr ""
#. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
msgid "Maximum &Versions"
msgstr ""
#. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
msgid "Additional Logging"
msgstr ""
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
msgid "Log All DNS &Queries"
msgstr ""
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
#, fuzzy
msgid "Log Zone &Updates"
msgstr "Ukuvuselela Amafayela Kwi-Inthanethi"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
msgid "Log Zone &Transfers"
msgstr ""
#. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
msgid "Select File for Log"
msgstr ""
#. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
#, fuzzy
msgid "Option Setup"
msgstr "Ongakhetha kukho"
#. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
msgid "&Name"
msgstr "&Igama"
#. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
#, fuzzy
msgid "Current ACL List"
msgstr "Izikhiye Ze-TSIG Zamanje"
#. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
msgid "ACL"
msgstr ""
#. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
msgid ""
"This ACL is used by %1 zones.\n"
"Really remove it?\n"
msgstr ""
#. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
#, fuzzy
msgid "The specified ACL entry already exists."
msgstr "Ifayela ebonisiwe ayikho."
#. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
#, fuzzy
msgid "Add New Zone "
msgstr "Nezela Okusha Okukhethayo"
@@ -972,8 +921,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:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
msgid "Master"
msgstr "I-master"
@@ -983,9 +932,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:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
msgid "Slave"
msgstr ""
@@ -994,19 +943,19 @@
#. TRANSLATORS: Table item - Server type
#. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-#
#. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
msgid "Forward"
msgstr ""
#. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
#, fuzzy
msgid "Configured DNS Zones"
msgstr "Hlela &Ama-Disk e-DASD"
#. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
#, fuzzy
msgid "A zone with the specified name is already configured."
msgstr ""
@@ -1015,99 +964,147 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
msgid "Saving the configuration failed. Change the settings?"
msgstr ""
#. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
+#: src/include/dns-server/dialog-main.rb:1903
#, fuzzy
msgid "Saving the configuration failed"
msgstr "Gcina ukuhlela"
#. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
msgid ""
"All changes will be lost.\n"
"Really leave the DNS server configuration without saving?"
msgstr ""
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+#, fuzzy
+#| msgid "Drop Changes"
+msgid "Apply Changes"
+msgstr "Yeka Ukwenza Izinguquko"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+#, fuzzy
+msgid "Start-Up"
+msgstr "Qalisa &Vuselela"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+#, fuzzy
+msgid "Basic Options"
+msgstr "&Ongakhetha kukho"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "Ukuloga"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr ""
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+#, fuzzy
+msgid "TSIG Keys"
+msgstr "Izikhiye Ze-TSIG Zamanje"
+
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
msgid "A&llow Dynamic Updates"
msgstr ""
#. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
#, fuzzy
msgid "TSIG &Key"
msgstr "Izikhiye Ze-TSIG Zamanje"
#. check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
msgid "Enable &Zone Transport"
msgstr ""
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
#, fuzzy
msgid "A&utomatically Generate Records From"
msgstr "&Buyisa I-DNS Ngokuzenzakalelayo"
#. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
#, fuzzy
msgid "Zon&e"
msgstr "Izoni"
#. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
#, fuzzy
msgid "Connected Reverse Zones"
msgstr "Ama-Target Axhunyiwe"
#. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
msgid ""
"This function is not available during\n"
"preparation for autoinstallation.\n"
msgstr ""
#. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
#, fuzzy
msgid "No TSIG key is defined."
msgstr "Awukho umthombo wephakheji ochaziwe."
#. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
msgid "&Name Server to Add"
msgstr ""
#. Selectionbox - listing current nameservers
#. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
#, fuzzy
msgid "Na&me Server List"
msgstr "&Iziphakelalwazi Ze-NFS"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
#, fuzzy
msgid "The specified name server already exists."
msgstr "Ifayela ebonisiwe ayikho."
#. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
#, fuzzy
msgid "Mail Server to Add"
msgstr "Isiphakelalwazi seMeyili"
#. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
#, fuzzy
msgid "&Address"
msgstr "Ikheli Le-IP"
@@ -1116,119 +1113,119 @@
#. IntField - zone settings - Record Value
#. IntField - zone settings - Record Value
#. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
#: src/include/dns-server/options.rb:435
msgid "&Priority"
msgstr ""
#. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
msgid "Mail Relay List"
msgstr ""
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
msgid "The specified value is not a valid hostname or IP address."
msgstr ""
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
#, fuzzy
msgid "The specified mail server already exists."
msgstr "Ifayela ebonisiwe ayikho."
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
msgid "Seconds"
msgstr "Imizuzwana"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
msgid "Minutes"
msgstr "Imizuzu"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
msgid "Hours"
msgstr "Amahora"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
msgid "Days"
msgstr "Izinsuku"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
msgid "Weeks"
msgstr ""
#. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
msgid "Seri&al"
msgstr ""
#. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
msgid "TT&L"
msgstr ""
#. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
msgid "&Unit"
msgstr "I&Yunithi"
#. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
#, fuzzy
msgid "Re&fresh"
msgstr "&Vuselela kabusha"
#. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
msgid "Un&it"
msgstr ""
#. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
msgid "Retr&y"
msgstr "Phind'&uzame"
#. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
#, fuzzy
msgid "Ex&piration"
msgstr "&Kweqe Ukuhlela"
#. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
msgid "U&nit"
msgstr ""
#. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
msgid "&Minimum"
msgstr "&Isibalo Esiphansi Esivumelekile"
#. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
msgid "Uni&t"
msgstr ""
#. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
msgid "The serial number of the zone must be specified."
msgstr ""
#. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
msgid "The serial number must be no more than %1 digits long."
msgstr ""
#. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
msgid ""
"The expiration time-out is higher than the time period\n"
"of zone refreshes. The zone will not be reachable\n"
@@ -1239,106 +1236,106 @@
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
msgid "&Record Key"
msgstr ""
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
msgid "T&ype"
msgstr ""
#. Textentry - zone settings - Record Value
#. IntField - zone settings - Record Value
#. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
msgid "Val&ue"
msgstr ""
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
msgid "&Service"
msgstr "&Isevisi"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
msgid "&Protocol"
msgstr "&Iphrothokholi"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
msgid "&Weight"
msgstr ""
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
msgid "&Port"
msgstr "&I-Port"
#. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
msgid "A: IPv4 Domain Name Translation"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
msgid "AAAA: IPv6 Domain Name Translation"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
msgid "CNAME: Alias for Domain Name"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
#, fuzzy
msgid "NS: Name Server"
msgstr "Isiphakelalwazi se-Samba"
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
msgid "MX: Mail Relay"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
msgid "PTR: Reverse Translation"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
#, fuzzy
msgid "SRV: Services Record"
msgstr "Amasevisi e-RPC"
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
msgid "TXT: Text Record"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
msgid "SPF: Sender Policy Framework"
msgstr ""
#. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
msgid "Record Settings"
msgstr ""
#. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
msgid "Configured Resource Records"
msgstr ""
#. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
msgid "Record Key"
msgstr ""
#. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
msgid ""
"Invalid IPv6 reverse IP.\n"
"\n"
@@ -1347,14 +1344,14 @@
msgstr ""
#. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
#, fuzzy
msgid "Invalid IPv6 address."
msgstr "Alikho ikheli le-IP elemukelekile"
#. TRANSLATORS: Error message
#. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
msgid ""
"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
"and must be at least one character long."
@@ -1364,79 +1361,73 @@
#. %{type} - replaced with record type (TXT or SPF)
#. %{max} - replaced with the maximal length
#. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
msgid ""
"Maximal length of a %{type} record is %{max} characters.\n"
"This message is %{current} characters long."
msgstr ""
#. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
msgid "CNAME cannot point to itself."
msgstr ""
#. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
msgid "An internal error has occurred."
msgstr ""
#. Dialog Caption - Expert Settings - Zone Editor
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
msgid "Zone Editor"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
msgid "&Basics"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
msgid "NS Recor&ds"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
msgid "&SOA"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
msgid "R&ecords"
msgstr ""
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
msgid "M&X Records"
msgstr ""
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
msgid "Settings for Zone"
msgstr ""
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "Thu&thukisiwe"
-
#. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
#, fuzzy
msgid "At least one NS server must be set."
msgstr "Okungenani okukodwa kwe-%1 kumelwe kusethwe."
@@ -1445,25 +1436,25 @@
#.
#. Automatically Generate Records From is a feature that makes YaST to generate
#. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
msgid ""
"Current zone records are automatically generated from %1 zone.\n"
"To change records manually disable the Automatically Generate Records From feature."
msgstr ""
#. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
#, fuzzy
msgid "&Master DNS Server IP"
msgstr "Isiphakelalwazi se-DNS"
#. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
msgid "Missing Master Server"
msgstr ""
#. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
msgid ""
"Every slave zone must have its master server IP defined.\n"
"Configuration of a DNS server without a master server would fail.\n"
@@ -1471,33 +1462,33 @@
msgstr ""
#. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
#, fuzzy
msgid "No master DNS server defined."
msgstr "Awukho umthombo wephakheji ochaziwe."
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
msgid "The specified master name server is not a valid IP address."
msgstr ""
#. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
msgid "New &Forwarder IP Address"
msgstr ""
#. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
msgid "Current &Zone Forwarders"
msgstr ""
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
msgid "Forward Zone Editor"
msgstr ""
#. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
msgid ""
"This forward zone has no forwarders defined, which means\n"
"that all DNS queries for this zone are denied.\n"
@@ -2363,62 +2354,62 @@
msgstr ""
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
#, fuzzy
msgid "Initializing DNS Server Configuration"
msgstr "Ilungiselela Ukuqala Ukuhlela IFayawoli"
#. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
msgid "Check the environment"
msgstr "Hlola isimo"
#. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
msgid "Flush caches of the DNS daemon"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
#, fuzzy
msgid "Read the firewall settings"
msgstr "Bhala amasethingi efayawoli"
#. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
#, fuzzy
msgid "Read the settings"
msgstr "Ayikwazi ukufunda amasethingi amanje."
#. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
#, fuzzy
msgid "Checking the environment..."
msgstr "Hlola isimo"
#. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
msgid "Flushing caches of the DNS daemon..."
msgstr ""
#. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
#, fuzzy
msgid "Reading the firewall settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
#, fuzzy
msgid "Reading the settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
msgid "Finished"
msgstr "Iphothulile"
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
#, fuzzy
msgid ""
"Error occurred while calling netconfig.\n"
@@ -2426,81 +2417,81 @@
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
#, fuzzy
msgid "Saving DNS Server Configuration"
msgstr "Igcina ukuhlelwa kwenethiwekhi..."
#. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
#, fuzzy
msgid "Save configuration files"
msgstr "Gcina ukuhlela"
#. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
msgid "Restart the DNS daemon"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
msgid "Update zone files"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
#, fuzzy
msgid "Adjust the DNS service"
msgstr "Lungisa isevisi yefayawoli"
#. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
msgid "Call netconfig"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
#, fuzzy
msgid "Write the firewall settings"
msgstr "Bhala amasethingi efayawoli"
#. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
#, fuzzy
msgid "Saving configuration files..."
msgstr "Igcina ukuhlelwa kwe-proxy..."
#. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
msgid "Restarting the DNS daemon..."
msgstr ""
#. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
#, fuzzy
msgid "Updating zone files..."
msgstr "Ivuselela imoduli yeqoqo lezinqubo ezibalulekile eziyisidingo..."
#. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
#, fuzzy
msgid "Adjusting the DNS service..."
msgstr "Ilungisa isevisi yefayawoli..."
#. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
#, fuzzy
msgid "Calling netconfig..."
msgstr "Iqalisa i-SuSEconfig..."
#. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
#, fuzzy
msgid "Writing the firewall settings..."
msgstr "Ibhala amasethingi efayawoli..."
#. Cannot start service 'named', because of error that follows Error:. Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
#, fuzzy
msgid ""
"Error occurred while starting service named.\n"
@@ -2508,47 +2499,47 @@
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
msgid "Stub"
msgstr ""
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
msgid "Hint"
msgstr ""
#. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
#, fuzzy
#| msgid "The NTP daemon starts when starting the system."
msgid "The DNS server starts when booting the system."
msgstr "I-daemon ye-NTP iqala lapho uqalisa isistimu."
#. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
#, fuzzy
#| msgid "The NTP daemon starts when starting the system."
msgid "The DNS server does not start when booting the system."
msgstr "I-daemon ye-NTP iqala lapho uqalisa isistimu."
#. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
#, fuzzy, perl-format
msgid "Configured Zones: %s"
msgstr "Hlela &Ama-Disk e-ZFCP"
#. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
#. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
msgid "Enable LDAP support?"
msgstr ""
#. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
#, fuzzy
msgid ""
"Installation of required packages failed.\n"
@@ -2556,34 +2547,37 @@
msgstr "Ukufaka amaphakheji adingekayo kuhlulekile."
#. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
msgid "Unknown LDAP initialization error."
msgstr ""
#. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
#, fuzzy
msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
#, fuzzy
msgid "Error occurred while creating %1. Not using LDAP."
msgstr "Kwenzeke iphutha ngesikhathi ifunda ilogi."
+#~ msgid "Ad&vanced"
+#~ msgstr "Thu&thukisiwe"
+
#~ msgid "When &Booting"
#~ msgstr "Lapho &Uqalisa Uhlelo"
Modified: trunk/yast/zu/po/docker.zu.po
===================================================================
--- trunk/yast/zu/po/docker.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/docker.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -15,6 +15,120 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid " Container"
+msgid "Changes in Container"
+msgstr "Isiqukathi"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "Isimo"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+msgid "&Exit"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid " Container"
+msgid "Commit Container"
+msgstr "Isiqukathi"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+#, fuzzy
+#| msgid "Package Repository"
+msgid "Repository"
+msgstr "Okokugcina Iphakheji"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+#, fuzzy
+#| msgid "Tab"
+msgid "Tag"
+msgstr "I-Tab"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Terminals"
+msgid "Inject Shell"
+msgstr "Amatheminali"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
#. 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."
@@ -80,18 +194,6 @@
msgid "Running Docker Containers"
msgstr "Ihlola Ukusebenza Kokuxhumana Kwe-Inthanethi"
-#: src/lib/ydocker/main_dialog.rb:217
-#, fuzzy
-#| msgid "Package Repository"
-msgid "Repository"
-msgstr "Okokugcina Iphakheji"
-
-#: src/lib/ydocker/main_dialog.rb:218
-#, fuzzy
-#| msgid "Tab"
-msgid "Tag"
-msgstr "I-Tab"
-
#: src/lib/ydocker/main_dialog.rb:219
#, fuzzy
#| msgid "Image"
@@ -120,17 +222,13 @@
msgid "Image"
msgstr "Umfanekiso"
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
#, fuzzy
#| msgid "Commands:"
msgid "Command"
msgstr "Amakhomandi:"
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "Isimo"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
#, fuzzy
#| msgid "Port"
msgid "Ports"
@@ -180,12 +278,65 @@
msgid "&Commit"
msgstr "Phawula"
-#: src/lib/ydocker/main_dialog.rb:304
-msgid "&Exit"
-msgstr ""
-
#: src/lib/ydocker/main_dialog.rb:315
#, fuzzy
#| msgid "Do you really want to delete partition %1?"
msgid "Do you really want to delete image \"%s\"?"
msgstr "Ingabe ngempela ufuna ukususa iphathishini %1?"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid " Container"
+msgid "Run Container"
+msgstr "Isiqukathi"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid " Container"
+msgid "Container"
+msgstr "Isiqukathi"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""
Modified: trunk/yast/zu/po/drbd.zu.po
===================================================================
--- trunk/yast/zu/po/drbd.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/drbd.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -243,7 +243,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
#, fuzzy
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>Ukuhlelwa Kokuxhumana</big></b></p>"
@@ -258,15 +258,16 @@
msgid ""
"\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>\"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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. 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"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -292,13 +293,13 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:112
+#: src/include/drbd/helps.rb:113
#, fuzzy
#| msgid "<p><b><big>Connection Configuration</big></b></p>"
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr "<p><b><big>Ukuhlelwa Kokuxhumana</big></b></p>"
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -307,21 +308,23 @@
"\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"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
"\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
+"\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
#, fuzzy
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>Ukuhlelwa Kokuxhumana</big></b></p>"
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr ""
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
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"
@@ -331,7 +334,7 @@
" set it to 0 to disable redrawing completely. </p>"
msgstr ""
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -341,7 +344,7 @@
msgstr ""
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
@@ -351,7 +354,7 @@
"Misa i-kdump manje.<br></p>\n"
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
#, fuzzy
#| msgid ""
#| "<p><b><big>Adding a Kdump:</big></b><br>\n"
@@ -370,7 +373,7 @@
"Bese ucindezela okuthi <b>Misa</b>.</p>\n"
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
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"
@@ -381,7 +384,7 @@
" ukuhlela iyavuleka.</p>\n"
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
@@ -393,7 +396,7 @@
"hlela umiso lwawo.<br></p>\n"
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
#, fuzzy
#| msgid ""
#| "<p><b><big>Adding a Kdump:</big></b><br>\n"
@@ -406,7 +409,7 @@
"Cindezela okuthi <b>Yengeza</b> ukumisa i-kdump.</p>"
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
#, fuzzy
#| msgid ""
#| "<p><b><big>Editing or Deleting:</big></b><br>\n"
@@ -422,7 +425,7 @@
"Bese ucindezela <b>Hlela</b> noma <b>Sula</b> njengoba uthanda.</p>\n"
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -434,7 +437,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -445,7 +448,7 @@
" </p>"
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -456,60 +459,138 @@
" <br></p>\n"
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
#, fuzzy
msgid "LVM Filter Configuration of DRBD"
msgstr "Ukuhlelwa Kwe-Global"
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
#, fuzzy
#| msgid "Device type"
msgid "Device Filter"
msgstr "Uhlobo lwedivayisi"
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
#, fuzzy
#| msgid "Writing the SCPM database..."
msgid "Writing the LVM cache"
msgstr "Ibhala isizinda sokwaziswa se-SCPM..."
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
#, fuzzy
#| msgid "Enable Microphone."
msgid "Enable LVM Cache"
msgstr "Vula Umbhobho."
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning! Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning! Should not use lvmetad for cluster."
+msgstr ""
+
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:144
#, fuzzy
msgid "Resource Name"
msgstr "Imithombo yokwaziswa"
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:151
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:156
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:188
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:336
msgid "Protocol"
msgstr "Iphrothokholi"
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:560
+msgid "OK"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:561
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:575
#, fuzzy
#| msgid "Scheme name must be set."
-msgid "Node names must be different."
+msgid "Node name can not be empty."
msgstr "Igama lohlelo kumelwe lisethwe."
-#: src/include/drbd/resource_conf.rb:578
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:719
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:739
msgid "Please fill out all fields."
msgstr ""
+#: src/include/drbd/resource_conf.rb:754
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:789
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:795
+#, fuzzy
+#| msgid "Scheme name must be set."
+msgid "Node name must be different."
+msgstr "Igama lohlelo kumelwe lisethwe."
+
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar <mlazar(a)suse.cz>
@@ -622,83 +703,83 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:114
msgid "Failed to merge separated DRBD conf files\n"
msgstr ""
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:136
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr ""
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:191
#, fuzzy
msgid "Initializing DRBD Configuration"
msgstr "Ilungiselela Ukuqalisa i-DSL"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:199
#, fuzzy
msgid "Read global settings"
msgstr "Funda amasethingi embulunga yonke e-Samba"
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:200
#, fuzzy
msgid "Read resources"
msgstr "Funda amaqembu emithombo yokwaziswa"
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:201
#, fuzzy
#| msgid "LVM configuration"
msgid "Read LVM configurations"
msgstr "Ukuhlelwa kwe-LVM"
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:202
#, fuzzy
msgid "Read daemon status"
msgstr "Funda isimo se-windbind"
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
#, fuzzy
#| msgid "Read firewall settings"
msgid "Read SuSEFirewall Settings"
msgstr "Funda amasethingi esihenqo sokuvikela (firewall)"
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:206
#, fuzzy
msgid "Reading global settings..."
msgstr "Ifunda amasethingi embulunga yonke e-Samba..."
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:207
#, fuzzy
msgid "Reading resources..."
msgstr "Ifunda amaqembu emithombo yokwaziswa..."
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:208
#, fuzzy
#| msgid "Reading the configuration..."
msgid "Reading LVM configurations..."
msgstr "Ifunda ukuhlelwa kohlelo..."
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:209
#, fuzzy
msgid "Reading daemon status..."
msgstr "Ifunda isimo se-windbind..."
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
msgid "Finished"
msgstr "Iphothulile"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:514
msgid "Failed to backup drbd.conf"
msgstr ""
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:523
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr ""
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:547
#, fuzzy
#| msgid "Configuration of Resource Groups"
msgid ""
@@ -706,12 +787,12 @@
"%2"
msgstr "Ukuhlelwa Kwamaqembu Emithombo Yokwaziswa"
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:566
msgid "Failed to bring drbd.conf back"
msgstr ""
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:637
#, fuzzy
msgid "Writing DRBD Configuration"
msgstr "Ibhala Ukuhlelwa Kwe-NFS"
@@ -720,59 +801,59 @@
#. 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:617
+#: src/modules/Drbd.rb:649
msgid "Write global settings"
msgstr "Bhala amasethingi omhlaba wonke"
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:650
#, fuzzy
msgid "Write resources"
msgstr "Bhala amaqembu emithombo yokwaziswa"
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:651
#, fuzzy
#| msgid "Write configuration"
msgid "Write LVM configurations"
msgstr "Bhala ukuhlelwa"
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:652
#, fuzzy
msgid "Set daemon status"
msgstr "Thungatha isimo samanje"
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:653
#, fuzzy
#| msgid "Write firewall settings"
msgid "Write the SuSEfirewall settings"
msgstr "Bhala amasethingi efayawoli"
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:656
msgid "Writing global settings..."
msgstr "Ibhala amasethingi omhlaba wonke..."
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:657
#, fuzzy
msgid "Writing resources..."
msgstr "Ibhala amaqembu emithombo yokwaziswa..."
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:658
#, fuzzy
#| msgid "Writing configuration..."
msgid "Writing LVM configurations..."
msgstr "Ibhala ukuhlelwa..."
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:659
#, fuzzy
msgid "Setting daemon status..."
msgstr "Ithungatha isimo samanje..."
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:660
#, fuzzy
#| msgid "Writing firewall settings..."
msgid "Writing the SuSEFirewall settings"
msgstr "Ibhala amasethingi efayawoli..."
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:671
#, fuzzy
#| msgid "Unable to create directory '%1'."
msgid "Failed to make directory /etc/drbd.d"
Modified: trunk/yast/zu/po/fcoe-client.zu.po
===================================================================
--- trunk/yast/zu/po/fcoe-client.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/fcoe-client.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -611,39 +611,39 @@
msgstr "<p>Yakhe manje?</p>"
#. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
msgid "Cannot start service 'lldpad'"
msgstr ""
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
#, fuzzy
#| msgid "Cannot detect devices."
msgid "Cannot start service 'fcoe'"
msgstr "Ayikwazi ukuthungatha amadivayisi."
#. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
msgid "Cannot start lldpad systemd socket"
msgstr ""
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
#, fuzzy
#| msgid "Cannot start winbind service."
msgid "Cannot start lldpad service."
msgstr "Ayikwazi ukuqalisa isevisi ye-windbind."
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
msgid "Cannot start fcoemon systemd socket."
msgstr ""
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
#, fuzzy
#| msgid "Cannot start '%1' service"
msgid "Cannot start fcoe service."
msgstr "Ayikwazi ukuqala '%1' isevisi"
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -651,59 +651,59 @@
msgstr ""
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
#, fuzzy
#| msgid "Initializing inetd Configuration"
msgid "Initializing fcoe-client Configuration"
msgstr "Ilungiselela Ukuqalisa Ukuhlela i-inetd"
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
msgid "Check installed packages"
msgstr "Hlola amaphakheji afakiwe"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
#, fuzzy
#| msgid "Network services"
msgid "Check services"
msgstr "Amasevisi enethiwekhi"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
#, fuzzy
#| msgid "Detecting network cards..."
msgid "Detect network cards"
msgstr "Isafuna amakhadi enethiwekhi..."
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
#, fuzzy
#| msgid "Read /etc/ipsec.conf"
msgid "Read /etc/fcoe/config"
msgstr "Funda i-/etc/ipsec.conf"
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
#, fuzzy
#| msgid "Checking for installed RPM packages..."
msgid "Checking for installed packages..."
msgstr "Ihlola amaphakheji eRPM afakiwe..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
#, fuzzy
#| msgid "Checking for network devices..."
msgid "Checking for services..."
msgstr "Ihlola amadivayisi enethiwekhi..."
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
msgid "Detecting network cards..."
msgstr "Isafuna amakhadi enethiwekhi..."
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
#, fuzzy
#| msgid "Reading /etc/modprobe.conf..."
msgid "Reading /etc/fcoe/config"
@@ -711,123 +711,123 @@
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
msgid "Finished"
msgstr "Iphothulile"
#. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "Starting of services failed."
msgstr "Ukuqalisa isevisi ye-'lirc' akuphumelelanga."
#. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
msgid "Cannot detect devices."
msgstr "Ayikwazi ukuthungatha amadivayisi."
#. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
#, fuzzy
#| msgid "Cannot read the configuration."
msgid "Cannot read /etc/fcoe/config."
msgstr "Ayikwazi ukufunda umiso."
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
#, fuzzy
#| msgid "Saving inetd Configuration"
msgid "Saving fcoe-client Configuration"
msgstr "Igcina Ukuhlelwa kwe-inetd"
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
msgid "Write the settings"
msgstr "Bhala amasethingi"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
#, fuzzy
#| msgid "Restart the service"
msgid "Restart FCoE service"
msgstr "Qala kabusha isevisi"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
#, fuzzy
#| msgid "Adjust spooler services"
msgid "Adjust start of services"
msgstr "Lungisa amasevisi e-spooler"
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
msgid "Writing the settings..."
msgstr "Ibhala amasethingi..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
#, fuzzy
#| msgid "Restarting service..."
msgid "Restarting FCoE service..."
msgstr "Iqala kabusha isevisi..."
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
#, fuzzy
#| msgid "Adjusting spooler services..."
msgid "Adjusting start of services..."
msgstr "Ilungisa amasevisi e-spooler..."
#. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
#, fuzzy
#| msgid "Cannot write settings to /etc/samba/smb.conf."
msgid "Cannot write settings to /etc/fcoe/config."
msgstr "Ayikwazi ukubhala amasethingi ku-/etc/samba/smb.conf."
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "Restarting of service fcoe failed."
msgstr "Ukuqalisa isevisi ye-'lirc' akuphumelelanga."
#. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
#, fuzzy
#| msgid "Cannot write sysconfig variables."
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr "Ayikwazi ukubhala ama-variable e-sysconfig."
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
#, fuzzy
#| msgid "<p><b><big>Connection Configuration</big></b></p>"
msgid "<b>General FCoE configuration</b>"
msgstr "<p><b><big>Ukuhlelwa Kokuxhumana</big></b></p>"
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
#, fuzzy
#| msgid "Interfaces"
msgid "<b>Interfaces</b>"
msgstr "Ama-Interface"
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
msgid "<i>Netcard</i>:"
msgstr ""
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "<b>Starting of services</b>"
@@ -835,11 +835,11 @@
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
msgid "enabled"
msgstr "kuvuliwe"
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
msgid "disabled"
msgstr "kucishiwe"
Modified: trunk/yast/zu/po/firewall.zu.po
===================================================================
--- trunk/yast/zu/po/firewall.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/firewall.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:28\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -14,6 +14,16 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
#. TRANSLATORS: message popup
#: src/clients/firewall_proposal.rb:113
msgid ""
@@ -176,7 +186,7 @@
#. TRANSLATORS: tree menu item
#: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
#: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
msgid "Logging Level"
msgstr "Izinga Lokuloga"
@@ -674,7 +684,7 @@
#: src/include/firewall/subdialogs.rb:349
#: src/include/firewall/subdialogs.rb:509
#: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
msgid "Source Network"
msgstr "Inethiwekhi Ewumthombo"
@@ -685,8 +695,8 @@
#: src/include/firewall/subdialogs.rb:351
#: src/include/firewall/subdialogs.rb:511
#: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
msgid "Protocol"
msgstr "Iphrothokholi"
@@ -740,28 +750,28 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
msgid "Req. IP"
msgstr "Cel. IP"
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
msgid "Req. Port"
msgstr "Cel. I-Port"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
msgid "Redir. to IP"
msgstr "Yiqond. kwi-IP"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
msgid "Redir. to Port"
msgstr "Yiqond. kwi-Port"
@@ -886,10 +896,10 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
msgid "Zone"
msgstr "Izoni"
@@ -1411,219 +1421,221 @@
msgstr "Khetha into ofuna ukuyisusa."
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
msgid "Firewall configuration"
msgstr "Ukuhlelwa kwe-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
msgid "Start-up settings"
msgstr "Amasethingi okuqalisa"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
msgid "Known firewall zones"
msgstr "Amazoni aziwayo e-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
msgid "Network interfaces configuration"
msgstr "Ukuhlelwa kwama-interface enethiwekhi"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
msgid "Allowed services, ports, and protocols"
msgstr "Amasevisi, ama-port namaphrothokholi avunyelwe"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
msgid "Broadcast packet settings"
msgstr "Amasethingi e-broadcast packet"
#. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
msgid "Masquerading settings"
msgstr "Amasethingi Azifanisayo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
msgid "Redirect requests to masqueraded IP"
msgstr "Phinde Uqondise Izicelo Kwi-IP Efanisiwe"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
msgid "Logging settings"
msgstr "Amasethingi okuloga"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
msgid "Firewall configuration summary"
msgstr "Amabalengwe okuhlela i-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
#, fuzzy
msgid "Enables firewall"
msgstr "Bhala isihenqo esiyisivikelo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
#, fuzzy
msgid "Disables firewall"
msgstr "Bhala isihenqo esiyisivikelo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
msgid "Show current settings"
msgstr "Bonisa amasethingi amanje"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
msgid "Start firewall in the boot process"
msgstr "Qalisa i-firewall enqubweni yokuqaliswa kwekhompuyutha"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
msgid "Start firewall manually"
msgstr "Ziqalisele mathupha i-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
msgid "List configured entries"
msgstr "Faka uhlu lwezinto ezihleliwe"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
msgid "Zone short name"
msgstr "Igama elifushane lezoni"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
msgid "Add a new record"
msgstr "Faka irekhodi elisha"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
msgid "Remove a record"
msgstr "Susa irekhodi"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
msgid "Network interface configuration name"
msgstr "Igama lokuhlelwa kwe-interface yenethiwekhi"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
msgid "Logging accepted packets (all|crit|none)"
msgstr "Ukuloga amaphakethe amukelwayo (all|crit|none)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
msgid "Logging not accepted packets (all|crit|none)"
msgstr "Ukuloga amaphakethe angamukelwa (all|crit|none)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
msgid "Logging broadcast packets (yes|no)"
msgstr "Ukuloga ama-broadcast packets (yes|no)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
msgid "Set value"
msgstr "Setha i-value"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
msgid "Port name or number; comma-separate multiple ports"
msgstr "Igama le-port noma inombolo; ama-port amaningi ahlukaniswa ngokhefana"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
msgid "Known firewall service; comma-separate multiple services"
msgstr "Isevisi eyaziwayo ye-firewall; amasevisi amaningi ahlukaniswa ngokhefana"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
msgid "TCP port name or number; comma-separate multiple ports"
msgstr "Igama noma inombolo ye-port; ama-port amaningi ahlukaniswa ngokhefana"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
msgid "UDP port name or number; comma-separate multiple ports"
msgstr "Igama noma inombolo ye-port; ama-port amaningi ahlukaniswa ngokhefana"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
msgid "RPC port name; comma-separate multiple ports"
msgstr "Igama le-port ye-RPC; ama-port ahlukaniswe ngokhefana"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
msgid "IP protocol name; comma-separate multiple protocols"
msgstr "Igama lephrothokholi ye-IP; amaphrothokholi ahlukaniswe ngokhefana"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
msgid "Set zone protection (yes|no)"
msgstr "Setha isivikelo sezoni (yes|no)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
msgid "Detailed information"
msgstr "Ukwaziswa okuningiliziwe"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
msgid "Enable option"
msgstr "Vula okukhethile"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
msgid "Disable option"
msgstr "Cisha okukhethile"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
msgstr "Inethiwekhi ewumthombo, njenge-0/0 noma 145.12.35.0/255.255.255.0"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
msgid "Protocol (tcp|udp)"
msgstr "Iphrothokholi (tcp|udp)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
msgid "Requested external IP (optional)"
msgstr "Icele i-IP yangaphandle (uyikhetha uma uthanda)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
msgid "Requested port name or number"
msgstr "Icele igama noma inombolo ye-port"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
msgid "Redirect to internal IP"
msgstr "Phinda uqondise kwi-IP yangaphakathi"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
msgid "Redirect to port on internal IP (optional)"
msgstr "Phinda uqondise kwi-port eku-IP yangaphakathi (ukukhetha uma uthanda)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
msgid "Record number"
msgstr "Bhala inombolo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
msgid "Use port names instead of port numbers"
msgstr "Sebenzisa amagama e-port esikhundleni sezinombolo ze-port"
#. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
msgid "Unknown zone %1."
msgstr "Izoni Engaziwa %1."
@@ -1636,180 +1648,180 @@
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
msgid "Parameter %1 must be set."
msgstr "Ipharamitha %1 kumelwe isethwe."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
msgid "Listing Known Firewall Zones:"
msgstr "Ifaka Uhlu Lwamazoni Aziwayo E-Firewall:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
msgid "Shortcut"
msgstr "Isinqamuleli"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
msgid "Zone Name"
msgstr "Igama Lezoni"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
msgid "Summary:"
msgstr "Amabalengwe:"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
msgid "Only one parameter is allowed."
msgstr "Ipharamitha eyodwa kuphela evunuyelwe."
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
msgid "Start-Up:"
msgstr "Ukuqalisa:"
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
msgid "Enabling firewall in the boot process..."
msgstr "Yenza i-firewall isebenze enqubweni yokuqaliswa kwekhompuyutha..."
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
msgid "Removing firewall from the boot process..."
msgstr "Isusa i-firewall enqubweni yokuqaliswa kwekhompuyutha..."
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
msgid "Firewall is enabled in the boot process"
msgstr "I-firewall yenziwe yasebenza enqubweni yokuqaliswa kwekhompuyutha"
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
msgid "Firewall needs manual starting"
msgstr "I-firewall idinga ukuba uyiqalise mathupha"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
msgid "Network Interfaces in Firewall Zones:"
msgstr "Ama-Interface Enethiwekhi Kumazoni E-firewall: "
#. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
msgid "Special firewall string"
msgstr "Uhlu olukhethekile lwe-firewall"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
msgid "Interface"
msgstr "I-Interface"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
msgid "Device Name"
msgstr "Igama Ledivayisi"
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
msgid "Adding special string %1 into zone %2..."
msgstr "Inezela uhlu olukhethekile %1 kwizoni %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
msgid "Adding interface %1 into zone %2..."
msgstr "Inezela i-interface %1 kwizoni %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
msgid "Removing special string %1 from zone %2..."
msgstr "Isusa uhlu olukhethekile %1 kwizoni %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
msgid "Removing interface %1 from zone %2..."
msgstr "Isusa i-interface %1 kwizoni %2..."
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
msgid "Log all"
msgstr "Loga konke"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
msgid "Log only critical"
msgstr "Loga okubucayi kuphela"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
msgid "Do not log any"
msgstr "Ungalogi lutho"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
msgid "Global Logging Settings:"
msgstr "Amasethingi Okuloga Embulunga Yonke:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
msgid "Rule Type"
msgstr "Uhlobo Lomthetho"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
msgid "Value"
msgstr "I-value"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
msgid "Accepted"
msgstr "Kwamukelwe"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
msgid "Not accepted"
msgstr "Akwamukelwanga"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
msgid "Logging Broadcast Packets:"
msgstr "Ukuloga Ama-Broadcast Packet:"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
msgid "Logging enabled"
msgstr "Ukuloga kuvuliwe"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
msgid "Logging disabled"
msgstr "Ukuloga kucishiwe"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
msgid "Short"
msgstr "Kufushane"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
msgid "Logging Status"
msgstr "Isimo Sokuloga"
@@ -1818,168 +1830,181 @@
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
msgid "Value %1 is not allowed for option %2."
msgstr "I-value %1 ayivunyelwe kulokhu okukhethiwe %2."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
msgid "Allowed Broadcast Ports:"
msgstr "Ama-Broadcast Port Avunyelwe:"
#. TRANSLATORS: CommandLine header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
msgid "Port"
msgstr "I-Port"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
msgid "Only one action command is allowed here."
msgstr "Ikhomandi yesinyathelo esisodwa kuphela evunyelwe lapha."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
msgid "Defined Firewall Services:"
msgstr "Amasevisi E-firewall Abonisiwe:"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
msgid "ID"
msgstr "I-ID"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
msgid "Service Name"
msgstr "Igama Lesevisi"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
msgid "TCP port"
msgstr "I-port ye-TCP"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
msgid "UDP port"
msgstr "I-port ye-UDP"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
msgid "RPC port"
msgstr "I-port ye-RPC"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
msgid "IP protocol"
msgstr "Iphrothokholi ye-IP"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
msgid "Allowed Services in Zones:"
msgstr "Amasevisi Avunyelwe Kumazoni:"
#. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
msgid "All services"
msgstr "Wonke amasevisi"
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
msgid "Entire zone unprotected"
msgstr "Yonke izoni ayivikelekile"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
msgid "Service ID"
msgstr "I-ID Yesevisi"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
msgid "Additional Allowed Ports:"
msgstr "Amanye Ama-Port Avumelekile:"
#. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
msgid "All ports"
msgstr "Wonke ama-port"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
msgid "Allowed Additional IP Protocols in Zones:"
msgstr "Amanye ama-IP Phrothokholi Avumelekile Kumazoni:"
#. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
msgid "All IP protocols"
msgstr "Wonke ama-IP phrothokholi"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
msgid "IP Protocol"
msgstr "Iphrothokholi ye-IP"
#. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
msgid "Unknown service %1."
msgstr "Isevisi engaziwa %1."
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
msgid "Protection can only be set for internal zones."
msgstr "Isivikelo singasethwa kuphela kumazoni angaphakathi."
#. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
msgid "At least one of %1 must be set."
msgstr "Okungenani okukodwa kwe-%1 kumelwe kusethwe."
#. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
msgid "At least one action command from %1 must be set."
msgstr "Okungenani isinyathelo esisodwa ku-%1 kumelwe sisethwe."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
msgid "Redirect Requests to Masqueraded IP:"
msgstr "Phinde Uqondise Izicelo Kwi-IP Efanisiwe:"
#. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
msgid "Unknown port name %1."
msgstr "Igama le-port elingaziwa %1."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
msgid "Masquerading Settings:"
msgstr "Amasethingi Azifanisayo:"
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
#. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
msgstr "Okuzifanisayo yi-%1 "
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
msgid "enabled"
msgstr "kuvuliwe"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
msgid "disabled"
msgstr "kucishiwe"
Modified: trunk/yast/zu/po/firstboot.zu.po
===================================================================
--- trunk/yast/zu/po/firstboot.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/firstboot.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:28\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -111,13 +111,13 @@
msgstr "Ilebula"
#: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "Isimo"
+
+#: src/clients/firstboot_config.rb:68
msgid "Module Name"
msgstr "Igama Lemoduli"
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "Isimo"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
@@ -294,7 +294,7 @@
" </p>\n"
#. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
#, fuzzy
msgid "There is not enough space to install all additional packages."
msgstr ""
Modified: trunk/yast/zu/po/fonts.zu.po
===================================================================
--- trunk/yast/zu/po/fonts.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/fonts.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -18,63 +18,63 @@
#. 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
+#: src/lib/fonts/fonts-config-state.rb:59
#, fuzzy
#| msgid "Bitmap Editors"
msgid "Bitmap Fonts"
msgstr "Izihleli Ze-Bitmap"
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
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
+#: src/lib/fonts/fonts-config-state.rb:107
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
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
+#: src/lib/fonts/fonts-config-state.rb:127
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
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
+#: src/lib/fonts/fonts-config-state.rb:147
msgid "Default"
msgstr "Okufike Nohlelo (default)"
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
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
+#: src/lib/fonts/fonts-config-state.rb:167
#, fuzzy
#| msgid "Fonts"
msgid "CFF Fonts"
msgstr "Amafonti"
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
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
+#: src/lib/fonts/fonts-config-state.rb:210
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
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
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: trunk/yast/zu/po/geo-cluster.zu.po
===================================================================
--- trunk/yast/zu/po/geo-cluster.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/geo-cluster.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,10 +59,8 @@
#.
#. $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:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
#, fuzzy
#| msgid "Class Configuration"
@@ -122,17 +120,17 @@
msgstr "Izipheqi"
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:819
msgid "Add"
msgstr "&Nezela"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:820
msgid "Edit"
msgstr "Hlela"
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:821
msgid "Delete"
msgstr "Susa"
@@ -140,19 +138,18 @@
msgid "site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
msgid "ticket"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:106
#, fuzzy
#| msgid "Authentication"
-msgid "Authentification"
+msgid "Authentication"
msgstr "Ukugunyaza"
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
#, fuzzy
#| msgid "Cancel"
msgid "Ca&ncel"
@@ -160,9 +157,9 @@
#. 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
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
msgid "OK"
msgstr "OK"
@@ -175,200 +172,207 @@
#: src/include/geo-cluster/dialogs.rb:128
#, fuzzy
#| msgid "Authentication"
-msgid "Authentification file"
+msgid "Authentication file"
msgstr "Ukugunyaza"
#: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:146
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:151
#, fuzzy
#| msgid "Select File for the Authentication Key"
-msgid "Generate Authentification Key File"
+msgid "Generate Authentication Key File"
msgstr "Khetha Ifayela Enesikhiye Sokuqinisekisa"
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:159
msgid "Basic"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
msgid "Cancel"
msgstr "Khansela"
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
#, fuzzy
#| msgid "Enter a valid e-mail address."
msgid "Please enter a valid ip address"
msgstr "Faka ikheli le-e-mail elinembile."
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
msgid "timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
#, fuzzy
#| msgid "Directories"
msgid "retries"
msgstr "Imikhombandlela"
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
msgid "weights"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
msgid "expire"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
#, fuzzy
#| msgid "Required patterns"
msgid "acquire-after"
msgstr "Amaphethini adingekayo"
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
#, fuzzy
#| msgid "Action is invalid."
msgid "timeout is invalid"
msgstr "Isinyathelo asisebenzi."
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
#, fuzzy
#| msgid "' is not valid."
msgid "expire is invalid"
msgstr "' ayisebenzi."
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
#, fuzzy
#| msgid "The source is not valid."
msgid "acquireafter is invalid"
msgstr "Lo mthombo awusebenzi."
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
#, fuzzy
#| msgid "' is not valid."
msgid "retries is invalid"
msgstr "' ayisebenzi."
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
#, fuzzy
#| msgid "' is not valid."
msgid "weights is invalid"
msgstr "' ayisebenzi."
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
#, fuzzy
#| msgid "URL cannot be empty."
msgid "ticket can not be empty"
msgstr "I-URL ayikwazi ukungabi nalutho."
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407
-#: src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr "Ukuhlelwa Kwe-Firewall"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:569
msgid "Enter an IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:580
msgid "Edit IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:596
msgid "Enter an IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:607
msgid "Edit IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:629
#, fuzzy
#| msgid "Provider name %1 already exists."
msgid "Ticket name already exist!"
msgstr "Igama lomphakeli %1 selikhona kakade."
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:661
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be empty."
msgstr "Igama lomiso alikwazi ukungabi nalutho"
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:664
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be duplicated."
msgstr "Igama lomiso alikwazi ukungabi nalutho"
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:672
#, fuzzy
#| msgid "Key is invalid."
msgid "port is invalid!"
msgstr "Isikhiye asisebenzi."
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:678
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:684
#, fuzzy
#| msgid "Gateway IP address is invalid."
msgid "arbitrator have to be filled!"
msgstr "Ikheli Le-IP lesango le-inthanethi alisebenzi."
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:689
msgid "site have to be filled!"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:694
msgid "ticket have to be filled!"
msgstr ""
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
+#: src/include/geo-cluster/dialogs.rb:748
#, fuzzy
#| msgid "Set the authentication for proxy"
-msgid "Failed to create authentification file "
+msgid "Failed to create authentication file "
msgstr "Hlela ukugunyazwa kwe-proxy"
-#: src/include/geo-cluster/dialogs.rb:736
+#: src/include/geo-cluster/dialogs.rb:751
#, fuzzy
-#| msgid "Set the authentication for proxy"
-msgid "Succeed to created authentification file "
-msgstr "Hlela ukugunyazwa kwe-proxy"
+#| msgid "Authentication"
+msgid "Authentication file "
+msgstr "Ukugunyaza"
+#: src/include/geo-cluster/dialogs.rb:751
+msgid " created successfully."
+msgstr ""
+
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:810
#, fuzzy
#| msgid "Add Complete Configuration Files"
msgid "GeoCluster Configuration Select"
@@ -376,7 +380,7 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:816
#, fuzzy
#| msgid "Update configuration files"
msgid "Choose configuration file:"
@@ -385,7 +389,7 @@
#: src/include/geo-cluster/wizards.rb:47
#, fuzzy
#| msgid "TV Station Configuration"
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
msgstr "Ukuhlelwa Kwesiteshi Se-TV"
#. Initialization dialog contents
@@ -542,6 +546,11 @@
msgstr "Amabalengwe okuhlela..."
#, fuzzy
+#~| msgid "Set the authentication for proxy"
+#~ msgid "Succeed to created authentification file "
+#~ msgstr "Hlela ukugunyazwa kwe-proxy"
+
+#, fuzzy
#~| msgid "Configuration name cannot be empty."
#~ msgid "Configuration name can not be null"
#~ msgstr "Igama lomiso alikwazi ukungabi nalutho"
Modified: trunk/yast/zu/po/installation.zu.po
===================================================================
--- trunk/yast/zu/po/installation.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/installation.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -36,7 +36,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
msgid "Initializing..."
msgstr "Ilungiselela ukuqala..."
@@ -134,33 +134,33 @@
" ziyahluka kulezo ezisencwadini yeziqondiso.\n"
#. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
#, fuzzy
msgid "Start service %1"
msgstr "Qalisa amasevisi"
#. TRANSLATORS: progress stage, %1 stands for service name
#. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
#: src/lib/installation/clients/inst_restore_settings.rb:47
#, fuzzy
msgid "Starting service %1..."
msgstr "Iqala kabusha isevisi %1..."
#. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
#, fuzzy
msgid "Adjusting Network Settings"
msgstr "Ifunda amasethingi enethiwekhi..."
#. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
#, fuzzy
msgid "Network settings are being adjusted."
msgstr "<p>Sicela ulinde njengoba kusafakwa amaphakheji.</p>"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
msgid ""
"The previous installation has failed.\n"
"Would you like it to continue?\n"
@@ -173,7 +173,7 @@
" Phawula: Kungase kudingeke ufake okunye ukwaziswa futhi."
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
msgid ""
"The previous installation has been aborted.\n"
"Would you like it to continue?\n"
@@ -188,7 +188,7 @@
#. popup headline (#x1)
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
#: src/lib/installation/clients/inst_doit.rb:60
msgid "Starting Installation..."
msgstr "Iqalisa Ukufaka Uhlelo..."
@@ -235,21 +235,21 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:133
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>Buyela emuva uhlole amasethingi uma ungaqiniseki.</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
+#: src/lib/installation/proposal_runner.rb:121
msgid "Confirm Update"
msgstr "Qinisekisa Ukuvuselelwa Kwamafayela"
#. 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
+#: src/lib/installation/proposal_runner.rb:125
#, 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>"
@@ -258,7 +258,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:127
#, fuzzy
msgid ""
"\n"
@@ -272,7 +272,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:136
msgid "Start &Update"
msgstr "Qalisa &Vuselela"
@@ -312,56 +312,7 @@
msgstr "Iqala kabusha isevisi %1..."
#. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr ""
-
-#. TRANSLATORS: help text
-#: 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"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"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 <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-"<p>Sebenzisa u-<b>Yenza Ikhophi</b> uma ufuna ukwakha iphrofayili ye-AutoYaST.\n"
-"I-AutoYaST yindlela yokufaka i-SUSE Linux ize iyophothula ngaphandle kokungenela komsebenzisi. I-AutoYaST\n"
-" idinga iphrofayili ukuze yazi ukuthi kufanele ibukeke kanjani isistimu efakiwe. Uma lokhu\n"
-" kukhethiwe, iphrofayili yohlelo lwamanje igcinwa engxenyeni ethi /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/lib/installation/clients/clone_proposal.rb:71
-#, fuzzy
-#| msgid "Writing the system configuration"
-msgid "Clone System Configuration"
-msgstr "Ukubhala ukuhlelwa kwesistimu (system configuration)"
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Clone System Configuration"
-msgstr "&Kweqe Ukuhlela"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
-msgstr ""
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
-msgstr ""
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:83
msgid "Copying files to installed system..."
msgstr "Ikopishela amafayela kwisistimu efakiwe..."
@@ -556,7 +507,7 @@
msgstr ""
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:321
#, fuzzy
msgid "Unknown Product"
msgstr "Imodi Engaziwa"
@@ -586,56 +537,28 @@
"Khetha ukuthi avuselelwe manje yini amafayela kwi-inthanethi.\n"
"Ungaseqa lesi sinyathelo ubuye ukwenze kamuva ukuvuselela amafayela kwi-inthanethi.\n"
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
msgid "Language, Keyboard and License Agreement"
msgstr ""
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: 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 "&Ulimi"
-
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "&I-Layout Yekhibhodi"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:319
#, fuzzy
-msgid "I &Agree to the License Terms."
-msgstr "&Yebo, Ngiyavumelana Nesivumelwano Selayisensi"
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Ukwaziswa Okuphathelene Nohlelo"
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
-#, fuzzy
-#| msgid "Keyboard"
-msgid "K&eyboard Test"
-msgstr "Ikhibhodi"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "Isivumelwano Selayisensi"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-#, fuzzy
-msgid "License &Translations..."
-msgstr "Ibhala iziteshi ze-TV..."
-
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
#, fuzzy
msgid ""
"<p>\n"
@@ -650,7 +573,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -659,7 +582,7 @@
msgstr ""
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -670,7 +593,7 @@
" </p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -683,7 +606,7 @@
" </p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
#, fuzzy
msgid ""
"<p>\n"
@@ -696,24 +619,59 @@
" inqubo yokufaka uhlelo.\n"
" </p>\n"
-#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: 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
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
+msgid "License Agreement"
+msgstr "Isivumelwano Selayisensi"
+
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:429
+msgid "&Language"
+msgstr "&Ulimi"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
+msgid "&Keyboard Layout"
+msgstr "&I-Layout Yekhibhodi"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Ukwaziswa Okuphathelene Nohlelo"
+msgid "I &Agree to the License Terms."
+msgstr "&Yebo, Ngiyavumelana Nesivumelwano Selayisensi"
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. Report error about missing license acceptance
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
msgid "You must accept the license to install this product"
msgstr ""
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "Ihlola isistimu efakiwe..."
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
+#, fuzzy
+#| msgid "Keyboard"
+msgid "K&eyboard Test"
+msgstr "Ikhibhodi"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
+#, fuzzy
+msgid "License &Translations..."
+msgstr "Ibhala iziteshi ze-TV..."
+
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
#, fuzzy
@@ -831,7 +789,7 @@
msgstr "Le phakheji ayifakiwe futhi ngeke ifakwe."
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
msgid "The system will reboot now..."
msgstr "Isistimu manje isizoqalisa kabusha..."
@@ -840,17 +798,17 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
#: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
#, fuzzy
msgid "Deploying Images..."
msgstr "Ilanda iphakheji %1 (%2)..."
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:168
#, fuzzy
msgid ""
"Deploying images has failed.\n"
@@ -860,30 +818,30 @@
"Iyayeka ukufaka uhlelo."
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:200
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/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:376
#, fuzzy
msgid "Downloading image at speed %1/s"
msgstr "Ilanda umfanekiso..."
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:381
#, fuzzy
msgid "Downloading image %1 at speed %2/s"
msgstr "Ilanda umfanekiso..."
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:441
#, fuzzy
msgid "Deploying image..."
msgstr "Ilanda umfanekiso..."
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:444
#, fuzzy
msgid "Deploying image %1..."
msgstr "Ilanda umfanekiso..."
@@ -901,46 +859,47 @@
msgid "&Disk to Use"
msgstr ""
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
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/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
msgid "Hard Disk for Image Deployment"
msgstr ""
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
msgid "Detecting Available Controllers"
msgstr "Ukuthungatha Izilawuli Ezitholakalayo"
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
msgid "Disk Activation"
msgstr "Ukwenza Idiski Lisebenze"
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
msgid "Configure &DASD Disks"
msgstr "Hlela &Ama-Disk e-DASD"
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
msgid "Configure &ZFCP Disks"
msgstr "Hlela &Ama-Disk e-ZFCP"
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
#, fuzzy
#| msgid "Configure &ZFCP Disks"
msgid "Configure &FCoE Interfaces"
msgstr "Hlela &Ama-Disk e-ZFCP"
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
msgid "Configure &iSCSI Disks"
msgstr "Hlela &Ama-Disk e-iSCSI"
-#: src/lib/installation/clients/inst_disks_activate.rb:111
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
#, fuzzy
#| msgid "Saving network configuration..."
-msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
msgstr "Igcina ukuhlelwa kwenethiwekhi..."
#. TRANSLATORS: dialog caption
@@ -960,7 +919,7 @@
#. bug #302384
#: 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
+#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "Ilungiselela ukuqala..."
@@ -988,74 +947,77 @@
msgid "Show &package updates"
msgstr "Bonisa amaphakheji ngesimo"
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+#, fuzzy
+msgid "Calling step %1..."
+msgstr "Iqoqa ukwaziswa kwesistimu..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr ""
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "Iphutha Ekufakeni Uhlelo"
+
#. Adjust a SlideShow dialog if not configured
#. kilobytes
#. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
msgid "Finishing Basic Installation"
msgstr "Iphothula Ukufaka Okuyisisekelo"
#. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
#, fuzzy
msgid "Creating list of finish scripts to call..."
msgstr "Ama-Script Afakwa Ngaphambi Kokufakwa Kohlelo"
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "Iphothulile"
+
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:456
msgid "Copy files to installed system"
msgstr "Kopishela amafayela kwisistimu efakiwe"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:463
msgid "Save configuration"
msgstr "Gcina ukuhlela"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:470
msgid "Save installation settings"
msgstr "Gcina amasethingi okufaka"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:479
msgid "Install boot manager"
msgstr "Faka uhlelo lokuqalisa (boot manager)"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:486
msgid "Prepare system for initial boot"
msgstr "Yenza ukuba isistimu ilungele ukuqala"
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
#, fuzzy
msgid "Checking stage: %1..."
msgstr "Ihlola i-binary e-%1..."
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
-#, fuzzy
-msgid "Calling step %1..."
-msgstr "Iqoqa ukwaziswa kwesistimu..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
-msgid " * %1"
-msgstr ""
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
-msgid "Finished"
-msgstr "Iphothulile"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
-msgid "Installation Error"
-msgstr "Iphutha Ekufakeni Uhlelo"
-
#. Button to accept a license agreement
#: src/lib/installation/clients/inst_info.rb:63
msgid "I &Agree"
@@ -1082,26 +1044,26 @@
msgstr "Ukubhala ukuhlelwa kwesistimu (system configuration)"
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
#, fuzzy
#| msgid "Installation Settings"
msgid "Installation Options"
msgstr "Amasethingi Okufaka"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
msgid "&Add Online Repositories Before Installation"
msgstr ""
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
#, fuzzy
#| msgid "In&clude Add-On Products from Separate Media"
msgid "In&clude Add-on Products from Separate Media"
msgstr "Hla&nganisa Imikhiqizo Eyenezelwayo Ethathwe Kwimidiya Ehlukile"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
#, fuzzy
#| msgid ""
#| "<p><big><b>Installation Mode</b></big><br>\n"
@@ -1112,7 +1074,7 @@
"Khetha okumelwe kwenziwe:</p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1120,7 +1082,7 @@
msgstr ""
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -1136,7 +1098,7 @@
" <b>Faka Nemikhiqizo Eyenezelwayo Ethathwa Kwimidiya Ehlukile</b>.</p>\n"
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr ""
@@ -1261,7 +1223,7 @@
#. Use 'zero' if image installation is not used
#. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
#, fuzzy
msgid "Installing Packages..."
msgstr "Ifaka amaphakheji..."
@@ -1301,7 +1263,7 @@
"efakiwe. Kuhlinzeka ngamanqampunqampu ezinhlelo ezintsha nezinguquko.</p>"
#. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
#, fuzzy
msgid "<p>No release notes have been installed.</p>"
msgstr "Azikho izichibiyelo eziye zafakwa."
@@ -1326,97 +1288,97 @@
#. This dialog in not interactive
#. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
msgid "Analyzing the Computer"
msgstr "Ukuhlaziya Ikhompuyutha"
#. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
#, fuzzy
msgid "Probe USB devices"
msgstr "Icinga amadivayisi e-USB"
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
#, fuzzy
msgid "Probing USB devices..."
msgstr "Icinga amadivayisi e-USB"
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
#, fuzzy
msgid "Probe FireWire devices"
msgstr "Icinga amadivayisi e-Fire Wire..."
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
msgid "Probing FireWire devices..."
msgstr "Icinga amadivayisi e-Fire Wire..."
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
msgid "Probe floppy disk devices"
msgstr "Cinga amadivayisi e-flophi diski"
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
msgid "Probing floppy disk devices..."
msgstr "Icinga amadivayisi e-flophi diski..."
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
msgid "Probe hard disk controllers"
msgstr "Cinga izilawuli zikagalaza (hard disk)"
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
msgid "Probing hard disk controllers..."
msgstr "Icinga izilawuli zikagalaza (hard disk)..."
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
msgid "Load kernel modules for hard disk controllers"
msgstr "Faka amamoduli ekheneli ezilawuli zikagalaza (hard disk)"
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
msgid "Loading kernel modules for hard disk controllers..."
msgstr "Ifaka amamoduli ekheneli ezilawuli zikagalaza (hard disk)..."
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
msgid "Probe hard disks"
msgstr "Cinga ogalaza (hard disks)"
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
msgid "Probing hard disks..."
msgstr "Icinga ogalaza (hard disks)..."
#. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
#, fuzzy
msgid "Search for system files"
msgstr "Cinga Amaphathishini Alahlekile"
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
#, fuzzy
msgid "Searching for system files..."
msgstr "Icinga amadivayisi omqondisi..."
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
#, fuzzy
msgid "Initialize software manager"
msgstr "Ilungiselela ukuqalisa isizinda sokwaziswa sephakheji..."
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
#, fuzzy
msgid "Initializing software manager..."
msgstr "Ilungiselela ukuqalisa isizinda sokwaziswa sephakheji..."
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
#, fuzzy
msgid "System Probing"
msgstr "Iqembu Lesistimu"
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
#, fuzzy
msgid "YaST is probing computer hardware and installed systems now."
msgstr "<p>Sicela ulinde njengoba isistimu isahlelwa.</p>"
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:257
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1429,7 +1391,7 @@
"Sicela uhlole i-hardware yakho!\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:271
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1442,7 +1404,7 @@
"Abekho ogalaza abatholakele bokufakwa.\n"
"Sicela uhlole i-hardware yakho!\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:281
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1450,7 +1412,7 @@
msgstr ""
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:292
#, fuzzy
#| msgid ""
#| "No hard disks and no hard disk controllers were\n"
@@ -1467,7 +1429,7 @@
" Hlola i-hardware yakho.\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:337
#, fuzzy
msgid ""
"Failed to initialize the software repositories.\n"
@@ -1476,6 +1438,52 @@
"Ihlulekile ukulungiselela ukuqalisa amakhathalogi.\n"
"Iyayeka ukufaka uhlelo."
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:187
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:193
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:265
+msgid ""
+"Downloading the optional installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
+msgstr ""
+
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
#, fuzzy
@@ -1532,8 +1540,8 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
msgid "&Change..."
msgstr "&Shintsha..."
@@ -1747,7 +1755,7 @@
"eziyisisekelo zokuhlelwa kwesistimu yakho.</p>\n"
#. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
#, fuzzy
msgid "No workflow defined for this kind of installation."
msgstr "Ayikho i-workflow echaziwe ngalesi simo sokufakwa kohlelo (installation mode)."
@@ -1771,7 +1779,7 @@
msgstr "Ukuhlela imemori (ingobolwazi) yesikhashana exhumanisayo"
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
msgid "Saving network configuration..."
msgstr "Igcina ukuhlelwa kwenethiwekhi..."
@@ -1829,6 +1837,26 @@
msgid "Saving hardware configuration..."
msgstr "Igcina ukuhlelwa kwe-hardware..."
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+#| msgid "Writing the system configuration"
+msgid "Import SSH Host Keys and Configuration"
+msgstr "Ukubhala ukuhlelwa kwesistimu (system configuration)"
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "&Kweqe Ukuhlela"
+
#. progress step title
#: src/lib/installation/clients/ssh_settings_finish.rb:64
msgid "Copying SSH settings to installed system..."
@@ -1886,6 +1914,34 @@
msgid "Copying log files to installed system..."
msgstr "Ikopishela amafayela elogi kwisistimu efakiwe..."
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "Idivayisi"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "Import SSH Configuration"
+msgstr "&Kweqe Ukuhlela"
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
#, fuzzy
@@ -1893,34 +1949,22 @@
msgstr "Ihlola amaphathishini e-Linux asebenzayo..."
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
msgid "Really reset everything to default values?"
msgstr "Ngempela ufuna ukusetha kabusha yonke into ibuyele kuma-value ohlelo (default values)?"
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
msgid "You will lose all changes."
msgstr "Uzolahlekelwa yizo zonke izinguquko ebesezenziwe."
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-#, fuzzy
-msgid "Location of Stored Configuration"
-msgstr "&Sebenzisa Ukuhlela Okulandelayo"
-
-#. 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 ""
-
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
msgid "Skipping configuration upon user request"
msgstr "Ukweqa ukuhlela ngesicelo somsebenzisi"
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
@@ -1929,26 +1973,26 @@
"lixazululwe ngaphambi kokuba uqhubeke.\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
#, fuzzy
msgid "Adapting the proposal to the current settings..."
msgstr "Bonisa amabalengwe okuhlelwa kwamanje"
#. 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
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
msgid "Analyzing your system..."
msgstr "Ukuhlaziya isistimu yakho..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
msgid "ERROR: No proposal"
msgstr "IPHUTHA: Akukho okuhlongoziwe"
#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1961,48 +2005,40 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
msgid "&Skip Configuration"
msgstr "&Kweqe Ukuhlela"
#. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
msgid "&Use Following Configuration"
msgstr "&Sebenzisa Ukuhlela Okulandelayo"
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Export Configuration"
-msgstr "&Kweqe Ukuhlela"
-
#. 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
+#: src/lib/installation/proposal_runner.rb:693
#, 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 "Chofoza noma yisiphi isihloko ukuze wenze izinguquko noma usebenzise imenyu ethi \"Shintsha...\" ngezansi."
-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
#, fuzzy
#| msgid "Click any headline to make changes or use the \"Change...\" menu below."
msgid "Click a headline to make changes."
msgstr "Chofoza noma yisiphi isihloko ukuze wenze izinguquko noma usebenzise imenyu ethi \"Shintsha...\" ngezansi."
#. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
msgid "&Reset to defaults"
msgstr "&Usethe kabusha uye kokohlelo"
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Update"
msgstr "&Vuselela Uhlelo"
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Install"
msgstr "&Faka"
@@ -2043,7 +2079,7 @@
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
#, fuzzy
msgid ""
"<p>\n"
@@ -2057,7 +2093,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:434
#, fuzzy
msgid ""
"<p>\n"
@@ -2070,7 +2106,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:443
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -2082,7 +2118,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:451
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -2094,7 +2130,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -2105,12 +2141,12 @@
" </p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr "<P><B>Isihlongozo Sokufaka i-UML</B></P>"
#. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -2121,7 +2157,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:482
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2140,6 +2176,11 @@
msgid "Enabling remote administration..."
msgstr "I-Administration Ekude"
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:79
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
#. Writes configuration
#.
#. It creates a snapshot when no second stage is required and
@@ -2147,21 +2188,114 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
#, fuzzy
#| msgid "Checking root file system entry of fstab..."
msgid "Creating root filesystem snapshot..."
msgstr "Ihlola i-entry yesistimu yamafayela yomqondisi ye-fstab..."
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+#, fuzzy
+#| msgid "No Linux root partition found."
+msgid "No previous Linux installation found"
+msgstr "Ayikho iLinux root partition etholakele."
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. 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/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. 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/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+msgid "Unknown protocol %1."
+msgstr "Imodi Engaziwa"
+
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
msgid "Failed to read information about installation images"
msgstr ""
#. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
#, fuzzy
msgid "Deploying..."
msgstr "Ilanda umfanekiso..."
@@ -2170,7 +2304,7 @@
#.
#. @see #all_supported_types
#. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
#, fuzzy
msgid "Storing user preferences..."
msgstr "Misa amasevisi..."
@@ -2178,18 +2312,34 @@
#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
#.
#. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
#, fuzzy
msgid "Restoring user preferences..."
msgstr "Ibuyisela iphakheji %1..."
#. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
msgid ""
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "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 <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgstr ""
+#~ "<p>Sebenzisa u-<b>Yenza Ikhophi</b> uma ufuna ukwakha iphrofayili ye-AutoYaST.\n"
+#~ "I-AutoYaST yindlela yokufaka i-SUSE Linux ize iyophothula ngaphandle kokungenela komsebenzisi. I-AutoYaST\n"
+#~ " idinga iphrofayili ukuze yazi ukuthi kufanele ibukeke kanjani isistimu efakiwe. Uma lokhu\n"
+#~ " kukhethiwe, iphrofayili yohlelo lwamanje igcinwa engxenyeni ethi /root/autoyast.xml.</p>\n"
+
+#, fuzzy
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "&Sebenzisa Ukuhlela Okulandelayo"
+
#~ msgid "ERROR: Missing Title"
#~ msgstr "IPHUTHA: Isihloko Esilahlekile"
@@ -2311,9 +2461,6 @@
#~ msgid "Network Card"
#~ msgstr "Ikhadi Lenethiwekhi"
-#~ msgid "Device"
-#~ msgstr "Idivayisi"
-
#, fuzzy
#~ msgid "Hardware Information of the Selected Network Card"
#~ msgstr "Bonisa ukwaziswa komsebenzisi okhethiwe"
@@ -2934,9 +3081,6 @@
#~ msgid "Evaluating root partition. One moment please..."
#~ msgstr "Ukuhlola i-root partition. Sicela ulinde..."
-#~ msgid "No Linux root partition found."
-#~ msgstr "Ayikho iLinux root partition etholakele."
-
#~ msgid "Booting from %1"
#~ msgstr "Iqalisa ukuvula kwi-%1"
Modified: trunk/yast/zu/po/iscsi-client.zu.po
===================================================================
--- trunk/yast/zu/po/iscsi-client.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/iscsi-client.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: iscsi-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -110,7 +110,6 @@
msgid "Add"
msgstr "&Nezela"
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
#: src/include/iscsi-client/dialogs.rb:160
msgid "Edit"
msgstr "Hlela"
@@ -171,47 +170,64 @@
msgid "Startup"
msgstr "Qala"
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "Lapho uzenzela mathupha"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr "Ikheli Le-IP"
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
msgid "Port"
msgstr "I-Port"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Key"
msgstr "Isikhiye"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Value"
msgstr "I-value"
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
msgid "Service"
msgstr "Isevisi"
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
msgid "Connected Targets"
msgstr "Ama-Target Axhunyiwe"
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
msgid "Discovered Targets"
msgstr "Ama-Target Atholakele"
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
msgid "iSCSI Initiator Overview"
msgstr "Amabalengwe Esiqalisi se-iSCSI"
#. discovery new target
#. 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/dialogs.rb:407
#: 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>"
@@ -220,9 +236,9 @@
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
msgid "iSCSI Initiator Discovery"
msgstr "Ukutholakala Kwesiqalisi Se-iSCSI"
@@ -443,31 +459,29 @@
msgid "Error occurred while logging out from the selected target."
msgstr "Kwenze iphutha lapho uphuma kwi-target ekhethiwe."
-#. toggle all 3 possible values (bnc#457252)
#: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
msgid "No record found."
msgstr "Awekho amarekhodi atholakele."
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
#, fuzzy
msgid "No valid IP address"
msgstr "Ikheli le-IP ledivayisi"
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
#, fuzzy
msgid "Port field cannot be empty"
msgstr "Igama lokokwabelana alikwazi ukungabi nalutho."
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:393
#, fuzzy
#| msgid "Initiator Name"
msgid "Incorrect Initiator Name"
msgstr "Igama Lomqalisi"
-#: src/include/iscsi-client/widgets.rb:429
+#: src/include/iscsi-client/widgets.rb:394
#, fuzzy
msgid ""
"\n"
@@ -487,13 +501,18 @@
"Isibonelo:\n"
"iqn.2007-04.cz.iseva:idiski.yokulondoloza.sdb\n"
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
msgid "Insert the IP address."
msgstr "Faka ikheli le-IP."
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
#. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:596
msgid "Insert the port."
msgstr "Faka i-port."
@@ -501,37 +520,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:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
msgid "True"
msgstr "Iqiniso"
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
msgid "False"
msgstr "Amanga"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
#, fuzzy
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr "Umgomo ongale-TargetName usuxhunyiwe kakade. Qinisekisa ukuthi Ukwenza Imigudu Eminingi (Multipathing) kuvuliwe ukuze kuvinjelwe ukonakaliswa kokwaziswa."
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Continue"
msgstr "Qhubeka"
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
msgid "Cancel"
msgstr "Khansela"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:869
msgid "The target is already connected."
msgstr "I-target isixhunyiwe kakade."
@@ -626,7 +645,7 @@
msgstr "Bonke"
#. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:730
#, fuzzy
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
@@ -638,15 +657,16 @@
"Igama lomqalisi elidala lizothathelwa indawo yi-value evela kwi-iBFT bese yakha ifayela egade umonakalo.\n"
" Uma ufuna ukusebenzisa igama lomqalisi elihlukile lishintshe kwi-BIOS."
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
#, fuzzy
#| msgid "Image creation failed."
msgid "Target connection failed.\n"
msgstr "Ukwakhiwa komfanekiso kuhlulekile."
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1208
msgid "Configuration summary..."
msgstr "Amabalengwe okuhlela..."
Modified: trunk/yast/zu/po/iscsi-lio-server.zu.po
===================================================================
--- trunk/yast/zu/po/iscsi-lio-server.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/iscsi-lio-server.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -42,15 +42,14 @@
msgstr "Isevisi"
#. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73
-#: src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
msgid "Global"
msgstr "Global"
#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#: src/modules/IscsiLioServer.rb:443
#, fuzzy
#| msgid "Target Name"
@@ -73,7 +72,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#, fuzzy
#| msgid "Write groups"
msgid "Portal group"
@@ -104,7 +103,7 @@
msgstr "Ukufakazelwa Komsebenzisi"
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
msgid "LUN"
msgstr ""
@@ -117,133 +116,136 @@
msgstr "Umgudu"
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/widgets.rb:453
msgid "Add"
msgstr "&Nezela"
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
msgid "Edit"
msgstr "Hlela"
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
+#: src/include/iscsi-lio-server/widgets.rb:454
msgid "Delete"
msgstr "Susa"
-#: src/include/iscsi-lio-server/dialogs.rb:193
-#, fuzzy
-#| msgid "Clients"
-msgid "Client"
-msgstr "Ama-client"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
+msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "LUN Mapping"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
#, fuzzy
#| msgid "&Author"
msgid "Auth"
msgstr "Umlobi:"
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
#, fuzzy
#| msgid "Edit "
msgid "Edit LUN"
msgstr "Hlela"
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
#, fuzzy
#| msgid "Edit "
msgid "Edit Auth"
msgstr "Hlela"
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
msgid "Copy"
msgstr ""
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "Akukho Ukufakazela Ubuqiniso"
-#: src/include/iscsi-lio-server/dialogs.rb:225
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/widgets.rb:229
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "Ukufakazela Ubuqiniso Bezingenayo"
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:721
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
msgid "Username"
msgstr "Igama Lomsebenzisi"
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:722
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
msgid "Password"
msgstr "Iphasiwedi"
-#: src/include/iscsi-lio-server/dialogs.rb:248
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/widgets.rb:242
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "Ukufakazela Ubuqiniso Beziphumayo"
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
msgid "When &Booting"
msgstr "Lapho &Uqalisa Uhlelo"
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
msgid "&Manually"
msgstr "&Lapho uzenzela mathupha"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "Lapho Uqalisa Uhlelo"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "Lapho uzenzela mathupha"
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Key"
msgstr "Isikhiye"
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Value"
msgstr "I-value"
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
#, fuzzy
#| msgid "iSCSI Initiator Overview"
msgid "iSCSI LIO Target Overview"
@@ -251,33 +253,34 @@
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
#, fuzzy
#| msgid "<h1>iSCSI Initiator</h1>"
msgid "<h1>iSCSI Target</h1>"
msgstr "<h1>Isiqalisi Se-iSCSI</h1>"
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
#, fuzzy
#| msgid "iSCSI Target"
msgid "Add iSCSI Target"
msgstr "I-SCSI Target"
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+msgid "Modify iSCSI Target Initiator Setup"
msgstr ""
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
msgid "Modify iSCSI Target Lun Setup"
msgstr ""
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
#, fuzzy
#| msgid "CUPS Expert Settings"
msgid "iSCSI Target Expert Settings"
@@ -467,19 +470,24 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
msgstr ""
#: src/include/iscsi-lio-server/helps.rb:130
-msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+msgid ""
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
msgstr ""
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
#, fuzzy
#| msgid ""
#| "List of Discovery Domain Sets. Create a new dds by clicking <b>Add</b>. \n"
@@ -493,12 +501,12 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
msgid ""
"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -507,19 +515,19 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
msgid ""
"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
"and port the service will be available. Default for port number is 3260.\n"
"Only ip addresses assigned to one of the network cards are possible."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
msgid "Create a new target. Replace template values with the correct values."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
msgid ""
"It is possible to make arbitary block devices or files available under a lun.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -528,255 +536,279 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
msgid ""
"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
msgstr ""
#. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
#, fuzzy
#| msgid "Incoming Authentication"
msgid "Problem changing authentication"
msgstr "Ukufakazela Ubuqiniso Bezingenayo"
#. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
#, fuzzy
#| msgid "Enter a valid username."
msgid "Invalid Username"
msgstr "Faka igama lokungena elinembile."
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
#, fuzzy
#| msgid "Enter Provider Password"
msgid "Invalid Password."
msgstr "Faka I-password Yomphakeli"
-#: src/include/iscsi-lio-server/widgets.rb:251
+#: src/include/iscsi-lio-server/widgets.rb:262
#, fuzzy
#| msgid "The selected option is already present."
-msgid "Selected Lun is already in use!"
+msgid "Selected LUN is already in use!"
msgstr "Okukhethiwe sekukhona kakade."
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "Selected Name is already in use!"
msgstr "Igama %1 le-queue elibonisiwe seliyasetshenziswa kakade."
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected Path must be either block device or normal file!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
#, fuzzy
#| msgid "The selected option is already present."
msgid "Selected Path is already in use!"
msgstr "Okukhethiwe sekukhona kakade."
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
#, fuzzy
#| msgid "&Path:"
msgid "Path:"
msgstr "&Umgudu:"
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
#, fuzzy
#| msgid "&Browse"
msgid "Browse"
msgstr "&Pheqa"
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
#, fuzzy
#| msgid "Select a device."
msgid "Select file or device"
msgstr "Khetha ikhathalogi."
-#: src/include/iscsi-lio-server/widgets.rb:436
-#, fuzzy
-#| msgid "Clients"
-msgid "Client Lun"
-msgstr "Ama-client"
+#: src/include/iscsi-lio-server/widgets.rb:447
+msgid "Initiator LUN"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
#, fuzzy
#| msgid "Target Name"
msgid "Target LUN"
msgstr "Igama Le-Target"
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
#, fuzzy
#| msgid "Changes:"
msgid "Change:"
msgstr "Izinguquko:"
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
msgid "Target LUN %1 used more than once!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
#, fuzzy
#| msgid "Select File with the Authentication Key"
msgid "Need to enable at least one Authentification!"
msgstr "Khetha Ifayela Enesikhiye Sokuqinisekisa"
-#: src/include/iscsi-lio-server/widgets.rb:619
-#, fuzzy
-#| msgid "NIS client"
-msgid "Client name:"
-msgstr "I-Client Ye-NIS"
+#: src/include/iscsi-lio-server/widgets.rb:630
+msgid "Initiator name:"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
#, fuzzy
#| msgid "&Import from File"
msgid "Import LUNs from TPG"
msgstr "&Landa Efayeleni"
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
#, fuzzy
#| msgid "Phone numbers must not be empty."
-msgid "Client name must not be empty!"
+msgid "Initiator name must not be empty!"
msgstr "Izinombolo zocingo akumelwe zingabi nalutho."
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. 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:701
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
#, fuzzy
#| msgid "Provider name %1 already exists."
-msgid "Client name already exists!"
+msgid "Initiator name already exists!"
msgstr "Igama lomphakeli %1 selikhona kakade."
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
+#: src/include/iscsi-lio-server/widgets.rb:689
#, fuzzy
#| msgid "NIS client"
-msgid "New client name:"
+msgid "New initiator name:"
msgstr "I-Client Ye-NIS"
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
msgid "OK"
msgstr "OK"
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
msgid "Cancel"
msgstr "Khansela"
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:796
+#, fuzzy
+#| msgid "Disabled"
+msgid "Enabled"
+msgstr "Icishiwe"
+
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
+msgid "Disabled"
+msgstr "Icishiwe"
+
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
msgid "Really delete the selected item?"
msgstr "Uyayisusa ngempela into ekhethiwe?"
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1015
msgid "Problem creating target %1 with tpg %2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1037
msgid "Problem setting network portal to %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1058
msgid "Problem removing lun %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1083
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1097
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:1198
+#: src/include/iscsi-lio-server/widgets.rb:1211
#, fuzzy
#| msgid "Share name cannot be empty."
msgid "The target cannot be empty."
msgstr "Igama lokokwabelana alikwazi ukungabi nalutho."
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1215
#, fuzzy
#| msgid "Share path cannot be empty."
msgid "The target portal group cannot be empty."
msgstr "Igama lokokwabelana alikwazi ukungabi nalutho."
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1226
#, fuzzy
#| msgid "Share %1 already exists."
msgid "The target already exists."
msgstr "Okokwabelana '%1' sekukhona kakade."
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1246
#, fuzzy
#| msgid "Incoming Mail"
msgid "Incoming"
msgstr "Imeyili Engenile"
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1249
#, fuzzy
#| msgid "Outgoing Mail"
msgid "Outgoing"
msgstr "Imeyili Ephumayo"
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1251
msgid "None"
msgstr "Akukho lutho"
-#: 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 "Icishiwe"
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1463
msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator 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?"
+"Really want to continue without initiator access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1477
+#, fuzzy
+#| msgid ""
+#| "Error occurred while creating directory %1:\n"
+#| "%2"
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr ""
+"Kwenzeke iphutha lapho kwakhiwa i-directory %1:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1492
+#, fuzzy
+#| msgid ""
+#| "Error occurred while creating directory %1:\n"
+#| "%2"
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr ""
+"Kwenzeke iphutha lapho kwakhiwa i-directory %1:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1513
+#, fuzzy
+#| msgid ""
+#| "Error occurred while creating directory %1:\n"
+#| "%2"
+msgid "Problem removing initiator %3 from %1:%2"
msgstr ""
+"Kwenzeke iphutha lapho kwakhiwa i-directory %1:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1524
+#: src/include/iscsi-lio-server/widgets.rb:1537
#, fuzzy
#| msgid ""
#| "Error occurred while creating directory %1:\n"
#| "%2"
-msgid "Problem creating client %3 for %1:%2"
+msgid "Problem creating initiator %3 for %1:%2"
msgstr ""
"Kwenzeke iphutha lapho kwakhiwa i-directory %1:\n"
"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
-msgstr ""
+#: src/include/iscsi-lio-server/widgets.rb:1572
+#, fuzzy
+#| msgid "Incoming Authentication"
+msgid "Problem changing auth for initiator %3 in %1:%2"
+msgstr "Ukufakazela Ubuqiniso Bezingenayo"
#. Initialization dialog caption
#: src/include/iscsi-lio-server/wizards.rb:110
@@ -791,11 +823,11 @@
msgstr "Ilungiselela ukuqala..."
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save lio setup"
msgstr ""
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
msgid "Cannot save tcm setup"
msgstr ""
@@ -905,6 +937,21 @@
msgid "Configuration summary..."
msgstr "Amabalengwe okuhlela..."
+#, fuzzy
+#~| msgid "Clients"
+#~ msgid "Client"
+#~ msgstr "Ama-client"
+
+#, fuzzy
+#~| msgid "Clients"
+#~ msgid "Client Lun"
+#~ msgstr "Ama-client"
+
+#, fuzzy
+#~| msgid "NIS client"
+#~ msgid "Client name:"
+#~ msgstr "I-Client Ye-NIS"
+
#~ msgid "Run SuSEconfig"
#~ msgstr "Rana i-SuSEconfig"
Added: trunk/yast/zu/po/journalctl.zu.po
===================================================================
--- trunk/yast/zu/po/journalctl.zu.po (rev 0)
+++ trunk/yast/zu/po/journalctl.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -0,0 +1,125 @@
+# Zulu translations for opensuse-i package.
+# Copyright (C) 2016 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the opensuse-i package.
+# Automatically generated, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: opensuse-i 18n\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"PO-Revision-Date: 2016-08-04 14:55+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr ""
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr ""
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr ""
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr ""
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr ""
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr ""
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr ""
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr ""
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr ""
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:116
+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/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr ""
Modified: trunk/yast/zu/po/kdump.zu.po
===================================================================
--- trunk/yast/zu/po/kdump.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/kdump.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -401,10 +401,8 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
msgid "To apply changes a reboot is necessary."
msgstr "Ukuze kusebenze izinguquko kudingeka iqaliswe kabusha. "
@@ -1310,163 +1308,178 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
msgid "Use &Firmware-Assisted Dump"
msgstr ""
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:511
#, fuzzy
msgid "Initializing kdump Configuration"
msgstr "Ilungiselela Ukuqalisa Ukuhlelwa Kwemodemu"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
#, fuzzy
msgid "Reading the config file..."
msgstr "Ifunda ukuhlelwa kohlelo..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:522
#, fuzzy
msgid "Reading kernel boot options..."
msgstr "Ayikwazi ukufunda amasethingi avamile."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:524
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:530
#, fuzzy
msgid "Reading partitions of disks..."
msgstr "Ifunda ukuhlukanisa ngamakamelo..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:532
#, fuzzy
msgid "Reading available memory and calibrating usage..."
msgstr "Ifuna ukuthola amakhathalogi atholakalayo..."
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:544
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "Ayikwazi ukufunda ifayela lomiso /etc/sysconfig/kdump"
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:552
#, fuzzy
msgid "Cannot read kernel boot options."
msgstr "Ayikwazi ukufunda amasethingi avamile."
#. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:560
#, fuzzy
msgid "Cannot read available memory."
msgstr "Ayikwazi ukufunda ifayela '%1'"
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:586
#, fuzzy
msgid "Saving kdump Configuration"
msgstr "Igcina Ukuhlelwa Kwemodemu"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:615
msgid "Write the settings"
msgstr "Bhala amasethingi"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:617
#, fuzzy
msgid "Update boot options"
msgstr "Ongakhetha Kukho Kokuvuselela Uhlelo"
#. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:621
msgid "Writing the settings..."
msgstr "Ibhala amasethingi..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:623
#, fuzzy
msgid "Updating boot options..."
msgstr "Ivuselela ukuhlela..."
#. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:625
msgid "Finished"
msgstr "Iphothulile"
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:635
msgid "Cannot write settings."
msgstr "Ayikwazi ukubhala amasethingi."
#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:644
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "Ukwengeza i-parameter yekhenela yokucisha keisilayishi sokuqalisa"
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:764
#, fuzzy
msgid "Kdump status: %1"
msgstr "ku-runlevel %1"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "enabled"
msgstr "kuvuliwe"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "disabled"
msgstr "kucishiwe"
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:772
#, fuzzy
msgid "Value(s) of crashkernel option: %1"
msgstr "I-value engenalutho yokukhethiwe: %1"
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:779
#, fuzzy
msgid "Dump format: %1"
msgstr "&Fomatha"
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:786
#, fuzzy
msgid "Target of dumps: %1"
msgstr "Inani Elingenakweqiwa Lamafayela Amadala Agade Umonakalo"
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:793
#, fuzzy
msgid "Number of dumps: %1"
msgstr "Inani Elingenakweqiwa Lamafayela Amadala Agade Umonakalo"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:879
+#: src/modules/Kdump.rb:885
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:974
+#: src/modules/Kdump.rb:972
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/zu/po/live-installer.zu.po
===================================================================
--- trunk/yast/zu/po/live-installer.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/live-installer.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -37,17 +37,17 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
#, fuzzy
msgid "Evaluating filesystems to copy..."
msgstr "Ukuhlola ikamelo eliyinhloko (root partition). Sicela ulinde..."
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
#, fuzzy
msgid "Copying root filesystem..."
msgstr "Ihlola isistimu yamafayela..."
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
#, fuzzy
msgid "Copying live image..."
msgstr "Ikopisha amaphakheji..."
@@ -55,13 +55,13 @@
#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
#, fuzzy
msgid "Copying %1..."
msgstr "Iyakopisha..."
#. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -71,75 +71,56 @@
msgstr ""
#. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
msgid "Copying the live image to hard disk failed."
msgstr ""
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
msgid "Installation Settings"
msgstr "Amasethingi Okufaka"
#. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
#, fuzzy
msgid "Analyzing the system..."
msgstr "Ukuhlaziya isistimu yakho..."
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
msgid "Use %1%% of disk %2 for Linux"
msgstr ""
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
#, fuzzy
msgid "Do not use disk %1"
msgstr "&Ungayisebenzisi i-NIS"
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
msgid "Partitioning"
msgstr "Ukwenza amaphathishini "
#. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-#, fuzzy
-msgid "System start-up"
-msgstr "Amakhophi Agade Umonakalo Esistimu"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr ""
-
-#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
msgid "Keyboard"
msgstr "Ikhibhodi"
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
msgid "Time Zone"
msgstr "Izoni Yesikhathi"
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
#, fuzzy
msgid "Change Installation Settings"
msgstr "Amasethingi Okufaka"
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
#, fuzzy
msgid ""
"<p>\n"
@@ -150,7 +131,7 @@
" </p>\n"
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
#, fuzzy
msgid ""
"<p>\n"
@@ -163,7 +144,7 @@
" </p>\n"
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
#, fuzzy
msgid ""
"<p>\n"
@@ -257,7 +238,7 @@
msgstr ""
#. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
msgid "Copying files to installed system..."
msgstr "Ikopishela amafayela kwisistimu efakiwe..."
@@ -282,6 +263,10 @@
msgstr "Igcina izoni yesikhathi..."
#, fuzzy
+#~ msgid "System start-up"
+#~ msgstr "Amakhophi Agade Umonakalo Esistimu"
+
+#, fuzzy
#~ msgid "Installation settings"
#~ msgstr "Amasethingi Okufaka"
Modified: trunk/yast/zu/po/mail.zu.po
===================================================================
--- trunk/yast/zu/po/mail.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/mail.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: mail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -311,75 +311,80 @@
#. Translators: dialog caption
#. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
msgid "Outgoing Mail"
msgstr "Imeyili Ephumayo"
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr ""
+
#. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
msgid "TLS encryption"
msgstr ""
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
msgid "No"
msgstr "Cha"
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
#, fuzzy
msgid "Use"
msgstr "Umsebenzisi"
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
msgid "Enforce"
msgstr ""
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
msgid "&Masquerading"
msgstr "&Isifihlamagama"
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
msgid "&Authentication"
msgstr "&Ukugunyaza"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
msgid "Incoming Mail"
msgstr "Imeyili Engenile"
#. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
msgid "&Details..."
msgstr "&Imininingwane..."
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
#, fuzzy
msgid "Start &fetchmail"
msgstr "Qala Ukuthungatha"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
#, fuzzy
#| msgid "Manually"
msgid "manual"
msgstr "Lapho uzenzela mathupha"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
#, fuzzy
#| msgid "Daemon"
msgid "daemon"
msgstr "I-Daemon"
#. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
msgid "&Downloading"
msgstr "&Ukulanda"
#. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
msgid "&Aliases..."
msgstr "&Amagama..."
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
msgid "&Virtual domains..."
msgstr "&Ama-domain aqhelelene..."
@@ -387,7 +392,7 @@
#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
#. %2: file name (eg. /etc/sysconfig/postfix)
#. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
msgid ""
"To be able to deliver mail to your local MTA,\n"
"the value of %1 in %2 will be set to\n"
@@ -401,7 +406,7 @@
#. correct and complete. The login name may contain only
#. certain characters and must begin with a letter.
#. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
msgid ""
"The user login may contain only\n"
"lower case letters, digits, \"-\" and \"_\"\n"
@@ -414,39 +419,39 @@
" Sicela uzame futhi.\n"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
msgid "Sender address rewriting"
msgstr "Ibhala kabusha ikheli lothumele"
#. Translators: text entry label
#. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
#: src/include/mail/widgets.rb:269
msgid "&Local user"
msgstr "&Umsebenzisi oseduze"
#. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
msgid "&Display as"
msgstr "&Ivezwe njenge-"
#. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
msgid "The address for this user is already defined."
msgstr "Ikheli lalo mthumeli selichaziwe kakade"
#. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
msgid "The mail address format is incorrect."
msgstr "Ifomethi yekheli lemeyili inephutha."
#. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
msgid "Masquerading"
msgstr "Ifihla amagama"
#. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
msgid "Masquerade &local domains"
msgstr "Isifihlamagama &ama-domain aseduze"
@@ -456,23 +461,23 @@
#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
#. ),
#. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
msgid "Ma&squerade other domains"
msgstr "Ma&squerade namanye ama-domain"
#. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
msgid "Do&mains to masquerade"
msgstr "Do&mains okufihla amagama"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
msgid "Local user"
msgstr "Umsebenzisi oseduze"
#. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
msgid "Display as"
msgstr "Ivezwe njenge-"
@@ -481,23 +486,23 @@
#. ["holly", "jane", "tarzan"])),
#. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly(a)red.dwarf"))
#. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
msgid "A&dd"
msgstr "I-A&dd"
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
msgid "&Edit"
msgstr "&Hlela"
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
msgid "Dele&te"
msgstr "Su&sa"
#. Translators: error popup
#. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
msgid "The domain name is incorrect"
msgstr "Igama le-domain linephutha"
@@ -505,106 +510,106 @@
#. list<string> lmod = [];
#. list<map> mu = Mail::masquerade_users;
#. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
msgid "Outgoing Server Authentication"
msgstr "Ukugunyazwa Kwesiphakelalwazi Esiphumayo"
#. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
msgid "Outgoing &Server"
msgstr "Okuphumayo &Isiphakelalwazi"
#. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
msgid "&User name"
msgstr "&Igama lomsebenzisi"
#. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
msgid "&Password"
msgstr "&Iphasiwedi"
#. Translators: popup dialog heading
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
msgid "Mail downloading"
msgstr "Ilanda imeyili"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
msgid "Server"
msgstr "Isiphakelalwazi"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
msgid "Protocol"
msgstr "Iphrothokholi"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
msgid "User"
msgstr "Umsebenzisi"
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
msgid "De&lete"
msgstr "Su&sa"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
msgid "Incoming mail redirection"
msgstr "Ukuqondiswa kabusha kwemeyili engenayo"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
msgid "&Alias"
msgstr "&Amagama"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
msgid "&Destinations"
msgstr "&Izindawo okuthunyelwa kuzo"
#. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
msgid "The alias format is incorrect."
msgstr "Ifomethi yamagama inephutha"
#. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
msgid "The destinations for this alias are already defined."
msgstr "Sezichaziwe kakade izindawo okuzothunyelwa kuzo la magama."
#. Translators: dialog caption
#. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
msgid "Aliases"
msgstr "Amagama"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
msgid "Alias"
msgstr "Amagama"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
msgid "Destinations"
msgstr "Izindawo okuthunyelwa kuzo"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
msgid "Virtual domains"
msgstr "Ama-domain aqhelelene"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
msgid "Mail configuration"
msgstr "Ukuhlelwa kwemeyili"
#. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
msgid "Initializing..."
msgstr "Ilungiselela ukuqalisa..."
@@ -883,12 +888,12 @@
msgstr "Iya Esiphakelalwazini I-IMAP EseCyrus"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr "Kuzofakwa i-AMaViS, iskena sama-virus scanner.\n"
#. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
msgid ""
"AMaViS needs a virus scanner such as ClamAV\n"
"to do the actual scanning, but ClamAV was not found.\n"
@@ -899,58 +904,58 @@
" Hlola iskena wena mathupha."
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr "Kuzofakwa i-Fetchmail, okuyimeyili elanda izisetshenziswa.\n"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
#, fuzzy
#| msgid "Cyrus-imapd, an IMAP server, will be installed.\n"
msgid "Dovecot IMAP server, will be installed.\n"
msgstr "Kuzofakwa i-Cyrus-imapd, okuyisiphakelalwazi se-IMAP server.\n"
#. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
msgid "Initializing mail configuration"
msgstr "Ilungiselela ukuqala ukuhlelwa kwemeyili"
#. Translators: progress label
#. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
msgid "Determining Mail Transport Agent (MTA)"
msgstr "Ihlola i-Mail Transport Agent (MTA)"
#. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
msgid "Reading general settings"
msgstr "Ifunda amasethingi avamile"
#. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
msgid "Reading masquerading settings"
msgstr "Ifunda amasethingi ayizifihlamagama"
#. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
msgid "Reading downloading settings"
msgstr "Ifunda amasethingi okulanda"
#. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
msgid "Reading alias tables"
msgstr "Ifunda izinhlu zamagama"
#. Translators: progress label
#. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
msgid "Reading authentication settings..."
msgstr "Ifunda amasethingi agunyazayo..."
#. Translators: error message,
#. %1 is a file name,
#. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
#, fuzzy
msgid ""
"Error reading file %1. The file must have\n"
@@ -962,18 +967,18 @@
" %2"
#. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
msgid "Error writing the fetchmail configuration."
msgstr "Kwenzeke iphutha lapho ibhala ukuhlelwa kwe-fetchmail."
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
msgid "Error writing file %1"
msgstr "Kwenzeke iphutha lapho kubhalwa ifayela %1"
#. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
#, fuzzy
#| msgid "Error running SuSEconfig."
msgid "Error running config.postfix"
@@ -982,147 +987,147 @@
#. Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
msgid "Error starting service %1."
msgstr "Kwenzeke iphutha lapho iqalisa isevisi %1."
#. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
msgid "Writing general settings"
msgstr "Ibhala amasethingi avamile"
#. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
msgid "Writing masquerading settings"
msgstr "Ibhala amasethingi ayizifihlamagama"
#. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
msgid "Writing alias tables"
msgstr "Ibhala izinhlu zamagama"
#. Write them unconditionally, because it is now possible to
#. enter them also in the Permanent mode. Bug #17417.
#. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
msgid "Writing downloading settings"
msgstr "Ibhala amasethingi okulanda"
#. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
msgid "Writing authentication settings..."
msgstr "Ibhala amasethingi agunyazayo..."
#. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
msgid "Finishing writing configuration files"
msgstr "Isiyaqeda ukubhala amafayela okuhlela"
#. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
#, fuzzy
#| msgid "Routing Configuration"
msgid "Running Config Postfix"
msgstr "Ukuhlela Ukusebenzelana Kwezinhlelo"
#. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
msgid "Restarting services"
msgstr "Iqala kabusha amasevisi"
#. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
msgid "Saving mail configuration"
msgstr "Ilondoloza ukuhlelwa kwemeyili"
#. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
msgid "Other"
msgstr "Okunye"
#. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
msgid "Permanent"
msgstr "Okuhlala njalo"
#. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
msgid "Dial-up"
msgstr "Dayela"
#. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
msgid "None"
msgstr "Akukho lutho"
#. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
msgid "MTA"
msgstr "I-MTA"
#. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
msgid "Connection Type"
msgstr "Uhlobo Lokuxhumana"
#. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
msgid "Outgoing Mail Server"
msgstr "Isevisi Yemeyili Ethunyelwayo"
#. summary header; the "From: foo(a)bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
msgid "From Header"
msgstr "Ivela Kothumele Oboniswe Ngenhla"
#. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
msgid "Local Domains"
msgstr "Ama-domain Aseduze"
#. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
msgid "Masquerade Other Domains"
msgstr "Fihla Amagama Amanye Ama-domain"
#. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
msgid "Masquerade Users"
msgstr "Fihla Amagama Abasebenzisi"
#. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
msgid "Accept remote SMTP connections"
msgstr "Amukela ukuxhumana kwama-SMTP akude"
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
msgid "Yes"
msgstr "Yebo"
#. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
msgid "Use AMaViS"
msgstr "Sebenzisa i-AMaViS"
#. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
#, fuzzy
#| msgid "&Use NIS"
msgid "Use DKIM"
msgstr "&Sebenzisa I-NIS"
#. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
msgid "Fetchmail"
msgstr "I-Fetchmail"
#. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
msgid "Virtual Users"
msgstr "Abasebenzisi Abaqhelelene"
#. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
msgid "Authentication"
msgstr "Ukugunyaza"
Modified: trunk/yast/zu/po/network.zu.po
===================================================================
--- trunk/yast/zu/po/network.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/network.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -240,7 +240,7 @@
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
msgid "Host Configuration Summary:"
msgstr "Amabalengwe Okuhlela I-DNS"
@@ -361,13 +361,13 @@
msgstr "Ukufakwa kwemininingwane ephakiwe yamuva akuphumelelanga."
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
msgid "Opening of Connection"
msgstr "Ukuvula Ukuxhumana"
#. popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
@@ -376,13 +376,13 @@
"amalogi ukuze uthole imininingwane.\n"
#. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
+#: src/clients/inst_do_net_test.rb:870
msgid "No URL for the release notes defined. Internet test cannot be performed."
msgstr ""
#. popup informing user about the failure to retrieve release notes
#. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
#, fuzzy
msgid ""
"Download of latest release notes failed due to server-side error. \n"
@@ -400,7 +400,7 @@
"qhebeza okuthi <b>Khansela</b>.\n"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
#, fuzzy
msgid ""
"Download of latest release notes failed. View\n"
@@ -410,12 +410,12 @@
"amalogi ukuze uthole imininingwane.\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
msgid "Check for Patches"
msgstr "Hlola Izichibiyelo"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
@@ -424,7 +424,7 @@
"amalogi ukuze uthole imininingwane.\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
msgid "Closing of Connection"
msgstr "Ukuvaleka Kokuxhumana"
@@ -517,7 +517,7 @@
#. 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
+#: src/clients/lan_auto.rb:108
#, fuzzy
msgid "Configuration Error: uninitialized interface."
msgstr "Iphutha Lokuhlelwa : i-interface ayivulekanga!"
@@ -614,7 +614,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
msgid "Routing Configuration"
msgstr "Ukuhlela Ukusebenzelana Kwezinhlelo"
@@ -713,7 +713,7 @@
msgstr "Isango Le-inthanethi"
#. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
msgid "Netmask"
msgstr "I-Netmask"
@@ -731,87 +731,87 @@
#. Handler for action "list"
#. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
msgid "No entry for destination '%1' in routing table"
msgstr ""
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
#, fuzzy
msgid "%s forwarding is enabled"
msgstr "Ukuthumela i-IP: kuvuliwe"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
#, fuzzy
msgid "%s forwarding is disabled"
msgstr "Isilawuli se-infrared sicishiwe"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
#, fuzzy
msgid "Enabling %s forwarding..."
msgstr "Yenza Ukuthunyelwa &Kwe-IP Kusebenze"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
#, fuzzy
msgid "Disabling %s forwarding..."
msgstr "Yenza Ukuthunyelwa &Kwe-IP Kusebenze"
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
#, fuzzy
msgid "IPv4 Forwarding:"
msgstr "Ukuthumela i-IP: kuvuliwe"
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
#, fuzzy
msgid "IPv6 Forwarding:"
msgstr "Ukuthumela i-IP: kuvuliwe"
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
#, fuzzy
msgid "IPv4 and IPv6 Forwarding:"
msgstr "Ukuthumela i-IP: kuvuliwe"
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
#, fuzzy
msgid "At least destination and gateway IP addresses must be specified."
msgstr "Igama lengxenye kumelwe liboniswe."
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
#, fuzzy
msgid "Adding '%1' destination to routing table ..."
msgstr "Inezela amafayela ethebuleni..."
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
#, fuzzy
msgid "Destination IP address must be specified."
msgstr "Igama lengxenye kumelwe liboniswe."
-#: src/clients/routing.rb:348
+#: src/clients/routing.rb:349
msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
msgstr ""
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
#, fuzzy
msgid "Updating '%1' destination in routing table ..."
msgstr "Ivuselela izinkumusho kwimenu ye-boot loader..."
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
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:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
msgid "Warning: no encryption is used."
msgstr "Isixwayiso: akukho ukusetshenziswa kwamakhodi ayisivikelo"
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
msgid "Change."
msgstr "Shintsha."
@@ -912,72 +912,72 @@
msgstr "Ikhadi Lenethiwekhi Esebenza Ngamaza Omoya Le-USB"
#. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
msgid "Unknown Network Device"
msgstr "Idivayisi Yenethiwekhi Engaziwa"
#. Modem status (%1 is device)
#. ISDN device status (%1 is device)
#. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
msgid "Configured as %1"
msgstr "Ihlelwe njenge-%1"
#. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
msgid "Configured as %1 with provider %2"
msgstr "Ihlelwe njenge-%1 nomphakeli %2"
#. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
msgid "Configured as %1 with provider %2 (protocol %3)"
msgstr "Ihlelwe njenge-%1 nomphakeli %2 (iphrothokholi %3)"
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
#, fuzzy
msgid "Configured without address (NONE)"
msgstr "Ihlelwe nekhel i-%1"
#. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
#, fuzzy
msgid "Configured without an address"
msgstr "Ihlelwe nekhel i-%1"
#. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
msgid "Configured with address %1"
msgstr "Ihlelwe nekhel i-%1"
#. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
msgid "Configured with address %1 (remote %2)"
msgstr "Ihlelwe nekhel i-%1 (elikude %2)"
#. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
msgid "Configured with %1"
msgstr "Ihlelwe ne-%1"
#. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
msgid "Configured as %1 with address %2"
msgstr "Ihlelwe njenge-%1 nekheli %2"
#. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
msgid "Configured as %1 with address %2 (remote %3)"
msgstr "Ihlelwe njenge-%1 nekheli %2 (elikude %3)"
#. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
msgid "Configured as %1 with %2"
msgstr "Ihlelwe njenge-%1 ne-%2"
#. Abbreviation for "The interface is Managed by NetworkManager"
#. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
msgid "Managed"
msgstr "Iyalawula"
@@ -1119,12 +1119,12 @@
msgstr "&Khetha Ilogi:"
#. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
msgid "Additional Addresses"
msgstr "Amakheli Engeziwe"
#. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
#, fuzzy
#| msgid "IP Address"
msgid "IPv4 Address Label"
@@ -1132,16 +1132,16 @@
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "Ikheli Lomphakeli"
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/lan/address.rb:108
+#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "Ne&zela"
@@ -1150,8 +1150,8 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/lan/address.rb:110
+#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1161,176 +1161,176 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/lan/address.rb:112
+#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
msgstr "Su&sa"
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
msgid "&Name of Interface"
msgstr "&Igama Le-interface"
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
msgid "<p>TODO kind of vague!</p>"
msgstr "<p>Into engacacile ye-TODO!</p>"
#. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
#, fuzzy
msgid "Assign Interface to Firewall &Zone"
msgstr "Ama-Interface Enethiwekhi Kumazoni E-firewall: "
#. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
msgid "&Mandatory Interface"
msgstr "&I-Interface Eyisibopho"
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
#: src/include/network/lan/hardware.rb:351
msgid "&Device Type"
msgstr "&Uhlobo Lwedivayisi"
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
#: src/include/network/lan/hardware.rb:337
msgid "&Configuration Name"
msgstr "&Igama Lokuhlelwa"
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
msgid "Tunnel owner"
msgstr ""
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
#, fuzzy
msgid "Tunnel group"
msgstr "Nezela iqembu elisha"
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
#, fuzzy
msgid "Bridged Devices"
msgstr "Amadivayisi Emodemu"
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
#, fuzzy
msgid "Real Interface for &VLAN"
msgstr "Ama-Interface E-Firewall"
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
#, fuzzy
#| msgid "CHAN IDS"
msgid "VLAN ID"
msgstr "I-CHAN IDS"
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
#, fuzzy
#| msgid "Bond Slaves"
msgid "Bond Slaves and Order"
msgstr "Izinhlelo Ezincane Ezibhangqiwe"
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
#, fuzzy
#| msgid "&Up"
msgid "Up"
msgstr "&Phezulu"
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
#, fuzzy
#| msgid "&Down"
msgid "Down"
msgstr "&Phansi"
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
#, fuzzy
msgid "Bond &Slaves"
msgstr "Izinhlelo Ezincane Ezibhangqiwe"
#. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
#, fuzzy
msgid "&Bond Driver Options"
msgstr "Ongakukhetha Kuyi-driver Ehlanganisayo"
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
#, fuzzy
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr "<p>Khetha imininingwane ye-driver ehlanganisayo, bese uyilungisa uma kudingeka. </p>"
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr ""
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
msgid "Use iBFT Values"
msgstr ""
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
#, fuzzy
msgid "Dynamic Address"
msgstr "&Ikheli Eliyinhloko Lomphakeli"
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
#, fuzzy
msgid "DHCP both version 4 and 6"
msgstr "Uhlelo nokukhululwa komkhiqizo (Product version and release)"
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
#, fuzzy
msgid "DHCP version 4 only"
msgstr "Uhlelo 2 Lwe-LDAP"
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
#, fuzzy
msgid "DHCP version 6 only"
msgstr "Uhlelo 2 Lwe-LDAP"
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
#, fuzzy
msgid "Statically Assigned IP Address"
msgstr "Ikheli Le-IP Yaseduze"
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
msgid "&IP Address"
msgstr "&Ikheli Le-IP"
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
msgid "&Subnet Mask"
msgstr "&I-subnet Mask"
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
msgid "&Hostname"
msgstr "&Igama lesiphakeli"
#. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
msgid "R&emote IP Address"
msgstr "I&kheli Lomphakeli Okude"
#. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
msgid "The remote IP address is invalid."
msgstr "Ikheli lomphakeli okude akulona."
#. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
msgid "&S/390"
msgstr "&S/390"
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1030
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1341,13 +1341,13 @@
" wazi ukuthi leyo etholakele iyiphutha."
#. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1050
msgid "Configuration %1 already present."
msgstr "Ukuhlelwa %1 sekukhona kakade."
#. 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:1062
+#: src/include/network/lan/address.rb:1074
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1361,23 +1361,23 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1094
#, fuzzy
msgid "No valid IP address."
msgstr "Ikheli le-IP ledivayisi"
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1101
#, fuzzy
msgid "No valid netmask or prefix length."
msgstr "Faka igama lokungena elinembile."
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1109
#, fuzzy
msgid "Invalid hostname."
msgstr "Faka igama lokungena elinembile."
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1116
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1387,7 +1387,7 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1134
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1397,58 +1397,58 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1187
msgid "&General"
msgstr "&Okuvamile"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1198
#, fuzzy
msgid "Device Activation"
msgstr "&Ukuvulwa Kwedivayisi"
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1202
#, fuzzy
msgid "Firewall Zone"
msgstr "Ingosi &Yesihenqo Esivikelayo"
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1207
#, fuzzy
msgid "Maximum Transfer Unit (MTU)"
msgstr "Uhlelo lokuthumela imeyili"
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1217
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>Lungisa ukuhlelwa okuningiliziwe kwekhadi lenethiwekhi lapha.</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1284
msgid "&Address"
msgstr "&Ikheli"
#. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1287
msgid "<p>Configure your IP address.</p>"
msgstr "<p>Lungisa ikheli lomphakeli wakho.</p>"
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1293
msgid "&Hardware"
msgstr "&I-hardware"
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1300
#, fuzzy
msgid "&Bond Slaves"
msgstr "Izinhlelo Ezincane Ezibhangqiwe"
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1314
msgid "&Wireless"
msgstr "&Akuxhunyiwe Ngezintambo"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1398
#, fuzzy
#| msgid "Swap &Priority"
msgid "Ifplugd Priority"
@@ -1456,7 +1456,7 @@
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1404
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"
@@ -1466,13 +1466,24 @@
msgstr ""
#. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1486
#, fuzzy
msgid "Network Card Setup"
msgstr "Ikhadi Lenethiwekhi"
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
#, fuzzy
msgid ""
"At least one selected device is already configured.\n"
@@ -1669,25 +1680,25 @@
#. @param [Hash{String => String}] options action options
#. Handler for action "edit"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
#, fuzzy
msgid "Impossible value for bootproto."
msgstr "Akusona isilinganiso esifanele sale phrothokholi yokuqalisa!"
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
#, fuzzy
msgid "Impossible value for startmode."
msgstr "Akusona isilinganiso esifanele sohlelo lokuqalisa!"
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
msgid "For static configuration, the \"ip\" option is needed."
msgstr ""
#. Handler for action "delete"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
msgid "The device was deleted."
msgstr "Idivayisi ayitholakalanga."
@@ -1750,7 +1761,7 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
#, fuzzy
msgid ""
"Firmware is needed. Install it from \n"
@@ -1763,7 +1774,7 @@
" Ukuze ufake i-firmware, faka i-CD yokunezela yakwa-YaST bese ubuyela \n"
"kuleli bhokisi lokuhlela."
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
#, fuzzy
msgid ""
"The device needs a firmware to function properly. Usually, it can be\n"
@@ -1781,22 +1792,22 @@
#. - kernel modules (InstallKernel): before loaded
#. - wlan firmware: here, just because it is copied from modems
#. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
#, fuzzy
msgid "Installing firmware"
msgstr "Ifaka i-Firmware..."
-#: src/include/network/lan/complex.rb:233
+#: src/include/network/lan/complex.rb:232
msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
msgstr ""
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
#, fuzzy
msgid "An error occurred during firmware installation."
msgstr "Kwenzeke iphutha ngesikhathi kufakwa"
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -1811,12 +1822,12 @@
" i-interface ngeke isanakekelwa inethiwekhiManager.\n"
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:453
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr ""
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
msgid "Network Setup Method"
msgstr "Indlela Yokuhlela Inethiwekhi"
@@ -1825,7 +1836,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:519
+#: src/include/network/lan/complex.rb:515
#, fuzzy
msgid "Network Settings"
msgstr "Funda amasethingi enethiwekhi"
@@ -2007,7 +2018,7 @@
#. Selection box label
#. Selection box title
#: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
msgid "&Network Card"
msgstr "&Ikhadi Lenethiwekhi"
@@ -2017,7 +2028,7 @@
msgstr "&Cinga"
#. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
#, fuzzy
msgid ""
"Configuration name %1 already exists.\n"
@@ -2027,7 +2038,7 @@
"Khetha elihlukile."
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
msgid "S/390 Network Card Configuration"
msgstr "Ukuhlelwa Kwekhadi Lenethiwekhi u-S/390"
@@ -2035,135 +2046,135 @@
#. Frame label
#. Frame label
#. Frame label
-#: 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
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
msgid "S/390 Device Settings"
msgstr "Ukuhlelwa Kwedivayisi I-S/390"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
msgid "&Port Name"
msgstr "&Igama Lengosi"
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
#, fuzzy
msgid "Port Number"
msgstr "&Inombolo Ye-Port"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
msgid "&Enable IPA Takeover"
msgstr "&Vula Ukusebenza Kwe-IPA"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
msgid "Enable &Layer 2 Support"
msgstr "Vumela &I-Layer 2 Support"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
msgid "Layer2 &MAC Address"
msgstr "Ikheli le-Layer2 &MAC"
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
#, fuzzy
msgid "Read Channel"
msgstr "Isiteshi"
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
#, fuzzy
msgid "Write Channel"
msgstr "&Bhala Izinguquko Manje"
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
#, fuzzy
msgid "Control Channel"
msgstr "Ifayela yokulawula ishintshiwe."
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr "<p>Faka <b>Igama Lengosi</b> lale interface (bhala izinhlamvu ngendlela efanele).</p>"
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:950
msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
msgstr "<p>Faka okunye <b>Ongakhetha Kukho</b> kule interface (uhlukanise).</p>"
-#: src/include/network/lan/hardware.rb:954
+#: src/include/network/lan/hardware.rb:953
msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
msgstr "<p>Khetha <b>Ukuvula Ukusebenza Kwe-IPA </b> uma ikheli lomphakeli elizosebenza kule interface kufanele livunyelwe.</p>"
-#: src/include/network/lan/hardware.rb:957
+#: src/include/network/lan/hardware.rb:956
msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>Khetha <b>ukuVumela I-Layer 2 Support</b> uma leli khadi liye lahlelwa ngokwe-layer 2 support.</p>"
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:959
msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>Faka <b>Ikheli Le-Layer 2 MAC</b> uma leli khadi lihlelwe ukuba libambisane nabosizo lwe-layer 2.</p>"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
msgid "&Port Number"
msgstr "&Inombolo Ye-Port"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
msgid "&LANCMD Time-Out"
msgstr "&Ukuphela Kwesikhathi Se-LANCMD"
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr "<p>Khetha<b>Inombolo Ye-Port</b> ngale interface.</p>"
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr "<p>Bonisa<b>Ukuphela Kwesikhathi Se-SANCMD</b> ngale interface.</p>"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
msgid "Compatibility Mode"
msgstr "Imodi Yokuvumelana"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
msgid "Extended Mode"
msgstr "Imodi Ethuthukisiwe"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr "I-tty Esekelwe Kwi-CTC (Ukuxhumana kwe-Linux ukuya kwi-Linux"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr "Imodi Yokuvumelana ne-OS/390 ne-z/OS"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
msgid "&Protocol"
msgstr "&Iphrothokholi"
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr "<p>Khetha<b>Iphrothokholi</b> yale interface.</p>"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
msgid "&Peer Name"
msgstr "Igama Lamakhompuyutha Asebenzelanayo"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
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"
@@ -2171,8 +2182,7 @@
"<p>Faka igama lekhompuyutha esebenzelana ne-IUCV,\n"
"ngokwesibonelo, igama lomsebenzisi we-z/VM ozoxhumana naye (kunendaba ukuthi usebenzisa hlobo luni lonobumba).</p>\n"
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
#, fuzzy
msgid ""
"An error occurred while creating device.\n"
@@ -2181,7 +2191,7 @@
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
#, fuzzy
msgid "Hardware Dialog"
msgstr "Imininingwane ye-h&ardware"
@@ -2795,31 +2805,31 @@
" okutholakala kuyo lokho ongekhetha kukho.</p>"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
#, fuzzy
#| msgid "IP Address"
msgid "IPv4 &Address Label"
msgstr "Ikheli Lomphakeli"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
msgid "Net&mask"
msgstr "I-Net&mask"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
msgid "Label is too long."
msgstr ""
#. Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
msgid "The IP address is invalid."
msgstr "Ikheli lomphakeli akulona"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
msgid "The subnet mask is invalid."
msgstr "I-subnet mask akuyona."
@@ -2999,130 +3009,130 @@
#. Wireless authentication modes:
#. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
#, fuzzy
msgid "No Encryption"
msgstr "&Ukufaka Ikhodi Yokuphepha"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
msgid "WEP - Open"
msgstr ""
#. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
#, fuzzy
msgid "WEP - Shared Key"
msgstr "Isikhiye Esihlanganyelwayo"
#. ComboBox item
#. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
msgid "WPA-PSK (WPA version 1 or 2)"
msgstr ""
#. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
msgid "WPA-EAP (WPA version 1 or 2)"
msgstr ""
#. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
msgid "Wireless Network Card Configuration"
msgstr "Ukuhlelwa Kwekhadi Lenethiwekhi Esebenza Ngamaza Omoya"
#. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
msgid "Wireless Device Settings"
msgstr "Amasetingi Edivayisi Esebenza Ngamaza Omoya"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
msgid "O&perating Mode"
msgstr "Imodi E&sebenzayo"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
msgid "Ad-Hoc"
msgstr "Eyomsebenzisi Ozimele Yedwa"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
msgid "Master"
msgstr "I-master"
#. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
msgid "Ne&twork Name (ESSID)"
msgstr "Igama LeNe&thiwekhi (ESSID)"
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
#, fuzzy
msgid "Scan Network"
msgstr "Inethiwekhi Ewumthombo"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
msgid "&Authentication Mode"
msgstr "&Imodi Yokugunyaza"
#. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
msgid "&Encryption Key"
msgstr "&Isikhiye Sokufaka Amakhodi Okuphepha"
#. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
msgid "E&xpert Settings"
msgstr "Amasethingi O&ngoti"
#. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
msgid "&WEP Keys"
msgstr "&Izikhiye Ze-WEP"
#. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:558
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr "Imodi yokugunyaza ye-WPA ingenzeka kuphela kwimodi elawulwayo yokusebenza."
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:569
msgid "Specify the network name for this mode."
msgstr "Yisho igama lenethiwekhi lale modi."
#. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:576
msgid "The network name must be shorter than 32 characters."
msgstr "Igama lenethiwekhi kumelwe lingabi nezinhlamvu ezingaphezu kuka-32."
#. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:596
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "I-passphrase kumelwe ibe nezinhlamvu eziphakathi kuka-8 no-63 (sezihlangene)."
#. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:607
msgid "The key must have %1 hexadecimal digits."
msgstr "Isikhiye kumelwe sibe %1 namadijithi angama-hexadecimal."
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:619
+#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "Isikhiye sokufaka amakhodi asisebenzi."
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:627
msgid "The encryption key must be specified for this authentication mode."
msgstr "Isikhiye sokufaka amakhodi okuphepha kumelwe sibonise ngale modi yokugunyaza."
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:634
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3222,27 +3232,27 @@
msgstr "Imode &Ye-EAP"
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
msgid "Enter Encryption Key"
msgstr "Faka Isikhiye Sokufakwa Kwamakhodi Okuphepha"
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
msgid "&Key"
msgstr "&Isikhiye"
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
msgid "Help"
msgstr "Usizo"
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
msgid "Wireless Keys"
msgstr "Izikhiye Ezisebenza Ngamaza Omoya"
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
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"
@@ -3257,7 +3267,7 @@
" owodwa kuphela.</p>"
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
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"
@@ -3272,50 +3282,50 @@
" sibe ngu-64.</p>"
#. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
msgid "WEP Keys"
msgstr "Izikhiye Ze-WEP"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
msgid "&Key Length"
msgstr "&Ubude Besikhiye"
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
msgid "No."
msgstr "Ino."
#. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
msgid "Key"
msgstr "Ukhiye"
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
msgid "Default"
msgstr "Okufike Nohlelo (default)"
#. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
msgid "&Set as Default"
msgstr "&Setha Njenge-default"
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1214
msgid "Choose a Certificate"
msgstr "Khetha Isitifiketi"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1257
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:1283
+#: src/include/network/lan/wireless.rb:1285
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
@@ -3324,47 +3334,47 @@
"noma isitifiketi se-client."
#. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1331
msgid "WPA-EAP"
msgstr "WPA-EAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1353
msgid "Any"
msgstr "Noma yikuphi"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1357
msgid "MD5"
msgstr "MD5"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1359
msgid "GTC"
msgstr "GTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1361
msgid "CHAP"
msgstr "CHAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1363
msgid "PAP"
msgstr "PAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv1"
msgstr "MSCHAPv1"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1369
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1392
msgid "WPA-EAP Details"
msgstr "Imininingwane Ye-WPA-EAP"
@@ -3379,25 +3389,37 @@
#. RadioButton label
#: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
msgstr "&Vumela Ukuqondisa Okukude"
#. RadioButton label
#: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "&Vumela Ukuqondisa Okukude"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
msgid "&Do Not Allow Remote Administration"
msgstr "&Ungakuvumeli Ukuqondisa Okukude"
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
#, fuzzy
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
"administer this machine remotely from another machine. Use a VNC\n"
"client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
msgstr ""
"<p>Uma lolu hlelo luvuliwe, ungaqondisa\n"
"lomshini ukude komunye umshini. Sebenzisa i-client ye-VNC\n"
@@ -3406,17 +3428,17 @@
" Lolu hlobo lokuqondisa ukude aluphephile kunokusebenzisa i-SSH.</p>\n"
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
msgid "Remote Administration Settings"
msgstr "Amasethingi Okuqondisa Ukude"
#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
msgid "These packages need to be installed:"
msgstr "La maphakheji kudingeka afakwe (installed):"
#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3428,111 +3450,61 @@
" \n"
" Ufuna ukuzama futhi?\n"
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
msgid "Unknown"
msgstr "Akwaziwa"
-#. Popup headline
-#: src/include/network/routines.rb:279
-msgid "Configuration Successfully Saved"
-msgstr "Ukuhlela Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kwe-DNS Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kwe-DNS Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kweziphakeli Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kwe-ISDN Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kwekhadi Lenethiwekhi Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kwemodemu Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "Ukuhlela Kwe-proxy Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "Ukuhlela Komphakeli Kugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "Ukuhlelwa Kokuthuthwa Kokwaziswa Kugcinwe Ngempumelelo"
-
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "Hlela imeyili manje?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "Sebenzisa ukuhlelwa kwe-%1?"
-
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:829
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:1064
+#: src/include/network/routines.rb:889
msgid "Network Cards"
msgstr "Amakhadi Enethiwekhi"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:893
msgid "Modems"
msgstr "Amamodemu"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:897
msgid "ISDN Cards"
msgstr "Amakhadi e-ISDN"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:901
msgid "DSL Devices"
msgstr "Amadivayisi E-DSL"
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:906
msgid "All Network Devices"
msgstr "Wonke Amadivayisi Enethiwekhi"
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:387
msgid "The hostname is invalid."
msgstr "Igama lesiphakeli alisebenzi."
@@ -3609,8 +3581,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
msgid "Hostname and Domain Name"
msgstr "Igama Lesiphakeli Nele-Domain"
@@ -3638,28 +3610,28 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
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:520
+#: src/include/network/services/dns.rb:513
msgid "The search list can have at most %1 domains."
msgstr "Uhlu lokucinga lungaba nama-domain angu-%1 ubuningi."
#. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
msgid "The search list can have at most %1 characters."
msgstr "Uhlu lokucinga lungaba nezinhlamvu ezingu-%1 ubuningi."
#. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
msgid "The search domain '%1' is invalid."
msgstr "I-domain yokucinga '%1' ayisebenzi."
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
msgid "Hostname and Name Server Configuration"
msgstr "Ukuhlelwa Kwegama Lesiphakeli Negama Lesiphakelalwazi"
@@ -3693,27 +3665,27 @@
"<b>Amagama Abasebenzisi Besiphakeli</b> uma uthanda, kuhlukaniswe ngezikhala.</p>\n"
#. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
msgid "Current Hosts"
msgstr "Iziphakeli Zamanje"
#. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
msgid "Hostnames"
msgstr "Amagama eziphakeli"
#. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
msgid "Host Aliases"
msgstr "Amagama Abasebenzisi Besiphakeli"
#. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:340
msgid "Hos&t Aliases"
msgstr "Amagama Abase&benzisi Besiphakeli"
#. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:403
msgid "Alias name \"%1\" is invalid."
msgstr "Igama lesiphakeli %1 alisebenzi."
@@ -3757,43 +3729,43 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
msgid "&Destination"
msgstr "&Indawo oya kuyo"
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:171
#, fuzzy
#| msgid "Net&mask"
msgid "Ge&nmask"
msgstr "I-Net&mask"
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:180
msgid "&Gateway"
msgstr "&Isango Le-inthanethi"
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:188
#, fuzzy
msgid "De&vice"
msgstr "Idivayisi"
#. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:247
msgid "Destination is invalid."
msgstr "Indawo oya kuyo ayisebenzi."
#. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:255
msgid "Gateway IP address is invalid."
msgstr "Ikheli Le-IP lesango le-inthanethi alisebenzi."
#. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:263
msgid "Subnetmask is invalid."
msgstr "I-Subnetmask ayisebenzi."
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:422
msgid "The default gateway is invalid."
msgstr "Isango le-inthanethi eliyi-default alisebenzi."
@@ -4049,37 +4021,37 @@
"Be sure it's running and if not, start it manually."
msgstr ""
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
#, fuzzy
msgid "General Network Settings"
msgstr "Amasethingi Avamile"
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
#, fuzzy
msgid "IPv6 Protocol Settings"
msgstr "AmaPhrothokholi e-IP"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
msgid "Enable IPv6"
msgstr "Vula i-IPv6"
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
msgid "Unknown device"
msgstr "Idivayisi engaziwa"
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
msgid "DHCP address"
msgstr "Ikheli le- DHCP"
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
msgid "No IP address assigned"
msgstr "Alikho ikheli lomphakeli olinikiwe"
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
#, fuzzy
msgid ""
"%1 \n"
@@ -4087,12 +4059,12 @@
msgstr "Okulandelayo %1: %2 -- %3"
#. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
msgid "&Change Device"
msgstr "&Shintsha Idivayisi"
#. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
msgid "Network Device Select"
msgstr "Khetha Idivayisi Ye-nethiwekhi"
@@ -4101,7 +4073,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
#, fuzzy
#| msgid "Unconfigured"
msgid "configured"
@@ -4160,7 +4132,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
msgid "Update configuration"
msgstr "Vuselela ukuhlela"
@@ -4186,7 +4158,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
msgid "Updating configuration..."
msgstr "Ivuselela ukuhlela..."
@@ -4199,364 +4171,357 @@
msgstr "Ifunda i-/etc/modprobe.conf..."
#. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
msgid "Hostname: Set by DHCP"
msgstr "Igama Lesiphakeli: Isethwe Yi-DHCP"
#. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
msgid "Hostname: %1"
msgstr "Igama Lesiphakeli: %1"
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
msgid "Hostname will not be written to /etc/hosts"
msgstr "Igama lesiphakeli ngeke libhalwe ku-/etc/iziphakeli"
#. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
msgid "Name Servers: %1"
msgstr "Iziphakelalwazi Zegama: %1"
#. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
msgid "Search List: %1"
msgstr "Uhlu Lokucinga: %1"
#. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
#, fuzzy
msgid "Update /etc/hosts"
msgstr "Vuselela Amasethingi"
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
#, fuzzy
msgid "Saving Hostname Configuration"
msgstr "Igcina Ukuhlelwa Kwemodemu"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
#, fuzzy
msgid "Updating /etc/hosts ..."
msgstr "Ivuselela amaphakheji..."
#. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:276
msgid "Initializing Network Configuration"
msgstr "Ilungiselela Ukuqalisa Inethiwekhi"
#. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:289
msgid "Detect network devices"
msgstr "Thungatha amadivayisi enethiwekhi"
#. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:291
msgid "Read driver information"
msgstr "Funda ukwaziswa kwe-driver"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:293
msgid "Read device configuration"
msgstr "Funda ukuhlelwa kwedivayisi"
#. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:295
msgid "Read network configuration"
msgstr "Funda ukuhlelwa kwenethiwekhi"
#. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:297
msgid "Read firewall settings"
msgstr "Funda amasethingi esihenqo sokuvikela (firewall)"
#. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:299
msgid "Read hostname and DNS configuration"
msgstr "Funda ukuhlelwa kwesiphakeli ne-DNS"
#. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:301
msgid "Read installation information"
msgstr "Funda ukwaziswa kokufakwa kohlelo"
#. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:303
msgid "Read routing configuration"
msgstr "Funda ukuhlelwa kokuthuthwa kokwaziswa"
#. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:305
msgid "Detect current status"
msgstr "Thungatha isimo samanje"
#. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:319
#, fuzzy
msgid "Detecting ndiswrapper..."
msgstr "Ithungatha i-hardware..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:338
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
"Do you want to modprobe ndiswrapper?\n"
msgstr ""
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:346
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
msgstr ""
#. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:360
msgid "Detecting network devices..."
msgstr "Ithungatha amadivayisi enethiwekhi..."
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:368
msgid "Reading device configuration..."
msgstr "Ifunda ukuhlelwa kwedivayisi..."
#. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:374
msgid "Reading network configuration..."
msgstr "Ifunda ukuhelwa kwenethiwekhi..."
#. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:383
msgid "Reading firewall settings..."
msgstr "Ifunda amasethingi esihenqo sokuvikela..."
#. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:391
msgid "Reading hostname and DNS configuration..."
msgstr "Ifunda ukuhlelwa kwesiphakeli ne-DNS..."
#. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:398
msgid "Reading installation information..."
msgstr "Ifunda ukwaziswa kokufakwa kohlelo..."
#. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:404
msgid "Reading routing configuration..."
msgstr "Ifunda ukuhlelwa kokuthuthwa kokwaziswa..."
#. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:410
msgid "Detecting current status..."
msgstr "Ithungatha isimo samanje..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
msgid "Finished"
msgstr "Iphothulie"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:441
#, fuzzy
#| msgid "To apply changes a reboot is necessary."
msgid "To apply this change, a reboot is needed."
msgstr "Ukuze kusebenze izinguquko kudingeka iqaliswe kabusha. "
#. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:509
msgid "Saving Network Configuration"
msgstr "Igcina Ukuhlelwa Kwenethiwekhi"
#. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:516
msgid "Write drivers information"
msgstr "Ibhala ukwaziswa kwama-driver"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:518
msgid "Write device configuration"
msgstr "Bhala ukuhlelwa kwedivayisi"
#. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:520
msgid "Write network configuration"
msgstr "Bhala ukuhlelwa kwenethiwekhi"
#. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:522
msgid "Write routing configuration"
msgstr "Bhala ukuhlelwa kokuthuthwa kokwaziswa"
#. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:524
msgid "Write hostname and DNS configuration"
msgstr "Bhala ukuhlelwa kwesiphakeli ne-DNS"
#. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:526
msgid "Set up network services"
msgstr "Setha amasevisi enethiwekhi"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr "Bhala amasethingi efayawoli"
#. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:534
msgid "Activate network services"
msgstr "Vula amasevisi enethiwekhi"
#. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:550
msgid "Writing /etc/modprobe.conf..."
msgstr "Ibhala i-/etc/modprobe.conf..."
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:555
msgid "Writing device configuration..."
msgstr "Ibhala ukuhlelwa kwedivayisi..."
#. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:561
msgid "Writing network configuration..."
msgstr "Ibhala ukuhlelwa kwenethiwekhi..."
#. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:567
msgid "Writing routing configuration..."
msgstr "Ibhala ukuhlelwa kokuthuthwa kokwaziswa..."
#. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:575
msgid "Writing hostname and DNS configuration..."
msgstr "Ibhala ukuhlelwa kwesiphakeli ne-DNS..."
#. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:588
msgid "Setting up network services..."
msgstr "Isetha amasevisi enethiwekhi..."
#. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr "Ibhala amasethingi esihenqo esiyisivikelo..."
#. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:606
msgid "Activating network services..."
msgstr "Ivula amasevisi enethiwekhi..."
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:642
#, fuzzy
msgid "No network running"
msgstr "Funda amasethingi enethiwekhi"
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: 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:782
+#: src/modules/Lan.rb:759
msgid "Network Mode"
msgstr "Imodi Yenethiwekhi"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:764
#, fuzzy
msgid "Interfaces controlled by NetworkManager"
msgstr "&Iqondiswa Oyisebenzisayo ngenethiwekhiManager"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:766
msgid "Disable NetworkManager"
msgstr "Cisha Isilawuli Senethiwekhi"
#. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:770
#, fuzzy
msgid "Traditional network setup with NetControl - ifup"
msgstr "&Indlela Evamilenge-ifup"
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:773
msgid "Enable NetworkManager"
msgstr "Vula Isilawuli Senethiwekhi"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:779
#, fuzzy
msgid "Support for IPv6 protocol is enabled"
msgstr "Usizo Oluvuliwe Lwephrothokholi Ye-IPv6"
#. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:781
msgid "Disable IPv6"
msgstr "Cisha i-IPv6"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:785
#, fuzzy
msgid "Support for IPv6 protocol is disabled"
msgstr "Usizo Oluvuliwe Lwephrothokholi Ye-IPv6"
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:198
#, fuzzy
msgid "connected"
msgstr "(akuxhumekile)"
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:199
msgid "datagram"
msgstr ""
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
msgid "Started automatically at boot"
msgstr "Iqalise ngokuzenzakalelayo ekuqalisweni kwekhompuyutha"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1280
msgid "Started automatically on cable connection"
msgstr "Iqaliswe ngokuzenzakalelayo lapho ixhumana nekhebuli"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1284
msgid "Managed by NetworkManager"
msgstr "Ilawulwa yiSilawuli Senethiwekhi"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1288
msgid "Will not be started at all"
msgstr "Ngeke nhlobo iqaliswe"
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1294
msgid "Started manually"
msgstr "Iqaliswe mathupha"
#. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1306
#, fuzzy
msgid "IP address assigned using"
msgstr "Ikheli le-IP labiwe kusetshenziswa i-DHCP"
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1310
#, fuzzy
msgid "IP address: %s/%s"
msgstr "Ikheli le-IPv4"
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1313
#, fuzzy
#| msgid "IP address: %1, subnet mask %2"
msgid "IP address: %s, subnet mask %s"
@@ -4564,47 +4529,47 @@
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1337
msgid "Not configured"
msgstr "Ayihleliwe"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
#, fuzzy
#| msgid "Device Name: %1"
msgid "Device Name: %s"
msgstr "Igama Ledivayisi: %1"
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1380
#, fuzzy
#| msgid "Bond slaves"
msgid "Bonding slaves"
msgstr "Izigqila ze-bond"
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1394
msgid "enslaved in %s"
msgstr ""
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1395
#, fuzzy
#| msgid "&Ending Banner"
msgid "Bonding master"
msgstr "&Ibhanelo Lokuphothula"
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1409
#, fuzzy
msgid "Not connected"
msgstr "(akuxhumekile)"
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1410
msgid "No hwinfo"
msgstr ""
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1427
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 ""
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1433
#, fuzzy
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
@@ -4614,18 +4579,18 @@
"<b>Hlela Amakhadi Omsindo</b> ukuze uqalise ukuhlelwa kwemoduli yomsindo.\n"
" </P>"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
#, fuzzy
msgid "Needed firmware"
msgstr "Ukwaziswa Okudingekayo"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "unknown"
msgstr "akwaziwa"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:158
#, fuzzy
#| msgid "This package is not installed and it will not be installed."
msgid ""
@@ -4634,42 +4599,47 @@
msgstr "Le phakheji ayifakiwe futhi ngeke ifakwe."
#. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:203
#, fuzzy
msgid "Configure display manager"
msgstr "Hlela imeyili manje?"
#. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:208
#, fuzzy
msgid "Restart the services"
msgstr "Qala kabusha isevisi"
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:211
#, fuzzy
msgid "Saving Remote Administration Configuration"
msgstr "Igcina Ukuhlelwa Kwesiqalisi se-iSCSI"
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:220
#, fuzzy
msgid "Configuring display manager..."
msgstr "Ihlela Ulimi"
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:224
#, fuzzy
msgid "Restarting the service..."
msgstr "Iqala kabusha isevisi..."
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#. Install required packages
+#: src/modules/Remote.rb:261
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "Enabling service %{service} has failed"
msgstr "Ukuqalisa isevisi ye-'lirc' akuphumelelanga."
+#: src/modules/Remote.rb:267
+#, fuzzy
+#| msgid "Starting the 'lirc' service failed."
+msgid "Disabling service %{service} has failed"
+msgstr "Ukuqalisa isevisi ye-'lirc' akuphumelelanga."
+
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:295
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4677,33 +4647,33 @@
msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is enabled."
msgstr "Ukuqondisa kude kuvuliwe."
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is disabled."
msgstr "Ukuqondisa kude kuvuliwe."
#. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
#, fuzzy
msgid "Write IP forwarding settings"
msgstr "Ibhala amasethingi okulanda"
#. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
#, fuzzy
msgid "Write routing settings"
msgstr "Bhala amasethingi"
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
#, fuzzy
msgid "Saving Routing Configuration"
msgstr "Ukuhlela Ukusebenzelana Kwezinhlelo"
#. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
#, fuzzy
msgid "Writing IP forwarding settings..."
msgstr "Ibhala amasethingi esihenqo esiyisivikelo..."
@@ -4713,26 +4683,26 @@
#. 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:281
+#: src/modules/Routing.rb:284
#, fuzzy
msgid "Writing routing settings..."
msgstr "Ibhala amasethingi..."
#. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
#, fuzzy
#| msgid "Gateway: %1"
msgid "Gateway: %s"
msgstr "Isango Le-inthanethi: %1"
#. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
#, fuzzy
msgid "IP Forwarding for IPv4: %s"
msgstr "Ukuthumela i-IP: kuvuliwe"
#. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
#, fuzzy
msgid "IP Forwarding for IPv6: %s"
msgstr "Ukuthumela i-IP: kuvuliwe"
@@ -4753,6 +4723,42 @@
msgid "(Unprotected)"
msgstr "(Akuvikelwe)"
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "Ukuhlela Kugcinwe Ngempumelelo"
+
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kwe-DNS Kugcinwe Ngempumelelo"
+
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kwe-DNS Kugcinwe Ngempumelelo"
+
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kweziphakeli Kugcinwe Ngempumelelo"
+
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kwe-ISDN Kugcinwe Ngempumelelo"
+
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kwekhadi Lenethiwekhi Kugcinwe Ngempumelelo"
+
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kwemodemu Kugcinwe Ngempumelelo"
+
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "Ukuhlela Kwe-proxy Kugcinwe Ngempumelelo"
+
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "Ukuhlela Komphakeli Kugcinwe Ngempumelelo"
+
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "Ukuhlelwa Kokuthuthwa Kokwaziswa Kugcinwe Ngempumelelo"
+
+#~ msgid "Configure mail now?"
+#~ msgstr "Hlela imeyili manje?"
+
+#~ msgid "Run configuration of %1?"
+#~ msgstr "Sebenzisa ukuhlelwa kwe-%1?"
+
#~ msgid "Device boot protocol"
#~ msgstr "Iphrothokholi yokuqalisa idivayisi"
Modified: trunk/yast/zu/po/nfs.zu.po
===================================================================
--- trunk/yast/zu/po/nfs.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/nfs.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: nfs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -135,7 +135,7 @@
" u-0-9, A-Z, a-z, dots, -, nalolu _."
#. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
msgid ""
"fstab already contains an entry\n"
"with mount point '%1'."
@@ -144,7 +144,7 @@
"okunendawo yokuxhakathisa '%1'."
#. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
msgid ""
"The path entered is invalid.\n"
"It must be shorter than 70 characters\n"
@@ -385,12 +385,12 @@
msgstr "Ukuhlelwa Kwe-Client Ye-NFS"
#. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
msgid "Unable to create directory '%1'."
msgstr "Ayikwazi ukwakha i-directory '%1'."
#. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
msgid ""
"Unable to write to /etc/fstab.\n"
"No changes will be made to the\n"
@@ -401,52 +401,52 @@
" ekuhlelweni kwe-client ye-NFS.\n"
#. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
msgid "Writing NFS Configuration"
msgstr "Ibhala Ukuhlelwa Kwe-NFS"
#. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
msgid "Stop services"
msgstr "Misa amasevisi"
#. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
msgid "Start services"
msgstr "Qalisa amasevisi"
#. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
msgid "Stopping services..."
msgstr "Imisa amasevisi..."
#. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
msgid "Starting services..."
msgstr "Iqalisa amasevisi..."
#. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
msgid "Finished"
msgstr "Iphothulile"
#. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
msgid "Writing NFS client settings. Please wait..."
msgstr "Ibhala amasethingi e-NFS. Sicela ulinde..."
#. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr "Ayikwazi ukuxhakathisa okufakiwe kwe-NFS kwi-/etc/fstab."
#. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
msgid "NFS Entries"
msgstr "Okufakiwe Kwe-NFS"
#. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
msgid "%1 entries configured"
msgstr "%1 okufakiwe okuhleliwe"
Modified: trunk/yast/zu/po/nis.zu.po
===================================================================
--- trunk/yast/zu/po/nis.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/nis.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -256,9 +256,10 @@
msgstr "&Amakheli eziphakelalwazi Ze-NIS"
#. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "Uku&sakaza"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "&Ukusakaza"
#. pushbutton label, find nis servers
#. Shortcut must not conflict with Finish and Next (#29960)
@@ -373,11 +374,6 @@
msgstr "&Iziphakelalwazi (ezihlukaniswe ngezikhala noma ngawokhefana)"
#. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "&Ukusakaza"
-
-#. checkbox label
#: src/include/nis/ui.rb:859
msgid "&SLP"
msgstr "&SLP"
@@ -586,6 +582,9 @@
msgid "NIS server not found."
msgstr "Isiphakelalwazi se-NIS asitholakali."
+#~ msgid "Br&oadcast"
+#~ msgstr "Uku&sakaza"
+
#~ msgid "<p>If you are using <b>DHCP</b> and the server provides the NIS domain name or servers, you can enable their use here. DHCP itself can be set up in the network module.</p>"
#~ msgstr "<p>Uma usebenzisa i-<b>DHCP</b> futhi isiphakelalwazi sinikeza igama le-domain ye-NIS noma iziphakelalwazi, ungakwazi ukuzenza zisebenze lapha. I-DHCP ngokwayo ingasethwa kwimoduli yenethiwekhi.</p>"
Modified: trunk/yast/zu/po/ntp-client.zu.po
===================================================================
--- trunk/yast/zu/po/ntp-client.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/ntp-client.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: ntp-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -21,7 +21,7 @@
msgstr "Ibhala Ukuhlelwa Kwe-NIS..."
#. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
msgstr ""
@@ -30,68 +30,68 @@
msgstr ""
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
#, fuzzy
msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
msgstr "<p>Sebenzisa <b>Okulandelayo</b> ukuqhubeka nomiso.</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
msgstr ""
#. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
#, fuzzy
msgid "Invalid NTP server hostname %1"
msgstr "Faka igama lesiphakelalwazi elinembile."
#. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
#, fuzzy
msgid "&NTP Server Address"
msgstr "Ikheli Lesiphakelalwazi"
#. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
#, fuzzy
#| msgid "Restart NTP daemon"
msgid "&Run NTP as daemon"
msgstr "Qala kabusha i-daemon ye-NTP"
#. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
#, fuzzy
msgid "&Save NTP Configuration"
msgstr "Ukuhlelwe Kwe-NTP"
#. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
#, fuzzy
msgid "S&ynchronize now"
msgstr "&Vumelanisa Amaphasiwedi"
#. push button label
#. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
msgid "&Configure..."
msgstr "&Hlela..."
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
msgstr ""
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
#, fuzzy
msgid "Synchronizing with NTP server..."
msgstr "Izivumelanisa ne-ZENworks"
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
#, fuzzy
#| msgid "Connection to the LDAP server cannot be established."
msgid "Connection to selected NTP server failed."
@@ -99,7 +99,7 @@
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
msgid ""
"Test query to server '%1' failed.\n"
"If server is not yet accessible or network is not configured\n"
@@ -304,273 +304,267 @@
msgstr "Izamukeli Ze-JJY"
#. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
msgid "NTP client configuration module."
msgstr "Imoduli yokuhlela ye-client ye-NTP."
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
msgid "Print the status of the NTP daemon"
msgstr "Phrinta isimo se-daemon ye-NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
msgid "Print all configured synchronization relationships"
msgstr "Phrinta konke ukuhlobana kokuvumelanisa okuhleliwe"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
msgid "Enable the NTP daemon"
msgstr "Vula i-daemon ye-NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
msgid "Disable the NTP daemon"
msgstr "Cisha i-daemon ye-NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
msgid "Add new synchronization relationship"
msgstr "Nezela ukuhlobana kokuvumelanisa okusha"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
msgid "Edit existing synchronization relationship"
msgstr "Hlela ukuhloba okukhona kokuvumelanisa"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
msgid "Delete a synchronization relationship"
msgstr "Susa ukuhlobana kokuvumelanisa"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
msgid "The address of the server"
msgstr "Ikheli lesiphakelalwazi"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
msgid "The address of the peer"
msgstr "Ikheli lesisebenzelani"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
msgid "The address to which to broadcast"
msgstr "Ikheli okuzosakazwa kulo"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
msgid "The address from which to accept broadcasts"
msgstr "Ikheli elizokwamukela ukusakaza"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
msgid "The options of the relationship"
msgstr "Okukhethwa kukho kokuhlobana"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
msgid "Options for clock driver calibration"
msgstr "Okukhethwa kukho kokuhlolwa kwesilinganisi se-driver yewashi"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
msgid "Use the server for initial synchronization"
msgstr "Sebenzisa isiphakelalwazi ukuze uvumelanise okokuqala"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
msgid "Do not use the server for initial synchronization"
msgstr "Ungasisebenzisi isiphakelalwazi ukuze uvumelanise okokuqala"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
msgid "The synchronization peer not specified."
msgstr "Isisebenzelani sokulungelanisa asiboniswanga."
#. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
msgid "Specified synchronization peer not found."
msgstr "Isisebenzelani sokulungelanisa esibonisiwe asitholakali."
#. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is enabled."
msgstr "I-daemon ye-NTP ivuliwe."
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is disabled."
msgstr "I-daemon ye-NTP icishiwe."
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
msgid "Server"
msgstr "Isiphakelalwazi"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
msgid "Peer"
msgstr "Isisebenzelani"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
msgid "Broadcast"
msgstr "Ukusakaza"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
msgid "Accepting Broadcasts"
msgstr "Ukwamukela Ukusakaza"
#. table cell, %1 is integer 0-3
#. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
msgid "Unit Number: %1"
msgstr "Inombolo Yeyunithi: %1"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
msgid "Local Radio Clock"
msgstr "Iwashi Lomsakazo Lekhompuyutha Eseduze"
#. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
msgid "Reading the settings failed."
msgstr "Ukufunda amasethingi akuphumelelanga"
#. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
msgid "NTP Server Configuration"
msgstr " Ukuhlelwa Kwesiphakelalwazi Se-NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
msgid "NTP Configuration"
msgstr "Ukuhlelwe Kwe-NTP"
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "Amasethingi Esihenqo Esiyisivikelo"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
msgid "General Settings"
msgstr "Amasethingi Avamile"
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
msgid "Security Settings"
msgstr "Amasethingi Okuphepha"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
msgid "Advanced NTP Configuration"
msgstr "Ukuhlewa Kwe-NTP Okuthuthukisiwe"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
msgid "New Synchronization"
msgstr "Ukuvumelanisa Okusha"
#. Server editing dialog
#. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
msgid "Server Settings"
msgstr "Amasethingi Esiphakelalwazi"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
msgid "NTP Server"
msgstr "Isiphakelalwazi se-NTP"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
msgid "Local NTP Server"
msgstr "Isiphakelalwazi Se-NTP Esiseduze"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
msgid "Public NTP Server"
msgstr "Isiphakelalwazi Se-NTP Somphakathi"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
msgid "NTP Peer"
msgstr "Isisebenzelani Se-NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
msgid "Local Reference Clock"
msgstr "Iwasi Le-Local Reference"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
msgid "Outgoing Broadcast"
msgstr "Ukusakaza Okuphumayo"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
msgid "Incoming Broadcast"
msgstr "Ukusakaza Okungenayo"
#. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
msgid "&Reference ID"
msgstr "&I-ID Ye-Reference"
#. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
msgid "&Stratum"
msgstr "I-&Stratum"
#. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
msgid "Calibration Offset 1"
msgstr "I-Calibration Offset 1"
#. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
msgid "Calibration Offset 2"
msgstr "I-Calibration Offset 2"
#. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
msgid "Flag &1"
msgstr "Ifulegi &1"
#. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
msgid "Flag &2"
msgstr "Ifulegi &2"
#. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
msgid "Flag &3"
msgstr "Ifulegi &3"
#. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
msgid "Flag &4"
msgstr "Ifulegi &4"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
msgid "Clock Driver Calibration"
msgstr "I-Clock Driver Calibration"
#. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
msgid ""
"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -579,7 +573,7 @@
"Sicela ulinde...<br></p>"
#. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
msgid ""
"<p><b><big>Aborting Initialization:</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -588,7 +582,7 @@
"Liyeke ngokuphepha ithuluzi lokuhlela ngokucindezela u-<b>Yeka</b> manje.</p>"
#. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
msgid ""
"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -597,7 +591,7 @@
"Sicela ulinde...<br></p>"
#. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -607,17 +601,15 @@
"Yeka inqubo yokugcina ukwaziswa ngokucindezela u-<b>Yeka</b>.\n"
" Idayalogu eyengeziwe izokwazisa ukuthi kuphephile yini ukwenza kanjalo.</p>"
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
#, fuzzy
msgid ""
"<p><b><big>Start NTP Daemon</big></b><br>\n"
"Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
msgstr ""
"<p><b><big>Qalisa ngokuzenzakalelayo I-Daemon Ye-NTP</big></b><br>\n"
"Khetha ukuthi uyiqalise yini i-daemon ye-NTP lapho uqalisa isistimu. I-daemon\n"
@@ -646,7 +638,7 @@
msgstr ""
#. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
msgid ""
"<p><b><big>Configuring via DHCP</big></b><br>\n"
"To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -661,7 +653,7 @@
" ukwaziswa ngeziphakelalwazi ze-NTP kuhlinzekwa yisiphakelalwazi se-DHCP.</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
msgid ""
"<p><b><big>Configured Servers</big></b><br>\n"
"To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -676,7 +668,7 @@
" sikhethe bese uchofoza u-<b>Susa</b>.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
#, fuzzy
msgid ""
"<p><b><big>Display Log</big></b></p>\n"
@@ -686,7 +678,7 @@
"Ukubheka amalogi e-daemon ye-NTP esibukweni esisha, chofoza inkinobho ethi<b>Veza Ilogi</b>.</p>"
#. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
msgid ""
"<p><b><big>Advanced configuration</big></b><br>\n"
"To configure this host to synchronize against multiple remote hosts or against\n"
@@ -697,7 +689,7 @@
" newashi elixhunywe ekhompuyutheni, sebenzisa u-<b>Ukuhlelwa Okuthuthukisiwe</b>."
#. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
msgid ""
"<p><b><big>Clock Type</big></b><br>\n"
"Select the driver for the clock to configure.</p>"
@@ -706,7 +698,7 @@
"Khetha i-driver yewashi ozolihlela.</p>"
#. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
msgid ""
"<p><b><big>Unit Number</big></b><br>\n"
"If you have multiple clocks of the same type, you must set\n"
@@ -717,7 +709,7 @@
" <b>Inombolo Yeyunithi</b>.</p>"
#. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
msgid ""
"<p><b><big>Device</big></b><br>\n"
"To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -736,7 +728,7 @@
" noma kumelwe yakhiwe nguwe mathupha.</p>"
#. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
msgid ""
"<p><b><big>Driver Calibration</big></b><br>\n"
"To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -745,7 +737,7 @@
"Ukuze ulinganise i-driver yewashi, chofoza <b>Ukulinganisa I-Driver</b>.</p>"
#. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
msgid ""
"<p><b><big>Address of the NTP Server</big></b><br>\n"
"To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -758,7 +750,7 @@
" e-Inthanethi.</p>"
#. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
msgid ""
"<p><b><big>Selecting a Server</big></b><br>\n"
"To select an NTP server from those found in the local network\n"
@@ -771,7 +763,7 @@
" ukhetha phakathi kokuthi <b>Isiphakelalwazi Se-NTP Sasekhaya</b> kanye nokuthi <b>Isiphakelalwazi Se-NTP Somphakathi</b>.</p>"
#. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
msgid ""
"<p><b><big>Testing Server Accessibility</big></b><br>\n"
"To test if the selected server is up and responds properly,\n"
@@ -782,7 +774,7 @@
" chofoza u-<b>Hlola</b>.</p>"
#. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address of the host with which to synchronize mutually,\n"
@@ -793,7 +785,7 @@
" sebenzisa <b>Ikheli</b>.</p>"
#. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -804,7 +796,7 @@
".</p>"
#. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address from which to accept broadcast packets, use \n"
@@ -816,7 +808,7 @@
#. help text 2/4, was removed
#. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
#, fuzzy
msgid ""
"<p><b><big>Options</big></b><br>\n"
@@ -829,7 +821,7 @@
" <b>Okukhethwa kukho</b>. Ukuze uthole imininingwane, bheka \n"
" <i>/usr/share/doc/packages/xntp-doc/html/confopt.htm</i>.</p>"
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
msgid ""
"<p><b><big>Access Control Options</big></b><br>\n"
"Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -841,7 +833,7 @@
msgstr ""
#. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
msgid ""
"<p><b><big>Synchronization Peer Type</big></b><br>\n"
"Select the kind of synchronization peer to add here.</p>"
@@ -850,7 +842,7 @@
"Khetha uhlobo lwezisebenzisani zokuvumelanisa ozozenezela lapha.</p>"
#. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
msgid ""
"<p>To add an NTP server to which to synchronize,\n"
"select <b>Server</b>.</p>"
@@ -859,7 +851,7 @@
"khetha <b>Isiphakelalwazi</b>.</p>"
#. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
msgid ""
"<p>To add an NTP peer to synchronize mutually, select\n"
"<b>Peer</b>.</p>"
@@ -868,7 +860,7 @@
"<b>Izisebenzisani</b>.</p>"
#. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
msgid ""
"<p>To configure a local clock connected directly to your computer,\n"
"select <b>Radio Clock</b>.</p>"
@@ -877,7 +869,7 @@
"khetha <b>Iwashi Lomsakazo</b>.</p>"
#. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
msgid ""
"<p>To broadcast time information through your network, select\n"
"<b>Outgoing Broadcast</b>.</p>"
@@ -886,7 +878,7 @@
"<b>Ukusakaza Okuphumayo</b>.</p>"
#. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
msgid ""
"<p>To accept NTP packets broadcasted by other hosts on the network\n"
"and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
@@ -895,7 +887,7 @@
"futhi uzisebenzisele ukusetha isikhathi sendawo, khetha u-<b>Ukusakaza Okungenayo<b>.</p>"
#. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
msgid ""
"<p><big><b>Server Location</b></big>\n"
"Select if you want to find the NTP server in the local network or select\n"
@@ -906,7 +898,7 @@
" isiphakelalwazi se-NTP ohlwini lweziphakelalwazi ezaziwayo ze-NTP.</p>"
#. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
msgid ""
"<p><big><b>Finding Server in the Local\n"
"Network</b></big><br>\n"
@@ -921,7 +913,7 @@
" Khetha isiphakelalwazi ohlwini lweziphakelalwazi ezitholiwe.</p>"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
msgid ""
"<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
"Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -932,7 +924,7 @@
" iziphakelalwazi ze-NTP zezwe elithile kuphela, khetha <b>Izwe</b>.</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
msgid ""
"<p><big><b>Note</b></big><br>\n"
"The listed NTP servers may not be available from any country, but only\n"
@@ -953,7 +945,7 @@
" ukuze uthole isiphakelalwazi se-NTP esiseduze nawe.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
msgid ""
"<p><big><b>Testing Server Accessibility</b></big><br>\n"
"To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -963,7 +955,7 @@
#. help text connected with checkbox: "Use Random Server from pool.ntp.org"
#. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
msgid ""
"<p><big><b>Use Random Servers</b></big><br>\n"
"This service is offered by pool.ntp.org. If you select this option,\n"
@@ -978,7 +970,7 @@
" i-TNP client yakho ivunyelaniswa neziphakelalwazi ezihlukahlukene ihora ngalinye.</p>\n"
#. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
msgid ""
"<p><big><b>Clock Driver Calibration</b></big><br>\n"
"The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -991,7 +983,7 @@
" yohlobo lwako. Amanye ama-driver awasebenzi kukho konke okungase kukhethwe.</p>"
#. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
#, fuzzy
msgid ""
"To learn more about available options, install the package\n"
@@ -1011,17 +1003,17 @@
"Zonke izinguquko zilalahleka."
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
msgid "Restart NTP Daemon"
msgstr "Qala kabusha i-daemon ye-NTP"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
msgid "Save Settings and Restart NTP Daemon"
msgstr "Gcina Amasethingi Bese Uqala Kabusha I-daemon Ye-NTP"
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
msgid ""
"Warning!\n"
"\n"
@@ -1036,7 +1028,7 @@
" futhi i-daemon ingase ingasebenzi kahle."
#. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
msgid ""
"NTP server '%1' is not a valid hostname,\n"
"fully qualified hostname, IPv4 address, or IPv6 address."
@@ -1045,7 +1037,7 @@
"isiphakeli esifaneleka ngokugcwele, Ikheli le-IPv4, noma ikheli le-IPv6."
#. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
msgid ""
"Enabling Random Servers from pool.ntp.org would\n"
"replace the current NTP server.\n"
@@ -1058,44 +1050,44 @@
" Uyasishintsha ngempela isiphakelalwazi samanje se-NTP?"
#. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
msgid "Select the Device"
msgstr "Khetha Idivayisi"
#. selection box header
#. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
msgid "Public NTP &Servers"
msgstr "Iziphakelalwazi Ze-NTP &Zomphakathi"
#. message report (no server selected)
#. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
msgid "Select an NTP server."
msgstr "Khetha isiphakelalwazi se-NTP."
#. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
msgid "All Countries"
msgstr "Wonke Amazwe"
#. combo box header
#. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
msgid "&Country"
msgstr "&Izwe"
#. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
msgid "Scanning for NTP servers on your network..."
msgstr "Iskenela ukuthola iziphakelalwazi ze-NTP kwinethiwekhi yakho..."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
#. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
msgid ""
"No NTP server has been found on your network.\n"
"This could be caused by a running SuSEfirewall2,\n"
@@ -1106,216 +1098,216 @@
" cishe okungenzeka ivimba ukuskenwa kwenethiwekhi."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
msgid "No NTP server has been found on your network."
msgstr "Asikho isiphakelalwazi se-NTP esiye satholakala kwinethiwekhi yakho."
#. combo box label
#. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
msgid "Address"
msgstr "Ikheli"
#. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
msgid "No server is selected."
msgstr "Asikho isiphakelalwazi esikhethiwe."
#. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
msgid "A&ddress"
msgstr "I&kheli"
#. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
msgid "Ad&vanced Configuration"
msgstr "Ukuhlela Ok&uthuthukisiwe"
#. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
msgid "&Driver Calibration"
msgstr "&Ukulinganisa I-Driver"
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
#, fuzzy
#| msgid "Remote Synchronization"
msgid "&Interval of the Synchronization in Minutes"
msgstr "Ukuvumelanisa Nokukude"
#. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
#, fuzzy
msgid "Start NTP Daemon"
msgstr "Qala kabusha i-daemon ye-NTP"
#. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
#, fuzzy
msgid "Only &Manually"
msgstr "&Lapho uzenzela mathupha"
#. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
#, fuzzy
#| msgid "Synchronizing with ZENworks"
msgid "&Synchronize without Daemon"
msgstr "Izivumelanisa ne-ZENworks"
#. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
msgid "Now and on &Boot"
msgstr ""
#. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
msgid "Run NTP Daemon in Chroot &Jail"
msgstr "Yenza I-daemo Ye-NTP isebenze kwi-Chroot &Jail"
#. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
msgid "&Restrict NTP Service to Configured Servers Only "
msgstr ""
#. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
#, fuzzy
msgid "Manual"
msgstr "Lapho uzenzela mathupha"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
#, fuzzy
msgid "Auto"
msgstr "Okuzenzekelayo"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
msgid "Custom"
msgstr "I-Custom"
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
#, fuzzy
msgid "&Runtime Configuration Policy"
msgstr "Amabalengwe okuhlelwa kwegundane."
#. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
#, fuzzy
msgid "&Custom Policy"
msgstr "&Inqubomgomo Yokusetshenziswa Komsindo"
#. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
msgid "&Use Random Servers from pool.ntp.org"
msgstr "&Sebenzisa Iziphakelalwazi Ezingahleliwe kwi-pool.ntp.org"
#. text entry label
#. text entry
#. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
msgid "&Address"
msgstr "&Ikheli"
#. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
msgid "&Select..."
msgstr "&Khetha..."
#. push button
#. push button
#. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
msgid "&Test"
msgstr "&Hlola"
#. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
msgid "Synchronization Type"
msgstr "Uhlobo Lokuvumelanisa"
#. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
msgid "Display &Log..."
msgstr "Veza &Ilogi..."
#. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
msgid "Clock &Type"
msgstr "Uhlobo &Lwewashi"
#. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
msgid "Unit &Number"
msgstr "Inombolo &Yeyunithi"
#. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
msgid "Create &Symlink"
msgstr "Yakha &ISymlink"
#. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
msgid "&Device"
msgstr "&Idivayisi"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
#, fuzzy
msgid "Access Control Options"
msgstr "&Izinhlu Zokulawulwa Kokungena (ACL)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
msgid "&Server"
msgstr "&Isiphakelalwazi"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
msgid "&Peer"
msgstr "&Isisebenzelani"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
msgid "&Radio Clock"
msgstr "&Iwashi Lomsakazo"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
msgid "&Outgoing Broadcast"
msgstr "&Ukusakaza Okuphumayo"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
msgid "&Incoming Broadcast"
msgstr "&Ukusakaza Okungenayo"
#. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
msgid "Type"
msgstr "Uhlobo"
#. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
msgid "Loc&al Network"
msgstr "Inethiwekhi Yas&khaya"
#. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
msgid "&Public NTP Server"
msgstr "&Isiphakelalwazi Se-NTP Somphakathi"
#. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
msgid "NTP Server Location"
msgstr "Indawo Yesiphakelalwazi Se-NTP"
#. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
msgid "&Lookup"
msgstr "&Funa"
@@ -1329,155 +1321,166 @@
msgid "Initializing ..."
msgstr "Ilungiselela ukuqala..."
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "Ilungiselela Ukuqalisa Ukuhlelwa Kwe-NTP Client"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "Funda ukuhlelwa kwenethiwekhi"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "Funda amasethingi e-NTP"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "Ifunda ukuhlelwa kwenethiwekhi..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "Ifunda amasethingi e-NTP..."
-
-#. progress step
#. While calling "yast clone_system" it is possible that
#. the ntp server has not already been installed at that time.
#. (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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
#. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
msgid "Finished"
msgstr "Iphothulile"
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "Ukugcina Ukuhlelwa Kwe-NTP Client"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "Bhala amasethingi e-NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "Qala kabusha i-daemon ye-NTP"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "Ibhala amasethingi..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "Iqala kabusha i-daemon ye-NTP..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-#, fuzzy
-msgid "Cannot update the dynamic configuration policy."
-msgstr "Ayikwazi ukufunda umiso."
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "Ayikwazi ukuqalisa kabusha i-daemon ye-NTP."
-
#. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
msgid "The NTP daemon starts when starting the system."
msgstr "I-daemon ye-NTP iqala lapho uqalisa isistimu."
#. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
msgid "The NTP daemon does not start automatically."
msgstr "I-daemon ye-NTP ayiqalisi ngokuzenzakalelayo."
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
msgid "Servers: %1"
msgstr "Iziphakelalwazi: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
msgid "Radio Clocks: %1"
msgstr "Amawashi Omsakazo: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
msgid "Peers: %1"
msgstr "Okusebenzelanayo: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
msgid "Broadcast time information to: %1"
msgstr "Sakaza ukwaziswa ngesikhathi ku: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
msgid "Accept broadcasted time information from: %1"
msgstr "Yamukela ukwaziswa ngesikhathi okusakaziwe kuvela ku-: %1"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
#, fuzzy
msgid "Combine static and DHCP configuration."
msgstr "Bhala ukuhlelwa kwesiphakeli ne-DNS"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
#, fuzzy
msgid "Static configuration only."
msgstr "Ivuselela amafayela okuhlela..."
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
#, fuzzy
msgid "Custom configuration policy."
msgstr "Amabalengwe okuhlelwa kwegundane."
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
msgid "Testing the NTP server..."
msgstr "Ukuhlola isiphakelalwazi se-NTP..."
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
msgid "Server is reachable and responds properly."
msgstr "Isiphakelalwazi siyafinyeleleka futhi sisabela kahle."
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
msgid "Server is unreachable or does not respond properly."
msgstr "Isiphakelalwazi asifinyeleleki noma asisabeli kahle."
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
msgstr ""
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "Ilungiselela Ukuqalisa Ukuhlelwa Kwe-NTP Client"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "Funda ukuhlelwa kwenethiwekhi"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "Funda amasethingi e-NTP"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "Ifunda ukuhlelwa kwenethiwekhi..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "Ifunda amasethingi e-NTP..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "Ukugcina Ukuhlelwa Kwe-NTP Client"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "Bhala amasethingi e-NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "Qala kabusha i-daemon ye-NTP"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "Ibhala amasethingi..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "Iqala kabusha i-daemon ye-NTP..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+#, fuzzy
+msgid "Cannot update the dynamic configuration policy."
+msgstr "Ayikwazi ukufunda umiso."
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "Ayikwazi ukuqalisa kabusha i-daemon ye-NTP."
+
+#~ msgid "Firewall Settings"
+#~ msgstr "Amasethingi Esihenqo Esiyisivikelo"
+
#~ msgid "Cannot write sysconfig variables."
#~ msgstr "Ayikwazi ukubhala ama-variable e-sysconfig."
Modified: trunk/yast/zu/po/packager.zu.po
===================================================================
--- trunk/yast/zu/po/packager.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/packager.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -428,7 +428,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:95
#, fuzzy
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr ""
@@ -549,7 +549,7 @@
#. dialog caption
#. dialog caption
#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/modules/AddOnProduct.rb:688
msgid "Initializing..."
msgstr "Ilungiselela ukuqala..."
@@ -574,12 +574,6 @@
msgid "&Media"
msgstr "&Mediya"
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-#, fuzzy
-msgid "Saving the software manager configuration..."
-msgstr "Ilondoloza ukuhlelwa komqondisi wamaphakheji..."
-
#. default (minimal) priority of a repository
#: src/clients/repositories.rb:58
#, fuzzy
@@ -619,7 +613,7 @@
#. 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/modules/AddOnProduct.rb:1351
msgid "URL: %1"
msgstr "I-URL: %1"
@@ -903,7 +897,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:1040 src/modules/Packages.rb:1328
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Imininingwane:"
@@ -911,7 +905,7 @@
#. 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:1042 src/modules/Packages.rb:1336
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Ungathanda ukuzama futhi?"
@@ -1522,50 +1516,50 @@
msgstr "Uyakusula ngempela '%1'?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:81
#, fuzzy
msgid "Adding a New Repository"
msgstr "Inezela ikhathalogi..."
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
#, fuzzy
msgid "Check Repository Type"
msgstr "Khetha Uhlobo Lombiko"
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:86
#, fuzzy
msgid "Add Repository"
msgstr "&Inqolobane Yephrofayili:"
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:87
#, fuzzy
msgid "Read Repository License"
msgstr "Amakhathalogi Abhalisiwe"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
#, fuzzy
msgid "Checking Repository Type"
msgstr "Yakha umthombo %1"
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:91
#, fuzzy
msgid "Adding Repository"
msgstr "Inezela ikhathalogi..."
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:92
#, fuzzy
msgid "Reading Repository License"
msgstr "Yakha umthombo %1"
#. 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:156
#, fuzzy
msgid "Repository"
msgstr "&Inqolobane Yephrofayili:"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:228
#: src/modules/SourceManager.rb:330
#, fuzzy
#| msgid ""
@@ -1589,8 +1583,8 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
#, fuzzy
msgid ""
"Unable to create repository\n"
@@ -1600,25 +1594,31 @@
"kwi-URL '%1'."
#. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:335
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:345
#, fuzzy
msgid "Change the URL and try again?"
msgstr "Shintsha Okukhethile"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:422
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
msgstr ""
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+#, fuzzy
+msgid "Saving the software manager configuration..."
+msgstr "Ilondoloza ukuhlelwa komqondisi wamaphakheji..."
+
#. New add-on product might add also new agents.
#. Functions Rereads all available agents.
#.
@@ -1626,20 +1626,20 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
msgid "An error occurred while preparing the installation system."
msgstr "Kwenzeke iphutha ngesikhathi ulungiselela isistimu yokufaka amafayela."
#. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:659
#, fuzzy
msgid "Control file %1 not found on media."
msgstr "Ifayela yokuhlela ayizange itholakale noma ayinalutho"
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:900
#, fuzzy
#| msgid "Package %1 was not installed. The service cannot be edited."
msgid ""
@@ -1647,76 +1647,83 @@
"The add-on product cannot be registered."
msgstr "Iphakheji %1 ayizange ifakwe. Isevisi ayihleleki."
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+#, fuzzy
+msgid "Unknown Product"
+msgstr "Imodi Engaziwa"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+msgid "Re&lease Notes..."
+msgstr "Ukwaziswa Okuphathelene Nohlelo"
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
#, fuzzy
msgid "Unable to use additional products."
msgstr "Faka i-CD enesenezeli"
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
#, fuzzy
msgid "%1, URL: %2"
msgstr "I-URL: %1"
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1345
#, fuzzy
msgid "URL: %1, Path: %2"
msgstr "I-URL: %1, I-Directory: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1376
#, fuzzy
msgid "Additional Products"
msgstr "Ukwaziswa Okwengeziwe"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1382
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:1393
#, fuzzy
msgid "Additional Products to Select"
msgstr "Ukukhethwa Komkhiqizo"
#. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1400
#, fuzzy
msgid "Add Selected &Products"
msgstr "Imikhiqizo Eyenezelwayo"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1532
#, fuzzy
#| msgid "Insert the add-on product CD"
msgid "Insert the addon %1 medium"
msgstr "Faka i-CD enesenezeli"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1537
#, fuzzy
#| msgid "Insert the first installation medium."
msgid "Insert the %1 %2 medium"
msgstr "Faka imidiyamu yokufaka uhlelo yokuqala."
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1589
#, fuzzy
msgid "Unable to add product %1."
msgstr "Ayikwazi ukubhala i-%1."
-#. 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/Packages.rb:471
-#, fuzzy
-msgid "Unknown Product"
-msgstr "Imodi Engaziwa"
-
#. update the trusted flag
#: src/modules/KeyManager.rb:214
#, fuzzy
@@ -1746,31 +1753,31 @@
"kwi-directory.\n"
#. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
msgid "&Show Failed Packages List"
msgstr "&Bonisa Uhlu Lwamaphakheji Angaphumelelanga"
#. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
msgid "&Show Full Log"
msgstr "&Bonisa Ilogi Ephelele"
#. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
#, fuzzy
#| msgid "Installation of Some Packages Failed"
msgid "Installation of some Packages Failed"
msgstr "Ihlulekile Ukufaka Amanye Amaphakheji"
#. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
#, fuzzy
#| msgid "Installation aborted."
msgid "Installation aborted by user."
msgstr "Kuyekiwe ukufakwa kohlelo."
#. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
#, fuzzy
msgid "Medium %1"
msgstr "&Imidiya"
@@ -1779,13 +1786,13 @@
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
msgid ">%1"
msgstr ">%1"
#. Nothing more to install from this CD (very concise - little space!!)
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
msgid "Done."
msgstr "Isikwenzile."
@@ -1793,7 +1800,7 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
#, fuzzy
#| msgid "Next %1: %2"
msgid "Next: %1 -- %2"
@@ -1802,7 +1809,7 @@
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
#, fuzzy
#| msgid "Name: %1"
msgid "Next: %1"
@@ -1811,7 +1818,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:918
+#: src/modules/PackageSlideShow.rb:922
msgid "Total"
msgstr "Ingqikithi"
@@ -1820,12 +1827,12 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
msgid "Downloading %1 (download size %2)"
msgstr "Ilanda ifayela %1 (landa usayizi wefayela %2)"
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
#, fuzzy
msgid " (Remaining: %1%2 packages)"
msgstr ""
@@ -1834,34 +1841,34 @@
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
#, fuzzy
#| msgid "Downloading Package"
msgid "Downloading Packages..."
msgstr "Ilanda Iphakheji"
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
#, fuzzy
msgid " (Downloaded %1 of %2 packages)"
msgstr "Ilanda Iphakheji"
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
msgid "Deleting %1"
msgstr "Isusa ifayela %1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
#, fuzzy
msgid "Installing %1 (installed size %2)"
msgstr "Okungafakiwe (%1 -> %2)"
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
msgid "Applying delta RPM: %1"
msgstr "Isebenzisa i-delta RPM: %1"
@@ -2002,8 +2009,10 @@
msgstr ""
#: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
-msgstr ""
+#, fuzzy
+#| msgid "%1 packages will be updated"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
+msgstr "Amaphakheji angu-%1 azovuselelwa"
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
@@ -2018,13 +2027,13 @@
msgstr ""
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
#, fuzzy
msgid "No repository found at '%1'."
msgstr "Ayikho ikhathalogi etholakele kwifayela '%1'."
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
#, fuzzy
#| msgid ""
#| "<p><b>These are the release notes made for the first initial release. They are\n"
@@ -2042,33 +2051,33 @@
" esiphakelalwazini seNgosi Ye-Inthanethi Ye-SUSE Linux.</b></p>"
#. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
msgid "Integrating booted media..."
msgstr "Yenza imediya efakiwe ukuba isebenzelane namanye..."
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
#, fuzzy
msgid "Failed to integrate the service pack repository."
msgstr "Ihlulekile ukwenza umthombo we-service pack ukuba usebenzelane neminye."
#. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
#, fuzzy
msgid "Initializing repositories..."
msgstr "Ilungiselela ukuqalisa umthombo omusha..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
msgid "Insert %1 CD 1"
msgstr "Faka i-%1 CD 1"
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
msgid "%1 CD 1 not found"
msgstr "Ifayela %1 CD 1 alitholakalanga"
#. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -2077,19 +2086,19 @@
"Hlola ifayela %1 ukuze uthole imininingwane eyengeziwe."
#. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
msgstr ""
#. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
msgid "Evaluating package selection..."
msgstr "Ihlola amaphakheji akhethiwe ukuze ibone ukubaluleka kwawo..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -2098,37 +2107,45 @@
#. Sets that the license (file) has been already accepted
#.
#. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
#, fuzzy
msgid "Cannot read license file %1"
msgstr "Ayikwazi ukufunda ifayela '%1'"
-#: src/modules/ProductLicense.rb:151
+#: src/modules/ProductLicense.rb:153
msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
msgstr ""
#. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
msgid "&Language"
msgstr "&Ulimi"
#. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
#, fuzzy
#| msgid "&Yes, I Agree to the License Agreement"
msgid "I &Agree to the License Terms."
msgstr "&Yebo, Ngiyavumelana Nesivumelwano Selayisensi"
#. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+msgid ""
"If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
msgstr ""
#. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
@@ -2142,38 +2159,39 @@
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
msgid "License Agreement"
msgstr "Isivumelwano Selayisensi"
#. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
#, fuzzy
msgid "Really abort the add-on product installation?"
msgstr "Ikuyeke ngempela ukufakwa komkhiqizo owenezelwayo?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
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:1048
+#: src/modules/ProductLicense.rb:1044
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:1058
+#: src/modules/ProductLicense.rb:1054
#, fuzzy
msgid "The system is shutting down..."
msgstr "Isistimu iyavala..."
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
#: src/modules/ProductLicense.rb:1153
#, fuzzy
#| msgid "License Agreement"
@@ -2181,7 +2199,7 @@
msgstr "Isivumelwano Selayisensi"
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
@@ -2287,7 +2305,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
#, fuzzy
#| msgid "&SMB/CIFS"
msgid "S&MB/CIFS"
@@ -2339,7 +2357,7 @@
msgstr "Ayikho Incazelo"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
msgid ""
"<p>If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>"
@@ -2348,7 +2366,7 @@
"wemediya, yenza <b>Umfanekiso We-ISO</b>.</p>"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
#, fuzzy
msgid ""
"<p>If the repository is on multiple media,\n"
@@ -2358,53 +2376,53 @@
"yenza indawo yemediya yokuqala kulawo mamediya isebenze.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
msgid "&Server Name"
msgstr "&Igama Lesiphakelalwazi"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
msgid "&Path to Directory or ISO Image"
msgstr "&Umgudu We-Directory Noma Umfanekiso We-ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
#, fuzzy
msgid "&ISO Image"
msgstr "Umfanekiso We-ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
#, fuzzy
#| msgid "&Protocol"
msgid "N&FS v4 Protocol"
msgstr "&Iphrothokholi"
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
msgid "Mount Options"
msgstr "Izindlela Ongakhetha Kuzo Zokuxhakathisa"
#. 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:163
+#: src/modules/SourceDialogs.rb:164
#, fuzzy
#| msgid " (default)"
msgid "(default)"
msgstr "(default)"
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
#, fuzzy
msgid "URL of the Repository"
msgstr "Igama &Lokukhethiwe"
#. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
msgid "P&rotocol"
msgstr "Iph&rothokholi"
#. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
#, fuzzy
msgid "&URL of the Repository"
msgstr "Igama &Lokukhethiwe"
@@ -2412,40 +2430,40 @@
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
#, fuzzy
msgid "Repository URL"
msgstr "&Inqolobane Yephrofayili:"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
msgid "NFS Server"
msgstr "Isiphakelalwazi se-DNS"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
msgid "CD or DVD Media"
msgstr "Imidiya Ye-CD Noma I-DVD"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
msgid "Hard Disk"
msgstr "Ugalaza"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
msgid "USB Stick or Disk"
msgstr ""
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
msgid "Local Directory"
msgstr "I-Directory Eseduze"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
#, fuzzy
msgid "Local ISO Image"
msgstr "Umfanekiso We-ISO"
@@ -2455,26 +2473,26 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: 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
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
msgid "Server and Directory"
msgstr "Isiphakelalwazi Ne-Directory"
#. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:469
#, fuzzy
msgid "The name of the repository cannot be empty."
msgstr "Igama lokokwabelana alikwazi ukungabi nalutho."
#. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:482
#, fuzzy
msgid "&Repository Name"
msgstr "&Inqolobane Yephrofayili:"
#. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:497
#, fuzzy
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
@@ -2485,13 +2503,13 @@
" we-directory noma ifayela lomfanekiso we-ISO yemidiya efaka izinhlelo.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:511
#, fuzzy
msgid "&Service Name"
msgstr "Igama Lesevisi"
#. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:519
#, fuzzy
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
@@ -2502,17 +2520,17 @@
" we-directory noma ifayela lomfanekiso we-ISO yemidiya efaka izinhlelo.</p>"
#. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:554
msgid "URL cannot be empty."
msgstr "I-URL ayikwazi ukungabi nalutho."
#. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:568
msgid "&URL"
msgstr "I-&URL"
#. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:582
#, fuzzy
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
@@ -2525,16 +2543,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
msgid "Edit Parts of the URL"
msgstr ""
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
msgid "Edit Complete URL"
msgstr ""
#. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:774
#, fuzzy
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
@@ -2545,7 +2563,7 @@
"Sebenzisa <b>Igama Lesiphakelalwazi</b> noMgudu We-Directory <b> noma Umfanekiso We-ISO</b>\n"
" ukuze ubonisi isiphakeli sesiphakelalwazi i-NFS nomgudu waleso siphakelalwazi.<p>"
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:781
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2554,16 +2572,16 @@
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:836
msgid "&CD-ROM"
msgstr "&I-CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:838
msgid "&DVD-ROM"
msgstr "&I-DVD-ROM"
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:843
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2572,12 +2590,12 @@
"Yenza <b>I-CD-ROM</b> noma <b>I-DVD-ROM</b> ukuze ubonise uhlobo lwemidiya.</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:943
msgid "ISO Image File"
msgstr "Ifayela Lomfanekiso We-ISO"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:966
#, fuzzy
msgid ""
"The entered path is not a directory\n"
@@ -2587,7 +2605,7 @@
"Phinda uzame.\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:996
#, fuzzy
msgid ""
"The entered path is not a file\n"
@@ -2595,7 +2613,7 @@
msgstr "Ifayela ebonisiwe ayikho."
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1020
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2603,18 +2621,18 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1041
msgid "&Path to Directory"
msgstr "&Umgudu We-Directory"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
#, fuzzy
msgid "&Plain RPM Directory"
msgstr "&Umgudu We-Directory"
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1064
#, fuzzy
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
@@ -2628,23 +2646,23 @@
" we-directory othwele amaphakheji e-RPM.</p>"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1300
#, fuzzy
msgid "&USB Mass Storage Device"
msgstr "Idivayisi Yokugcina Ukwaziswa Okuningi"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
#, fuzzy
msgid "&File System"
msgstr "Isistimu Yefayela"
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
#, fuzzy
msgid "Dire&ctory"
msgstr "I-Directory:"
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1311
#, fuzzy
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
@@ -2661,7 +2679,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:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
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"
@@ -2669,12 +2687,12 @@
msgstr ""
#. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1371
#, fuzzy
msgid "&Disk Device"
msgstr "&Idivayisi Yeflophi Diski "
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1378
#, fuzzy
msgid ""
"<p><big><b>Disk</b></big><br>\n"
@@ -2690,13 +2708,13 @@
" we-directory othwele amaphakheji e-RPM.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1404
#, fuzzy
msgid "&Path to ISO Image"
msgstr "&Umgudu We-Directory Noma Umfanekiso We-ISO"
#. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1424
#, fuzzy
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
@@ -2708,73 +2726,73 @@
" we-directory othwele amaphakheji e-RPM.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1605
msgid "Server &Name"
msgstr "Isiphakelalwazi &Igama"
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1609
msgid "&Port"
msgstr "&I-Port"
#. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1614
msgid "&Share"
msgstr "&Hlanganyela"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1627
#, fuzzy
msgid "ISO &Image"
msgstr "Umfanekiso We-ISO"
#. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1630
msgid "&Directory on Server"
msgstr "&I-Directory Esesiphakelalwazini"
#. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1635
msgid "Au&thentication"
msgstr "&Ukugunyaza"
#. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1642
msgid "&Anonymous"
msgstr "&Engaziwa"
#. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1651
#, fuzzy
msgid "&Workgroup or Domain"
msgstr "Iqembu Labasebenzi Noma I-domain"
#. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1660
msgid "&User Name"
msgstr "&Igama Lomsebenzisi"
#. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1667
msgid "&Password"
msgstr "&Iphasiwedi"
#. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1742
msgid "&FTP"
msgstr "&I-FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1745
msgid "H&TTP"
msgstr "I-H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1752
msgid "HTT&PS"
msgstr "I-HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1926
#, fuzzy
msgid ""
"<p><big><b>Server and Directory</b></big><br>\n"
@@ -2800,7 +2818,7 @@
" wemediya, yenza <b>Umfanekiso We-ISO usebenze</b>.</p>"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1939
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"
@@ -2809,12 +2827,17 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+msgid "I would li&ke to install an additional Add On Product"
msgstr ""
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+msgid "Net&work Configuration..."
+msgstr "Ifunda ukuhelwa kwenethiwekhi..."
+
#. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2136
#, fuzzy
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
@@ -2826,7 +2849,7 @@
" noma i-hard disk.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2837,7 +2860,7 @@
" yenza ukuba umkhiqizo we-CD noma i-DVD utholakale.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2155
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2861,7 +2884,7 @@
" kwi-directory eyodwa.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2167
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2880,28 +2903,28 @@
" ama-CD okuqala, njenge /data1/CD1.</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2182
#, fuzzy
#| msgid "Select the media type."
msgid "Select the media type"
msgstr "Khetha uhlobo lwemidiya."
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2188
msgid "Insert the add-on product CD"
msgstr "Faka i-CD enesenezeli"
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2189
msgid "Insert the add-on product DVD"
msgstr "Faka i-DVD enesenezeli"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2207
#, fuzzy
msgid "No USB disk was detected."
msgstr "Abekho ogalaza abatholiwe"
#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#: src/modules/SourceDialogs.rb:2415
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2911,12 +2934,12 @@
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2635
msgid "Media Type"
msgstr "Uhlobo LweMidiya"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2659
#, fuzzy
#| msgid "Add-On Products"
msgid "Add On Product"
@@ -2925,7 +2948,7 @@
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2690
#, fuzzy
#| msgid "' is not valid."
msgid "URL scheme '%s' is not valid."
@@ -3140,12 +3163,12 @@
msgstr "Awekho amakhathalogi e-SLP atholakele kwinethiwekhi yakho."
#. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
msgid "Partition \"%1\" needs %2 more disk space."
msgstr "I-partition \"%1\" idinga isikhala esengeziwe sediski yefayela %2."
#. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
#, fuzzy
#| msgid ""
#| "Deselect some packages or delete some data\n"
@@ -3158,7 +3181,7 @@
"noma amafayayela esikhashana ngaphambi kokuba uvuselele uhlelo lwesistimu."
#. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
#, fuzzy
#| msgid "Please deselect some packages."
msgid "Deselect some packages."
@@ -3212,10 +3235,6 @@
#~ msgstr "Ayikwazi Ukuqalisa Izisinda Sokwaziswa Samaphakheji"
#, fuzzy
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "Ifunda ukuhelwa kwenethiwekhi..."
-
-#, fuzzy
#~ msgid "Initializing Software Manager ... "
#~ msgstr "Ilungiselela ukuqalisa isizinda sokwaziswa sephakheji..."
@@ -3608,10 +3627,6 @@
#~ msgid "&Details"
#~ msgstr "&Imininingwane"
-#, fuzzy
-#~ msgid "Release &Notes"
-#~ msgstr "Ukwaziswa Okuphathelene Nohlelo"
-
#~ msgid "Package Installation"
#~ msgstr "Ukufakwa Kwamaphakheji"
Modified: trunk/yast/zu/po/pkg-bindings.zu.po
===================================================================
--- trunk/yast/zu/po/pkg-bindings.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/pkg-bindings.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -43,13 +43,13 @@
msgstr ""
#. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
#, fuzzy
msgid "The package cannot be selected to install."
msgstr "Ayikho iphakheji ekhethiwe ukuze ifakwe."
#. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
#, fuzzy
msgid "The package is not available."
msgstr "Eye-%1 iphakheji ayitholakali."
Modified: trunk/yast/zu/po/printer.zu.po
===================================================================
--- trunk/yast/zu/po/printer.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/printer.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -203,7 +203,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:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -220,8 +220,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:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -359,7 +359,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
msgid "Description"
msgstr "Incazelo"
@@ -476,8 +476,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:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
msgid "Nothing Selected"
msgstr "Akukho Okukhethiwe"
@@ -2722,60 +2722,60 @@
#. Authors: Johannes Meixner <jsmeix(a)suse.de>
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
#, fuzzy
msgid "Show"
msgstr "Bonisa &imininingwane"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
#, fuzzy
msgid "&Local"
msgstr "Eduze"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
#, fuzzy
msgid "&Remote"
msgstr "Kude"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
msgid "Configuration"
msgstr "Ukuhlela"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
msgid "Name"
msgstr "Igama"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
msgid "Location"
msgstr "Indawo"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
msgid "Default"
msgstr "Okufike Nohlelo (default)"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
msgid "Status"
msgstr "Isimo"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
#, fuzzy
msgid "Re&fresh List"
msgstr "&Uhlu Lokuvuselela"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
#, fuzzy
msgid "Print &Test Page"
msgstr "Phrinta ikhasi lokuhlola"
@@ -2786,7 +2786,7 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
msgid ""
"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
@@ -2799,7 +2799,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -2814,39 +2814,39 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
msgstr ""
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
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:207
+#: src/include/printer/overview.rb:210
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:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
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:253
+#: src/include/printer/overview.rb:256
#, fuzzy
msgid "CUPS Server %1"
msgstr "Isiphakelalwazi Se-CUPS"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
#, fuzzy
#| msgid "The print server is accessible."
msgid "Testing if CUPS server is accessible..."
@@ -2855,39 +2855,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:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
msgid "Select an entry."
msgstr "Khetha i-entry."
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
#, fuzzy
msgid "Cannot Delete"
msgstr "Ayikwazi ukususa isikhiye se-TSIG."
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr ""
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
#, fuzzy
msgid "Confirm Deletion"
msgstr "Qinisekisa Ukuwufaka Ohlelweni"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
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:620
+#: src/include/printer/overview.rb:623
#, fuzzy
msgid "Delete configuration %1"
msgstr "Sula umiso %1 manje?"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
#, fuzzy
msgid "Do not delete it"
msgstr "Ufuna ukuyisusa ngempela?"
@@ -2899,36 +2899,36 @@
#. 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:637
+#: src/include/printer/overview.rb:640
#, fuzzy
msgid "Confirm Deletion of a Class"
msgstr "Qinisekisa Ukuwufaka Ohlelweni"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
msgid "A deleted class cannot be re-created with this tool."
msgstr ""
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
#, fuzzy
msgid "Rejecting Print Jobs"
msgstr "Ukuthungatha Izilawuli Ezitholakalayo"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
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:697
+#: src/include/printer/overview.rb:700
#, fuzzy
msgid "Printout Disabled"
msgstr "Ukuphrinta &Kuphothuliwe"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
msgid "The testpage cannot be printed because printout is disabled."
msgstr ""
@@ -2937,26 +2937,26 @@
#. 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:728
+#: src/include/printer/overview.rb:731
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:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
#, fuzzy
msgid "Delete Pending Print Jobs For %1"
msgstr "Ukuthungatha Izilawuli Ezitholakalayo"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
msgid "Delete them before printing testpage"
msgstr ""
#. 'No' 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:762
#, fuzzy
msgid "Print testpage after the other jobs"
msgstr "Phrinta usizo lwale moduli"
@@ -2965,7 +2965,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:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
#, fuzzy
msgid "Failed to delete all pending jobs for %1."
msgstr "Ihlulekile ukuhlola i-%1"
@@ -2985,26 +2985,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:799
+#: src/include/printer/overview.rb:802
#, fuzzy
#| msgid "&Test Printing"
msgid "Test printout"
msgstr "&Ukuphrinta Kokuhlola "
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
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:803
+#: src/include/printer/overview.rb:806
#, fuzzy
#| msgid "Print test page"
msgid "Single test page"
msgstr "Phrinta ikhasi lokuhlola"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
#, fuzzy
#| msgid "Print test page"
msgid "Two test pages"
@@ -3012,7 +3012,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:835
+#: src/include/printer/overview.rb:838
#, fuzzy
msgid "Failed to print testpage for %1."
msgstr "Ihlulekile ukufaka iphakheji edingekayo %1."
@@ -3021,19 +3021,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:852
+#: src/include/printer/overview.rb:855
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:856
+#: src/include/printer/overview.rb:859
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:861
+#: src/include/printer/overview.rb:864
#, fuzzy
#| msgid "Repair was successful"
msgid "Testpage printout was successful"
@@ -3041,7 +3041,7 @@
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
#, fuzzy
#| msgid "T&est Printing"
msgid "Testpage printing failed"
@@ -3063,56 +3063,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:897
+#: src/include/printer/overview.rb:900
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:925
+#: src/include/printer/overview.rb:928
#, fuzzy
msgid "Delete all pending jobs"
msgstr "Ukuthungatha Izilawuli Ezitholakalayo"
#. 'No' 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:931
#, fuzzy
msgid "Do not delete them"
msgstr "Ufuna ukuyisusa ngempela?"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr ""
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
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:1065
+#: src/include/printer/overview.rb:1068
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:1075
+#: src/include/printer/overview.rb:1078
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:1102
+#: src/include/printer/overview.rb:1105
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr ""
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
#, fuzzy
msgid "Cannot Modify"
msgstr "Ayikwazi ukuxhakathisa iflophi"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr ""
Modified: trunk/yast/zu/po/rdp.zu.po
===================================================================
--- trunk/yast/zu/po/rdp.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/rdp.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -110,66 +110,66 @@
msgstr "Amasethingi Esihenqo Esiyisivikelo"
#. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
msgid "Write firewall settings"
msgstr "Bhala amasethingi efayawoli"
#. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
#, fuzzy
#| msgid "Configure Later"
msgid "Configure xrdp"
msgstr "Hlela Kamuva"
#. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
#, fuzzy
#| msgid "Restart the service"
msgid "Restart the services"
msgstr "Qala kabusha isevisi"
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
#, fuzzy
#| msgid "Stop services"
msgid "Stop the services"
msgstr "Misa amasevisi"
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
#, fuzzy
#| msgid "Saving iSCSI Initiator Configuration"
msgid "Saving Remote Administration Configuration"
msgstr "Igcina Ukuhlelwa Kwesiqalisi se-iSCSI"
#. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
msgid "Writing firewall settings..."
msgstr "Ibhala amasethingi efayawoli..."
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
#, fuzzy
#| msgid "Configuring runlevel..."
msgid "Configuring xrdp..."
msgstr "Ihlela i-runlevel..."
#. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
#, fuzzy
#| msgid "Restarting service..."
msgid "Restarting the service..."
msgstr "Iqala kabusha isevisi..."
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
#, fuzzy
#| msgid "Stopping services..."
msgid "Stopping the service..."
msgstr "Misa amasevisi..."
#. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
msgid "Remote administration is enabled."
msgstr "Ukuqondisa kude kuvuliwe."
#. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
msgid "Remote administration is disabled."
msgstr "Ukuqondisa kude kuvuliwe."
Modified: trunk/yast/zu/po/rear.zu.po
===================================================================
--- trunk/yast/zu/po/rear.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/rear.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -281,16 +281,16 @@
#: src/include/rear/ui.rb:698
#, fuzzy
+#| msgid "Reading general settings"
+msgid "Reading rear settings"
+msgstr "Ifunda amasethingi avamile"
+
+#: src/include/rear/ui.rb:698
+#, fuzzy
#| msgid "Analyzing your system..."
msgid "Analyzing system"
msgstr "Ukuhlaziya isistimu yakho..."
-#: src/include/rear/ui.rb:698
-#, fuzzy
-#| msgid "Reading general settings"
-msgid "Reading rear settings"
-msgstr "Ifunda amasethingi avamile"
-
#: src/include/rear/ui.rb:699
#, fuzzy
#| msgid "Analyzing your system..."
Modified: trunk/yast/zu/po/registration.zu.po
===================================================================
--- trunk/yast/zu/po/registration.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/registration.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -15,31 +15,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-#, fuzzy
-msgid "Local Registration Servers"
-msgstr "Ikhodi Yokubhalisa"
-
-#: 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:68
-#, fuzzy
-msgid "No registration server selected."
-msgstr "Ikhodi Yokubhalisa"
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-#, fuzzy
-#| msgid "Novell Customer Center Configuration"
-msgid "SUSE Customer Center (%s)"
-msgstr "Ukuhlelwa Kwesikhungo Samakhasimende Sakwa-Novell"
-
#. popup message
#. popup message
#. popup message
@@ -57,9 +32,9 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -75,25 +50,25 @@
msgstr ""
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
#, fuzzy
msgid "Registration was successfull."
msgstr "Ukulungisa kuphumelele."
#. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
msgid "SLP discovery failed, no server found"
msgstr ""
#. download and install the specified SSL certificate to the system
#. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
#, fuzzy
#| msgid "Downloading SMT certificate file failed"
msgid "Downloading SSL Certificate"
msgstr "Ukulanda ifayela lesitifiketi se-SMT kuhlulekile"
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
#, fuzzy
msgid "Importing SSL Certificate"
msgstr "&Isitifiketi Sesiphakelalwazi"
@@ -101,8 +76,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -275,31 +250,27 @@
msgid "SHA256 Fingerprint: "
msgstr "I-fingerprint: %1"
-#. Error popup
-#: 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 ""
-
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
#: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
+msgid "Connection time out."
msgstr ""
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
-msgid "Connection time out."
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:91
#, fuzzy
#| msgid "Destination is invalid."
msgid "Check that this system is known to the registration server."
msgstr "Indawo oya kuyo ayisebenzi."
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:97
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -315,35 +286,34 @@
#. 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: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
+#: 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:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
#, fuzzy
-#| msgid "Registration Code"
-msgid "Registration failed."
+msgid "Connection to registration server failed."
msgstr "Ikhodi Yokubhalisa"
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:121
#, fuzzy
msgid "Registration client error."
msgstr "Ukwaziswa Kokubhalisa Kokusetshenziswa"
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:123
msgid ""
"Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:165
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:197
+#: src/lib/registration/connect_helpers.rb:198
#, fuzzy
#| msgid "Details..."
msgid "Details: %s"
@@ -352,7 +322,7 @@
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:227
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -362,23 +332,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:240
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:260
+#: src/lib/registration/connect_helpers.rb:261
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:279
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -386,6 +356,26 @@
"protocol is installed at the server."
msgstr ""
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+#, fuzzy
+#| msgid "Invalid time"
+msgid "Invalid URL."
+msgstr "Isikhathi esingekho emthethweni"
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:296
+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:303
+msgid "Network error, check the network configuration."
+msgstr ""
+
#. progress step title
#: src/lib/registration/finish_dialog.rb:35
#, fuzzy
@@ -394,20 +384,20 @@
msgstr "Ibhala ukuhlelwa kokuthuthwa kokwaziswa..."
#. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
msgid ""
"The base product was not found,\n"
"check your system."
msgstr ""
#. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
msgid ""
"The installation medium or the installer itself is seriously broken.\n"
"Report a bug at %s."
msgstr ""
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
msgid ""
"Make sure a product is installed and /etc/products.d/baseproduct\n"
"is a symlink pointing to the base product .prod file."
@@ -416,7 +406,7 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:272
msgid "Registering the System..."
msgstr ""
@@ -425,8 +415,8 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating boot options..."
@@ -434,7 +424,7 @@
msgstr "Ibuyekeza izinkethi zokuqalisa..."
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:166
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Synchronizing Products..."
@@ -446,31 +436,31 @@
#. @return [Array<Registration::Addon>] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:180
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
msgid "Loading Available Extensions and Modules..."
msgstr "Ikhodi Yokubhalisa"
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:195
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
msgstr "Ilayisha umiso lwe- %1..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:213
#, fuzzy
msgid "Register Extensions and Modules"
msgstr "Ikhodi Yokubhalisa"
#. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:217
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:242
#, fuzzy
msgid ""
"The registration server offers update repositories.\n"
@@ -478,7 +468,7 @@
msgstr "Ikhodi Yokubhalisa"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:246
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
@@ -492,7 +482,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:250
#, fuzzy
#| msgid "Would you like to open this profile in editing mode?"
msgid ""
@@ -509,7 +499,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -520,41 +510,41 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
#, fuzzy
msgid "Unknown product"
msgstr "Ikhodi Yephutha Elingaziwa."
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
#, fuzzy
msgid "Saving repository configuration failed."
msgstr "Iqalisa Ukufaka Uhlelo..."
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:474
#, fuzzy
#| msgid "No product found in the catalog"
msgid ""
@@ -629,7 +619,11 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
#, fuzzy
#| msgid "Details..."
msgid "Details"
@@ -637,30 +631,30 @@
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
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
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
#, fuzzy
#| msgid "is not available"
msgid "%s (not available)"
msgstr "akutholakali"
#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
msgid "YaST allows to select at most %s extensions or modules."
msgstr ""
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
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_base_dialog.rb:260
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
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 ""
@@ -676,7 +670,7 @@
msgstr ""
#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
msgid "Available Extensions and Modules"
msgstr ""
@@ -741,7 +735,7 @@
msgstr ""
#. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete '%s'?"
@@ -749,32 +743,32 @@
#. dialog definition for adding/editing an addon
#. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
#, fuzzy
#| msgid "Vendor Identifier"
msgid "Extension or Module &Identifier"
msgstr "Isivezi Somthengisi"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "&Version"
msgstr "Uhlelo"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
#, fuzzy
#| msgid "Architecture"
msgid "&Architecture"
msgstr "I-Architecture"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
#, fuzzy
#| msgid "Rule Type"
msgid "&Release Type"
msgstr "Uhlobo Lomthetho"
#. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
#, fuzzy
#| msgid "Registration Code"
msgid "Registration &Code"
@@ -809,10 +803,8 @@
msgid "Register the Product"
msgstr "Ikhodi Yokubhalisa"
-#. 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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
#, fuzzy
#| msgid "Email Address"
msgid "&E-mail Address"
@@ -823,39 +815,39 @@
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
#, fuzzy
msgid "Server Settings"
msgstr "Amasethingi Esiphakelalwazi"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
#, fuzzy
msgid "Find Registration Server Using SLP Discovery"
msgstr "Ikhodi Yokubhalisa"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
msgid "Use Specific Server URL Instead of the Default"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
#, fuzzy
msgid "Optional SSL Server Certificate URL"
msgstr "&Isitifiketi Sesiphakelalwazi"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
#, fuzzy
msgid "Optional SSL Server Certificate Fingerprint"
msgstr "&Isitifiketi Sesiphakelalwazi"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
msgid "none"
msgstr "akukho lutho"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
#, fuzzy
#| msgid "Certificate File to Import"
msgid "SSL Certificate Fingerprint"
@@ -863,25 +855,36 @@
#. the UI defition for the main dialog
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
#, fuzzy
msgid "Register Extensions or Modules..."
msgstr "Ikhodi Yokubhalisa"
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
#, fuzzy
-msgid "&Local Registration Server..."
+#| msgid "Registration Code"
+msgid "Register System via %s"
msgstr "Ikhodi Yokubhalisa"
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
#, fuzzy
+msgid "Register System via local SMT Server"
+msgstr "Ikhodi Yokubhalisa"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#, fuzzy
+msgid "&Local Registration Server URL"
+msgstr "Ikhodi Yokubhalisa"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
+#, fuzzy
msgid "&Skip Registration"
msgstr "Ikhodi Yokubhalisa"
#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
#, fuzzy
msgid "&Register Extensions or Modules Again"
msgstr "Ikhodi Yokubhalisa"
@@ -890,53 +893,36 @@
#. @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/base_system_registration_dialog.rb:342
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr ""
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
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?"
+"Customer Center for online registration."
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
#, fuzzy
#| msgid "Novell Customer Center Configuration"
-msgid "Network Configuration..."
+msgid "Net&work Configuration..."
msgstr "Ukuhlelwa Kwesikhungo Samakhasimende Sakwa-Novell"
#. SSL error message
@@ -964,22 +950,22 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: 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>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (2/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (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:131
-msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (4/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (5/5)
@@ -987,19 +973,6 @@
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:67
-#, fuzzy
-#| msgid "Invalid time"
-msgid "Invalid URL."
-msgstr "Isikhathi esingekho emthethweni"
-
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-#, fuzzy
-msgid "&Local Registration Server URL"
-msgstr "Ikhodi Yokubhalisa"
-
#. TRANSLATORS: error message, %s are details
#. TRANSLATORS: error message, %s are details
#: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -1034,21 +1007,21 @@
msgstr "Khetha i-boot loader ngaphambi kokuhlela izingxenye."
#. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
#, fuzzy
#| msgid "Importing repositories..."
msgid "Manage Repositories..."
msgstr "Ingenisa okokugcina..."
#. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
#, fuzzy
#| msgid "URL: %1"
msgid "URL: %s"
msgstr "I-URL: %1"
#. TRANSLATORS: summary text, %s is a repository priority (1-99)
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
#, fuzzy
#| msgid "Swap &Priority"
msgid "Priority: %s"
@@ -1119,19 +1092,19 @@
msgstr "Khetha i-boot loader ngaphambi kokuhlela izingxenye."
#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
msgid "Manually Adjust the Repositories for Migration"
msgstr ""
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
#, fuzzy
#| msgid "P&ossible Solutions"
msgid "Possible Migration Targets"
msgstr "A&makhambi Angaba Khona"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
#, fuzzy
#| msgid "Configuration Summary"
msgid "Migration Summary"
@@ -1143,14 +1116,14 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:214
+#: 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:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
#, fuzzy
#| msgid "Package %1 will be installed."
msgid "%s <b>will be installed.</b>"
@@ -1158,25 +1131,25 @@
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
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:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
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:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
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:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1230,19 +1203,85 @@
"You can manually register the system from scratch."
msgstr ""
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service] List of services to show.
+#. @param heading [String] Text to be shown as dialog heading. A default text
+#. will be used if it's not specified.
+#. @param description [String] Text to be shown as description. A default text
+#. will be used if it's not specified.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:64
#, fuzzy
+msgid "Local Registration Servers"
+msgstr "Ikhodi Yokubhalisa"
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:65
+msgid ""
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
+msgstr ""
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:67
+#, fuzzy
+msgid "No registration server selected"
+msgstr "Ikhodi Yokubhalisa"
+
+#. Default registration server
+#.
+#. return [String] Returns a string representing the default SCC service.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:102
+#, fuzzy
+#| msgid "Novell Customer Center Configuration"
+msgid "SUSE Customer Center (%s)"
+msgstr "Ukuhlelwa Kwesikhungo Samakhasimende Sakwa-Novell"
+
+#. @return [Array<Yast::SlpServiceClass::Service>]
+#: src/lib/registration/url_helpers.rb:220
+#, fuzzy
#| msgid "Checking..."
msgid "Searching..."
msgstr "Iyahlola..."
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:220
#, fuzzy
msgid "Looking up local registration servers..."
msgstr "Into eyodwa yokwaziswa kokubhalisa"
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service>] list of services to show
+#. @param heading [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
#, fuzzy
+msgid "Service selection"
+msgstr "Amasethingi Esiphakelalwazi"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+msgid "No service was selected."
+msgstr "Ikhodi Yokubhalisa"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registration failed."
+#~ msgstr "Ikhodi Yokubhalisa"
+
+#, fuzzy
+#~ msgid "&Local Registration Server..."
+#~ msgstr "Ikhodi Yokubhalisa"
+
+#, fuzzy
#~| msgid "Migration Details"
#~ msgid "Migration Repositories"
#~ msgstr "Imininingwane Yofuduko"
Modified: trunk/yast/zu/po/reipl.zu.po
===================================================================
--- trunk/yast/zu/po/reipl.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/reipl.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -24,11 +24,11 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
msgid ""
"\n"
"After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
msgstr ""
#. TRANSLATORS: part of a shutdown message
@@ -36,7 +36,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -45,7 +45,7 @@
"and LUN '%3'.\n"
msgstr ""
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: trunk/yast/zu/po/samba-client.zu.po
===================================================================
--- trunk/yast/zu/po/samba-client.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/samba-client.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -941,59 +941,59 @@
msgstr "Ifaka amaphakheji adingekayo..."
#. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
msgid "PAM Login"
msgstr "Ukungena kwi-PAM"
#. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
msgid "Use Kerberos"
msgstr "Sebenzisa i-Kerberos"
#. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
msgid "Do Not Use Kerberos"
msgstr "Ungayisebenzisi i-Kerberos"
#. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
msgid "Default Realm"
msgstr "Indawo Yokufike Nohlelo (default)"
#. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
msgid "Default Domain"
msgstr "I-domain Yokufike Nohlelo (default)"
#. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
msgid "KDC Server Address"
msgstr "Ikheli Lesiphakelalwazi Se-KDC"
#. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
msgid "Clock Skew"
msgstr "I-Clock Skew"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
msgid "<b>KDC Server</b>: %1<br>"
msgstr "<b>Isiphakelalwazi se-KDC</b>: %1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
#, fuzzy
#| msgid "<p><b>Workgroup or Domain</b>: %1</p>"
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<p><b>I-Workgroup noma i-Domain</b>: %1</p>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
msgid "<b>Default Realm</b>: %1<br>"
msgstr "<b>Indawo Yokufike Nohlelo</b>: %1<br>"
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
#, fuzzy
#| msgid "Offline Authentication Enabled"
msgid "<b>Kerberos Authentication Enabled</b>: %1"
@@ -1001,23 +1001,23 @@
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "&Yebo"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
msgid "No"
msgstr "&Cha"
#. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
msgid "Configuration Acquired via DNS"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
@@ -1026,7 +1026,7 @@
"Phinde uzame. \n"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: trunk/yast/zu/po/samba-server.zu.po
===================================================================
--- trunk/yast/zu/po/samba-server.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/samba-server.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -243,11 +243,17 @@
#. TRANSLATORS: a popup message
#: src/include/samba-server/complex.rb:88
+#, fuzzy
+#| msgid ""
+#| "Because users are currently connected to this Samba server,\n"
+#| "the server configuration has been reloaded instead of restarted.\n"
+#| "To confirm that all settings are applied despite possibly disconnecting the users,\n"
+#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgid ""
"Because users are currently connected to this Samba server,\n"
"the server configuration has been reloaded instead of restarted.\n"
"To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
msgstr ""
"Ngenxa yokuthi abasebenzisi njengamanje baxhunywe esiphakelalwazini se-Samba server,\n"
"ukuhlelwa kwesiphakelalwazi kufakwe kabusha esikhundleni sokuba kuqalwe kabusha.\n"
Modified: trunk/yast/zu/po/security.zu.po
===================================================================
--- trunk/yast/zu/po/security.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/security.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -117,223 +117,223 @@
#. Authors: Michal Svec <msvec(a)suse.cz>
#.
#. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
msgid "Unknown"
msgstr "Akwaziwa"
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
#, fuzzy
msgid "Use magic SysRq keys"
msgstr "Yenza &Izikhiye Zomlingo Ze-SysRq Zisebenze"
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
#, fuzzy
msgid "Use secure file permissions"
msgstr "Sebenzisa Izimvume Ezizuziwe"
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
#, fuzzy
msgid "Remote access to the display manager"
msgstr "Ukungena Kwi-Display Manager Ukude (Remote Access to Display Manager)"
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
msgid "Write back system time to the hardware clock"
msgstr ""
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
msgid "Always generate syslog message for cron scripts"
msgstr ""
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
#, fuzzy
msgid "Run the DHCP daemon in a chroot"
msgstr "Yenza I-daemo Ye-NTP isebenze kwi-Chroot &Jail"
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
msgid "Run the DHCP daemon as dhcp user"
msgstr ""
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
#, fuzzy
msgid "Remote root login in the display manager"
msgstr "Ukungena Kwi-Display Manager Ukude (Remote Access to Display Manager)"
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
#, fuzzy
msgid "Remote access to the X server"
msgstr "Ukungena Kwi-Display Manager Ukude (Remote Access to Display Manager)"
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
#, fuzzy
msgid "Remote access to the email delivery subsystem"
msgstr "Ukungena Kwi-Display Manager Ukude (Remote Access to Display Manager)"
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
#, fuzzy
msgid "Restart services on update"
msgstr "Cisha isevisi"
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
#, fuzzy
msgid "Stop services on removal"
msgstr "Cisha isevisi"
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
#, fuzzy
msgid "Enable TCP syncookies"
msgstr "Vula Amasevisi e-VPN"
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
#, fuzzy
msgid "IPv4 forwarding"
msgstr "Yenza Ukuthunyelwa &Kwe-IP Kusebenze"
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
#, fuzzy
msgid "IPv6 forwarding"
msgstr "Yenza Ukuthunyelwa &Kwe-IP Kusebenze"
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
#, fuzzy
#| msgid "Enable the service"
msgid "Enable basic system services"
msgstr "Vula isevisi"
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
#, fuzzy
#| msgid "Disable the service"
msgid "Disable extra services"
msgstr "Cisha isevisi"
#. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
#, fuzzy
msgid "Configure"
msgstr "&Hlela..."
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
msgid "Enabled"
msgstr "Ivuliwe ukuze isebenze"
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
msgid "Disabled"
msgstr "Icishiwe"
#. table header
#. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
#, fuzzy
msgid "Security Setting"
msgstr "Amasethingi Okuphepha"
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
msgid "Status"
msgstr "Isimo"
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
#, fuzzy
msgid "Security Status"
msgstr "Amasethingi Okuphepha"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
msgid "Help"
msgstr "Usizo"
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
msgid " or "
msgstr ""
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
#, fuzzy
msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
msgstr ""
"La masevisi adingekayo alahlekile:\n"
"%1."
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
msgid "<P>All basic services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
#, fuzzy
msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
msgstr ""
"La masevisi adingekayo alahlekile:\n"
"%1."
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
msgid "<P>Only basic system services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
msgid "Description"
msgstr "Incazelo"
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
#, fuzzy
msgid "Security Overview"
msgstr "Amabalengwe Ezinkinobho Ezikhethekile"
#. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
#, fuzzy
msgid "Change &Status"
msgstr "Kushintshe lokhu?"
#. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
msgid "&Description"
msgstr "&Incazelo"
#. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
#, fuzzy
#| msgid "Analyzing your system..."
msgid "Analyzing system"
msgstr "Ukuhlaziya isistimu yakho..."
#. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr "Amasethingi Okuqalisa"
#. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
msgid "Boot Permissions"
msgstr "Izimvume Zokuqalisa"
#. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
msgid "Miscellaneous Settings"
msgstr "Amasethingi Ayingxubevange"
#. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
msgid "Password Settings"
msgstr "Amasethingi Ephasiwedi"
#. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
msgid "Checks"
msgstr "Ukuhlola"
#. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
msgid "Password Age"
msgstr "Ubudala Bephasiwedi"
#. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
@@ -342,7 +342,7 @@
"kwesibalo esiphezulu. "
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
@@ -351,17 +351,17 @@
"Ubude obuphezulu bephasiwedi bendlela yokufaka amakhodi okuphepha bungu-%1."
#. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr "Amasethingi Okungena"
#. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
msgid "Login"
msgstr "Ngena"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -370,7 +370,7 @@
"<br>Sicela ulinde...<br></p>"
#. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -379,7 +379,7 @@
"Liyeke ngokuphepha ithuluzi lokuhlela ngokucindezela u-<b>Yeka</b> manje.</p>"
#. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -388,7 +388,7 @@
"<br>Sicela ulinde...<br></p>"
#. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.</p>"
@@ -396,53 +396,9 @@
"<p><b><big>Iyayeka Ukugcina</big></b><br>\n"
"Yeka inqubo yokugcina ukwaziswa ngokucindezela u-<b>Yeka</b>.</p>"
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>Ukuphepha Kokuqalisa</big></b></p>\n"
-"<p>Kule dayalogi, shintsha amasethingi okuqalisa (boot) ahlukahlukene ahlobene nezokuphepha.</p>"
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
#: src/include/security/helps.rb:59
msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-"<p><b>Incazelo ka-Ctrl + Alt + Del</b>:\n"
-"Hlela lokho isistimu okufanele ikwenze lapho othile\n"
-" kwi-console ecindezela izinkinobho u-CTRL + ALT + DEL\n"
-". Ngokuvamile isistimu iqala kabusha. Ngezinye izikhathi kuyinto enhle\n"
-" ukusishalazela lesi senzakalo, ngokwesibonelo, lapho isistimu isebenza njengakho kokubili\n"
-" i-workstation nesiphakelalwazi.</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-#, fuzzy
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>\n"
-msgstr ""
-"<p><b>Indlela Yokuvala Ye-KDM</b>:\n"
-"Setha ukuthi ngubani ovunyelwe ukuvala umshini kwi-KDM.</p>"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-msgid ""
"<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
"<p>Using predefined defaults, change the local security settings, which include\n"
" booting, login, password, user creation, and file permissions. The default\n"
@@ -456,7 +412,7 @@
" </p>"
#. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
#, fuzzy
#| msgid ""
#| "<p><b>Networked Workstation</b>: For a computer connected\n"
@@ -469,14 +425,14 @@
"uhlobo lwenethiwekhi kuhlanganisa ne-Inthanethi.</p>"
#. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
msgid ""
"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
"that connects to different networks.</p>"
msgstr ""
#. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
@@ -485,13 +441,13 @@
"uhlobo lwesevisi.</p>"
#. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
#, fuzzy
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr "<p>Faka <b>Isihumushi</b> somiso lwemifanekiso yakho.</p>"
#. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -502,7 +458,7 @@
" ngokuyinhloko agcinwe kwifayele ethi /etc/login.defs.</p>"
#. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
msgid ""
"<p><b>Delay after Incorrect Login Attempt:</b>\n"
"It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -515,7 +471,7 @@
" ukuze bazame iphasiwedi yakho uma ingabhalwanga ngendlela enembile. I-value enengqondo yimizuzwana emithathu (<tt>3</tt>).</p>"
#. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
#, fuzzy
msgid ""
"<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
@@ -529,7 +485,7 @@
" </p>"
#. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
msgid ""
"<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
"to a graphical login screen for this machine over the network. Remote access\n"
@@ -540,7 +496,7 @@
" emshinini wakho usebenzisa i-display manager kungaba yingozi yezokuphepha.</p>"
#. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
@@ -549,7 +505,7 @@
"ngokuyinhloko agcinwe kwifayele ethi /etc/login.defs.</p>"
#. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
msgid ""
"<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
"cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -560,7 +516,7 @@
" Ngokuchofoza ibhokisi, phoqelela ukuhlolwa kwephasiwedi ngokuphathelene nale mithetho.</p>"
#. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
#, fuzzy
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
@@ -575,7 +531,7 @@
" iyakuvimbela lokhu kuhlola.</p>"
#. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -586,12 +542,12 @@
" Faka u-0 uma amaphasiwedi kungamelwe agcinwe.</p>"
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
msgid "<p><b>Password Encryption Method:</b></p>"
msgstr "<p><b>Indlela Yokufaka Amaphasiwedi Amakhodi Okuphepha:</b></p>"
#. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
#, fuzzy
#| msgid ""
#| "<p><b>des</b>, the Linux default method, works in all network environments,\n"
@@ -607,7 +563,7 @@
" ukuvumelana namanye amasistimu, sebenzisa le ndlela.</p>"
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
msgid ""
"<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
"distributions, but not by other systems or old software.</p>"
@@ -616,12 +572,12 @@
"zamanje, kodwa hhayi amanye amasistimu noma i-software endala.</p>"
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
msgstr ""
#. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
@@ -630,7 +586,7 @@
"nesiphezulu sezinsuku iphasiwedi engasetshenziswa ngazo.</p>"
#. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
msgid ""
"<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
"number of days users are warned before their passwords expire. The longer the\n"
@@ -641,7 +597,7 @@
" aba mancane amathuba okuthi othile angaqagela amaphasiwedi.</p>"
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
@@ -650,7 +606,7 @@
"<p>Kule dayalogi, shintsha amasethingi ahlukahlukene asetshenziselwa ukwakha abasebenzisi.</p>"
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
@@ -659,14 +615,14 @@
"Setha ubufushane noma ubude obuvumelekile be-ID yomsebenzisi.</p>"
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
msgstr "<p><b>Imingcele Ye-ID Yeqembu:</b>Setha ubufushane noma ubude obuvumelekile be-ID yeqembu.</p>"
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
@@ -675,7 +631,7 @@
"<p>Kule dayalogi, shintsha amasethingi ayingxubevange ahlobene nokuphepha kwasekhaya.</p>"
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
msgid ""
"<p><b>File Permissions</b>: Settings for the permissions\n"
"of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -706,7 +662,7 @@
" unqume ukuthi yibaphi abasebenzisi abakwaziyo ukusebenzisa izinhlelo ze-X nezinhlelo ze-setuid.</p>\n"
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
msgid ""
"<p><b>User Launching updatedb</b>: The program updatedb runs \n"
"once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -721,7 +677,7 @@
" (amafayela ambalwa) noma <b>umqondisi</b> (wonke amafayela).</p>"
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
msgid ""
"<p><b>Current Directory in root's Path</b> On a DOS system,\n"
"the system first searches for executable files (programs) in the current\n"
@@ -734,7 +690,7 @@
" iyawacinga ngokwayo ngokusebenzisa umgudu wokucinga (UMGUDU we-variable).</p>"
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
msgid ""
"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
"system first searches for executable files (programs) in the current directory\n"
@@ -747,7 +703,7 @@
" iyawacinga ngokwayo ngokusebenzisa umgudu wokucinga (UMGUDU we-variable).</p>"
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
msgid ""
"<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
"search path, enabling files in the current path to be found and executed.\n"
@@ -764,7 +720,7 @@
" kulula uma usethe lokhu.</p>"
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
msgid ""
"<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
"path of root, making it the last to be searched.</p>"
@@ -773,7 +729,7 @@
"wokucinga womqondisi, okuyenza kube eyokugcina ukucingwa.</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
@@ -783,7 +739,7 @@
"kwi-directory enesiqalo esino-a \"./\". Isibonelo: \"./configure\".</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
msgid ""
"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
"will have some control over the system even if it crashes (for example, during kernel\n"
@@ -794,26 +750,26 @@
" kwikheneli). Ukuze uthole imininingwane, bheka /usr/src/linux/Documentation/sysrq.txt</p>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
msgid "<P>To change the current value, click the link associated to the option.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr ""
#. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
msgstr ""
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
msgid ""
"<P>A display manager provides a graphical login screen and can be accessed\n"
"across the network by an X server running on another system if so\n"
@@ -825,7 +781,7 @@
"logins, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
msgid ""
"<P>Upon startup, the system time is being set from the hardware clock of the\n"
"computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -833,23 +789,23 @@
"correct log messages.</P>"
msgstr ""
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
msgstr ""
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
msgstr ""
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
msgstr ""
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
msgstr ""
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
msgid ""
"<P>X Window clients, e.g. programs that open a window on your display, connect\n"
"to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -861,13 +817,13 @@
"Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>"
msgstr ""
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
msgid ""
"<P>The email delivery subsystem is always started. However, it does not expose\n"
"itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"updated, the service is restarted after the files in the package have been\n"
@@ -879,7 +835,7 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"uninstalled, the service is stopped before the files of the package are\n"
@@ -891,23 +847,23 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
msgstr ""
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
#, fuzzy
msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
msgstr ""
@@ -915,18 +871,113 @@
"uzokwazi ukulawula isistimu ngisho noma iyeka ukusebenza (ngokwesibonelo, njengalapho kususwa amaphutha\n"
" kwikheneli). Ukuze uthole imininingwane, bheka /usr/src/linux/Documentation/sysrq.txt</p>"
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
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:330
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:352
+#: src/include/security/helps.rb:333
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 ""
+#: src/include/security/helps.rb:341
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>Ukuphepha Kokuqalisa</big></b></p>\n"
+"<p>Kule dayalogi, shintsha amasethingi okuqalisa (boot) ahlukahlukene ahlobene nezokuphepha.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Incazelo ka-Ctrl + Alt + Del</b>:\n"
+"Hlela lokho isistimu okufanele ikwenze lapho othile\n"
+" kwi-console ecindezela izinkinobho u-CTRL + ALT + DEL\n"
+". Ngokuvamile isistimu iqala kabusha. Ngezinye izikhathi kuyinto enhle\n"
+" ukusishalazela lesi senzakalo, ngokwesibonelo, lapho isistimu isebenza njengakho kokubili\n"
+" i-workstation nesiphakelalwazi.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Incazelo ka-Ctrl + Alt + Del</b>:\n"
+"Hlela lokho isistimu okufanele ikwenze lapho othile\n"
+" kwi-console ecindezela izinkinobho u-CTRL + ALT + DEL\n"
+". Ngokuvamile isistimu iqala kabusha. Ngezinye izikhathi kuyinto enhle\n"
+" ukusishalazela lesi senzakalo, ngokwesibonelo, lapho isistimu isebenza njengakho kokubili\n"
+" i-workstation nesiphakelalwazi.</p>"
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+"<p><b>Incazelo ka-Ctrl + Alt + Del</b>:\n"
+"Hlela lokho isistimu okufanele ikwenze lapho othile\n"
+" kwi-console ecindezela izinkinobho u-CTRL + ALT + DEL\n"
+". Ngokuvamile isistimu iqala kabusha. Ngezinye izikhathi kuyinto enhle\n"
+" ukusishalazela lesi senzakalo, ngokwesibonelo, lapho isistimu isebenza njengakho kokubili\n"
+" i-workstation nesiphakelalwazi.</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+#, fuzzy
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+"<p><b>Indlela Yokuvala Ye-KDM</b>:\n"
+"Setha ukuthi ngubani ovunyelwe ukuvala umshini kwi-KDM.</p>"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+
#. level name
#: src/include/security/levels.rb:54
msgid "Workstation"
@@ -992,174 +1043,247 @@
"Isibalo esiphansi sezinhlamvu ze-ID yeqembu asikwazi ukuba ngaphezu kwesibalo esiphezulu sezinhlamvu\n"
"zayo. "
-#. ComboBox label
-#: src/include/security/widgets.rb:100
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "&Incazelo ka-Ctrl + Alt + Del"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
+#. 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: include/security/widgets.ycp
+#. * Module: Security configuration
+#. * Summary: Security widgets definitions
+#. * Authors: Michal Svec <msvec(a)suse.cz>
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
msgid "Ignore"
msgstr "Shalazela"
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
msgid "Reboot"
msgstr "Qala Kabusha"
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
msgid "Halt"
msgstr "Misa"
+#: src/include/security/widgets.rb:93
+msgid "Only root"
+msgstr "Umqondisi kuphela"
+
+#: src/include/security/widgets.rb:94
+msgid "All Users"
+msgstr "Bonke Abasebenzisi"
+
+#: src/include/security/widgets.rb:95
+msgid "Nobody"
+msgstr "Akukho muntu"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "&Incazelo ka-Ctrl + Alt + Del"
+
#. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
msgid "Allow Remote &Graphical Login"
msgstr "Vumela Ukungena &Kwezithombe Ezivela Kude:"
#. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
#, fuzzy
#| msgid "Enable &Magic SysRq Keys"
msgid "&Magic SysRq Keys"
msgstr "Yenza &Izikhiye Zomlingo Ze-SysRq Zisebenze"
#. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
#, fuzzy
#| msgid "Disabled"
msgid "Disable"
msgstr "Icishiwe"
#. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
#, fuzzy
#| msgid "Enable AppArmor Functions"
msgid "Enable All Functions"
msgstr "Vula Izinhlelo Ze-AppArmor"
#. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
msgid "&Delay after Incorrect Login Attempt"
msgstr "&Bambezela ngemva Komzamo Wokungena Onganembile"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
msgid "Maxim&um"
msgstr "Isibalo &Esiphezulu Esivumelekile"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
msgid "M&inimum"
msgstr "Isibalo &Esiphansi Esivumelekile"
#. ComboBox label
-#: src/include/security/widgets.rb:154
+#: src/include/security/widgets.rb:164
#, fuzzy
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "&Indlela Yokuvala Ye-KDM:"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-msgid "Only root"
-msgstr "Umqondisi kuphela"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-msgid "All Users"
-msgstr "Bonke Abasebenzisi"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-msgid "Nobody"
-msgstr "Akukho muntu"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
-#, fuzzy
#| msgid "System Designation"
msgid "System Hybernation"
msgstr "Ukuqanjwa kweSistimu"
#. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
msgid "User on the active console"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
msgid "Anyone can hibernate"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
#, fuzzy
#| msgid "Authentication Data"
msgid "Authentication always required"
msgstr "Ukwazisa Kokugunyaza"
#. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
msgid "P&assword Encryption Method"
msgstr "Indlela Yokufaka Ip&hasiwedi Amakhodi Okuphepha"
#. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
msgid "&Check New Passwords"
msgstr "&Hlola Amaphasiwedi Amasha"
#. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
msgid "Numb&er of Passwords to Remember"
msgstr "Isiba&lo Samaphasiwedi Okukhunjulwa"
#. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
msgid "&Minimum Acceptable Password Length"
msgstr "&Isilinganiso Esiphansi Sobude Bephasiwedi Evumelekile"
#. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
msgid "&Days before Password Expires Warning"
msgstr "&Isixwayiso Sezinsuku Ngaphambi Kokuba Iphasiwedi Iphelelwe Isikhathi:"
#. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
msgid "&File Permissions"
msgstr "&Izimvume Zamafayela"
#. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
msgid "Easy"
msgstr "Kulula"
#. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
msgid "Secure"
msgstr "Kuphephile"
#. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
msgid "Paranoid"
msgstr "I-Paranoid"
#. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
msgid "&User Launching updatedb"
msgstr "&Umsebenzisi Uqalisa i-updatedb"
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
msgid "Ma&ximum"
msgstr "Isibalo &Esiphezulu Esivumelekile"
#. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
msgid "&Minimum"
msgstr "&Isibalo Esiphansi Esivumelekile"
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "&Indlela Yokuvala Ye-KDM:"
+
#: src/include/security/wizards.rb:53
#, fuzzy
msgid "Predefined Security Configurations"
@@ -1176,66 +1300,66 @@
msgstr "Ilungiselela ukuqala..."
#. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
msgid "Saving Security Configuration"
msgstr "Igcina Ukuhlelwa Kokuphepha"
#. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
msgid "Write security settings"
msgstr "Bhala amasethingi okuphepha"
#. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
msgid "Write inittab settings"
msgstr "Bhala amasethingi e-inittab"
#. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
msgid "Write PAM settings"
msgstr "Bhala amasethingi e-PAM"
#. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
#, fuzzy
#| msgid "Save system settings"
msgid "Update system settings"
msgstr "Gcina amasethingi esistimu"
#. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
msgid "Writing security settings..."
msgstr "Ibhala amasethingi okuphepha..."
#. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
msgid "Writing inittab settings..."
msgstr "Ibhala amasethingi e-inittab..."
#. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
msgid "Writing PAM settings..."
msgstr "Ibhala amasethingi e-PAM..."
#. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
#, fuzzy
#| msgid "Saving system settings..."
msgid "Updating system settings..."
msgstr "Igcina amasethingi esistimu..."
#. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
msgid "Finished"
msgstr "Iphothulile"
#. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
msgid "Current Security Level: Custom settings"
msgstr "Izinga Lokuphepha Lamanje: Amasethingi Avunyelaniswe Nezidingo Zakho"
#. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
msgid "Current Security Level: %1"
msgstr "Izinga Lokuphepha Lamanje: %1"
Modified: trunk/yast/zu/po/services-manager.zu.po
===================================================================
--- trunk/yast/zu/po/services-manager.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/services-manager.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -299,13 +299,13 @@
#. 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
+#: src/modules/services_manager_service.rb:415
#, fuzzy
#| msgid "Could not add interface."
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr "Ayikwazanga ukwengeza okokusebenzisana."
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
#, fuzzy
#| msgid "Could not add interface."
msgid "Could not %{change} %{service}. "
Modified: trunk/yast/zu/po/snapper.zu.po
===================================================================
--- trunk/yast/zu/po/snapper.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/snapper.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -48,14 +48,14 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
msgid "Description"
msgstr "Incazelo"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
#, fuzzy
#| msgid "&User Map"
msgid "User data"
@@ -63,45 +63,45 @@
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
#, fuzzy
#| msgid "C&leanup Script"
msgid "Cleanup algorithm"
msgstr "Uhlelo seluleko lokuK&huculula"
#. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
+#: src/include/snapper/dialogs.rb:161
msgid "Modify Snapshot %{num}"
msgstr ""
#. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
+#: src/include/snapper/dialogs.rb:167
msgid "Modify Snapshot %{pre} and %{post}"
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:161
+#: src/include/snapper/dialogs.rb:169
#, fuzzy
#| msgid "Space Free (%1)"
msgid "Pre (%{pre})"
msgstr "Isikhala Esikhululekile (%1)"
#. label
-#: src/include/snapper/dialogs.rb:165
+#: src/include/snapper/dialogs.rb:173
#, fuzzy
#| msgid "USB port (%1)"
msgid "Post (%{post})"
msgstr "I-port (%1) Ye-USB "
#. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:250
#, fuzzy
#| msgid "Create New Partition"
msgid "Create New Snapshot"
msgstr "Yakha Ikamelo Elisha"
#. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:263
#, fuzzy
#| msgid "Reading list of users..."
msgid "Single snapshot"
@@ -109,250 +109,250 @@
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
msgid "Pre"
msgstr "Ngaphambi"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:282
msgid "Post, paired with:"
msgstr ""
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:358
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete snapshot %{num}?"
msgstr "Uyakusula ngempela '%1'?"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
+#: src/include/snapper/dialogs.rb:365
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete snapshots %{pre} and %{post}?"
msgstr "Uyakusula ngempela '%1'?"
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:380
msgid "Snapshots"
msgstr ""
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:409
#, fuzzy
#| msgid "Singapore"
msgid "Single"
msgstr "Singapore"
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:434
msgid "Pre & Post"
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:469
#, fuzzy
#| msgid "Reading list of users..."
msgid "Reading list of snapshots..."
msgstr "Ifunda uhlu lwabasebenzisi..."
#. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:485
#, fuzzy
#| msgid "Cl&ear Current Configuration"
msgid "Current Configuration"
msgstr "Sula Ukuhlela Kwamanje"
#. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:496
msgid "ID"
msgstr "I-ID"
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:497
msgid "Type"
msgstr "Uhlobo"
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:498
msgid "Start Date"
msgstr "Usuku Lokuqala"
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:499
msgid "End Date"
msgstr "Usuku Lokugcina"
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:501
#, fuzzy
#| msgid "Us&er Data"
msgid "User Data"
msgstr "Uk&waziswa Komsebenzisi"
#. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:507
#, fuzzy
#| msgid "No Change"
msgid "Show Changes"
msgstr "Alukho ushintsho"
#. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:510
#, fuzzy
#| msgid "&Modify"
msgid "Modify"
msgstr "&Lungisa"
#. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:553
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:634
+#: src/include/snapper/dialogs.rb:638
#, fuzzy
#| msgid "Selected IDE device"
msgid "Selected Snapshot Overview"
msgstr "Idivayisi ekhethiwe ye-IDE"
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:670
#, fuzzy
#| msgid "Next %1: %2"
msgid "%1: %2"
msgstr "Okulandelayo %1: %2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:689
#, fuzzy
#| msgid "Saving changes to the files..."
msgid "Calculating changed files..."
msgstr "Igcina izinguquko kumafayela..."
#. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:699
#, fuzzy
#| msgid "Accepting failed verifications"
msgid "Calculating file modifications..."
msgstr "Iyakwamukela ukufakazelwa okungaphumelelanga"
#. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:707
msgid "New file was created."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:711
msgid "File was removed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:716
msgid "File content was not changed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:722
#, fuzzy
#| msgid "File %1 does not exists"
msgid "File does not exist in either snapshot."
msgstr "Ifayela %1 ayikho"
#. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:728
#, fuzzy
#| msgid "File Contents: %1"
msgid "File content was modified."
msgstr "Oku&qukethwe Kwefayela: %1"
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:738
msgid "File mode was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:753
msgid "File user ownership was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:769
msgid "File group ownership was changed from '%1' to '%2'."
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:786
#, fuzzy
#| msgid "Restored Files:"
msgid "R&estore from First"
msgstr "Amafayela Abuyiselwe:"
#. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:788
#, fuzzy
#| msgid "Restore Options"
msgid "Restore"
msgstr "Izindlela Ongazikhetha Zokubuyisela"
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:811
#, fuzzy
#| msgid "Network Device Select"
msgid "Res&tore from Second"
msgstr "Khetha Idivayisi Ye-nethiwekhi"
#. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:848
msgid "Show the difference between snapshot and current system"
msgstr ""
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:860
msgid "Show the difference between current and selected snapshot:"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:907
msgid "Show the difference between first and second snapshot"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:918
msgid "Show the difference between first snapshot and current system"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:929
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:954
+#: src/include/snapper/dialogs.rb:958
msgid "Time of taking the snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:966
msgid "Time of taking the first snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:971
msgid "Time of taking the second snapshot:"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:994
msgid "&Open"
msgstr "&Vula"
#. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1040
#, fuzzy
#| msgid "Network Device Select"
msgid "Restore Selected"
msgstr "Khetha Idivayisi Ye-nethiwekhi"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1125
#, fuzzy
#| msgid "Do you really want to delete this entry?"
msgid ""
@@ -365,7 +365,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:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -375,21 +375,21 @@
msgstr ""
#. popup message
-#: src/include/snapper/dialogs.rb:1187
+#: src/include/snapper/dialogs.rb:1191
#, fuzzy
#| msgid "No package has been selected for installation."
msgid "No file was selected for restoring."
msgstr "Ayikho iphakheji ekhethiwe ukuze ifakwe."
#. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1201
#, fuzzy
#| msgid "Restoring Files"
msgid "Restoring files"
msgstr "Ukubuyisela Amafayela"
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1204
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
Modified: trunk/yast/zu/po/storage.zu.po
===================================================================
--- trunk/yast/zu/po/storage.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/storage.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -107,8 +107,7 @@
msgstr "&Yakha Uhlelo Lwephathishini Oluvumelana Nezidingo Zakho"
#. popup text
-#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -200,7 +199,13 @@
msgid "Not enough space available to propose separate /home."
msgstr ""
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
+#, fuzzy
+#| msgid "Set global root filesystem"
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr "Setha i-filesystem yer-root"
+
+#: src/clients/inst_disk_proposal.rb:304
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -1039,7 +1044,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6272
msgid "Propose Separate &Home Partition"
msgstr "Hlongoza Ukwakha &Iphathishini Ehlukile Yasekuqaleni"
@@ -1058,7 +1063,7 @@
msgstr "Uhlobo lokuhlongoza"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
#, fuzzy
msgid ""
"You have not assigned a root partition for\n"
@@ -1072,7 +1077,7 @@
" Yaba indawo yokuxhakathisa yomqondisi \"/\" kwiphathishini.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
#, fuzzy
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
@@ -1086,7 +1091,7 @@
" Sebenzisa isistimu yefayela yakwa-Linux, njenge-ext2 noma i-reiserfs, kulezi zindlela zokuxhakathisa.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
#, fuzzy
msgid ""
"You tried to mount a FAT partition to the\n"
@@ -1100,7 +1105,7 @@
" Sebenzisa isistimu yefayela yakwa-Linux, njenge-ext2 noma i-reiserfs, kulezi zindlela zokuxhakathisa.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
#, fuzzy
msgid ""
"You have mounted a partition with Btrfs to the\n"
@@ -1115,7 +1120,7 @@
#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1125,7 +1130,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
#, fuzzy
msgid ""
"Warning:\n"
@@ -1147,7 +1152,7 @@
" Kushintshe lokhu?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
#, fuzzy
msgid ""
"Warning:\n"
@@ -1163,7 +1168,7 @@
" Ingabe uyafuna ukukwenza lokhu?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1175,7 +1180,7 @@
#. 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:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
#, fuzzy
msgid ""
"Warning: There is no partition mounted as /boot.\n"
@@ -1194,7 +1199,7 @@
" Uyafuna ukushintsha uhlelo lwakho?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
#, fuzzy
msgid ""
"Warning: According to your setup, you intend to\n"
@@ -1215,11 +1220,11 @@
" \n"
" Kushintshe lokhu?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
"Really use this setup?\n"
msgstr ""
@@ -1380,7 +1385,7 @@
" Uyafuna ukushintsha uhlelo lwakho?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1389,7 +1394,7 @@
"Yisuse kwi-RAID ngaphambi kokuba uyihlele.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1398,7 +1403,7 @@
"Yisuse eqenjini levolumu ngaphambi kokuba uyihlele.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1407,7 +1412,7 @@
"Susa ivolumu ngaphambi kokuba uyihlele.\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1416,7 +1421,7 @@
"Yisuse kwi-RAID ngaphambi kokuba uyisule.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1424,13 +1429,13 @@
"Idivayisi (%2) isetshenziswa yi-%1.\n"
"Susa i-%1 ngaphambi kokuba uyisule.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
#, fuzzy
msgid "It cannot be deleted while mounted."
msgstr "Idivayisi ayitholakalanga."
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
#, fuzzy
#| msgid ""
#| "The device (%1) cannot be removed\n"
@@ -1445,7 +1450,7 @@
" iphathishini enenombolo ephezulu iyasetshenziswa.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
#, fuzzy
#| msgid ""
#| "The selected extended partition contains partitions which are currently mounted:\n"
@@ -1464,7 +1469,7 @@
" Chofoza uKhansela ngaphandle uma wazi kahle hle ukuthi yini oyenzayo.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1479,7 +1484,7 @@
" ngaphambi kokuba ususe iphathishini eyandisiwe.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1494,7 +1499,7 @@
" kokususa iphathishini eyandisiwe.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1515,15 +1520,15 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6400
#, fuzzy
#| msgid "Do not forget what you enter here."
msgid "Do not forget what you enter here!"
msgstr "Ungakukhohlwa okufaka lapha."
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
#, fuzzy
msgid "Empty password allowed."
msgstr "Ukukhetha okungenalutho akuvunyelwe."
@@ -1559,7 +1564,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
#, fuzzy
#| msgid "&Enter a password for your file system:"
msgid "&Enter a Password for your File System:"
@@ -1572,7 +1577,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:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
#, fuzzy
#| msgid "Reenter the password for &verification:"
msgid "Reenter the Password for &Verification:"
@@ -1598,7 +1603,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1609,7 +1614,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -2033,7 +2038,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6253
msgid "Enable Snapshots"
msgstr ""
@@ -2052,19 +2057,19 @@
msgid "Empty subvolume name not allowed."
msgstr "Ukukhetha okungenalutho akuvunyelwe."
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
#, fuzzy
#| msgid "Provider name %1 already exists."
msgid "Subvolume name %1 already exists."
msgstr "Igama lomphakeli %1 selikhona kakade."
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -2107,7 +2112,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
#, fuzzy
msgid ""
"<p>\n"
@@ -2127,7 +2132,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -2146,7 +2151,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2179,7 +2184,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2416,7 +2421,7 @@
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
msgid ""
"\n"
"WARNING:\n"
@@ -2431,12 +2436,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2444,32 +2449,32 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
#, fuzzy
#| msgid "Mount"
msgid "Unmount"
msgstr "Misa (mount)"
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
#, fuzzy
#| msgid "It is not possible to delete a NIS user."
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "Akunakwenzeka ukususa umsebenzisi we-NIS."
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
#, fuzzy
#| msgid "It is not possible to delete a NIS user."
msgid "It is not possible to extend the file system while it is mounted."
msgstr "Akunakwenzeka ukususa umsebenzisi we-NIS."
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid "It is not possible to resize the file system while it is mounted."
@@ -2763,11 +2768,9 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:40
-#: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61
-#: src/include/partitioning/ep-loop.rb:37
-#: src/include/partitioning/ep-lvm.rb:64
-#: src/include/partitioning/ep-raid.rb:38
+#: src/include/partitioning/ep-btrfs.rb:40 src/include/partitioning/ep-dm.rb:36
+#: src/include/partitioning/ep-hd.rb:61 src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38
msgid "Edit"
msgstr "Hlela"
@@ -2798,9 +2801,8 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:45
-#: src/include/partitioning/ep-hd.rb:43 src/include/partitioning/ep-hd.rb:64
-#: src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-btrfs.rb:45 src/include/partitioning/ep-hd.rb:43
+#: src/include/partitioning/ep-hd.rb:64 src/include/partitioning/ep-loop.rb:37
#: src/include/partitioning/ep-lvm.rb:44 src/include/partitioning/ep-lvm.rb:66
#: src/include/partitioning/ep-raid.rb:40
#: src/include/partitioning/ep-tmpfs.rb:36
@@ -2823,8 +2825,7 @@
#: src/include/partitioning/ep-btrfs.rb:140
#: src/include/partitioning/ep-btrfs.rb:205
#: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86
-#: src/include/partitioning/ep-loop.rb:54
-#: src/include/partitioning/ep-lvm.rb:86
+#: src/include/partitioning/ep-loop.rb:54 src/include/partitioning/ep-lvm.rb:86
#: src/include/partitioning/ep-raid.rb:59
#, fuzzy
msgid "Edit..."
@@ -2842,8 +2843,7 @@
#. push button text
#: src/include/partitioning/ep-btrfs.rb:145
#: src/include/partitioning/ep-hd.rb:92 src/include/partitioning/ep-loop.rb:56
-#: src/include/partitioning/ep-lvm.rb:90
-#: src/include/partitioning/ep-raid.rb:63
+#: src/include/partitioning/ep-lvm.rb:90 src/include/partitioning/ep-raid.rb:63
#: src/include/partitioning/ep-tmpfs.rb:112
#: src/include/partitioning/ep-tmpfs.rb:170
#, fuzzy
@@ -2916,38 +2916,44 @@
" </p>"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
#, fuzzy
+msgid "EFI Boot Partition"
+msgstr "Usayizi wephathishini."
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
+#, fuzzy
#| msgid "O&perating Mode"
msgid "Operating System"
msgstr "Imodi E&sebenzayo"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
#, fuzzy
#| msgid "Delta RPM Application Progress"
msgid "Data and ISV Applications"
msgstr "Ukusetshenziswa Kwe-Delta RPM Kusaqhubeka"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
msgid "Swap"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
msgid "Raw Volume (unformatted)"
msgstr ""
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
#, fuzzy
#| msgid "Role: %s"
msgid "Role"
msgstr "indima: %s"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
#, fuzzy
msgid ""
"<p>First, choose whether the partition should be\n"
@@ -2955,7 +2961,7 @@
msgstr "<p>Okokuqala, khetha uhlobo lwephathishini nokuthi le phathishini kufanele ifomathwe yini.</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2963,7 +2969,7 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
#, fuzzy
msgid ""
"<p>Then, choose whether the partition should\n"
@@ -2971,55 +2977,55 @@
msgstr "<p>Yibe usufaka indawo yokuxhakathisa ( /, /boot, /usr, /var, etc.)</p>"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
#, fuzzy
msgid "Formatting Options"
msgstr "&Okukhethwa Kukho Kokuhlela"
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
#, fuzzy
msgid "Format partition"
msgstr "Usayizi wephathishini."
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
#, fuzzy
msgid "Do not format partition"
msgstr "Usayizi wephathishini."
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
#, fuzzy
msgid "Do not mount partition"
msgstr "Idiski Ukuya Kwiphathishini"
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
#, fuzzy
msgid "Mounting Options"
msgstr "Izindlela Ongakhetha Kuzo Zokuxhakathisa"
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
#, fuzzy
msgid "Mount partition"
msgstr "iphathishini"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "Indawo Okugxunyekwe Kuyo"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
#, fuzzy
msgid "Fs&tab Options..."
msgstr "Okukhethwa kukho kwe-Fs&tab"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
#, fuzzy
msgid "Crypt files must be encrypted."
msgstr "Alukho uhlelo olukhethiwe."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
#, fuzzy
msgid ""
"You chose to create the crypt file, but did not specify\n"
@@ -3033,19 +3039,19 @@
" Futhi hlola okukhethwa kukho kokufomatha.\n"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
#, fuzzy
msgid "Crypt files require a mount point."
msgstr "Hlinzeka ngendawo yokuxhakathisa."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
#, fuzzy
msgid "Tmpfs requires a mount point."
msgstr "Hlinzeka ngendawo yokuxhakathisa."
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
#, fuzzy
msgid ""
"<p>\n"
@@ -3061,7 +3067,7 @@
" </p>\n"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -3070,23 +3076,23 @@
"</p>\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
#, fuzzy
#| msgid "All changes will be lost!"
msgid "All data stored on the volume will be lost!"
msgstr "Zonke izinguquko zizolahleka!"
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
msgid "Password"
msgstr "Iphasiwedi"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
msgid "Resize not supported by underlying device."
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -3096,7 +3102,7 @@
"Awukwazi ukushintsha usayizi wephathishini ekhethiwe ngoba isistimu yefayela\n"
" kule phathishini ayikusekeli ukushintshwa kukasayizi.\n"
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid ""
@@ -3105,7 +3111,7 @@
msgstr "Akunakwenzeka ukwakha iphathishini kwi-%1."
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
#, fuzzy
#| msgid ""
#| "Partition %1 cannot be resized\n"
@@ -3118,24 +3124,24 @@
"ngoba isistimu yefayela ibonakala ingavumelani.\n"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
#, fuzzy
msgid "Resize Partition %1"
msgstr "L&enze Libe Ngomunye Usayizi Ikamelo"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
#, fuzzy
msgid "Resize Logical Volume %1"
msgstr "Shintsha Usayizi Wevolumu Enengqondo"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
#, fuzzy
msgid "Current size: %1"
msgstr "Isimo Samanje: %1"
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
#, fuzzy
msgid "Currently used: %1"
msgstr "Isimo Samanje: %1"
@@ -3144,8 +3150,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -3157,7 +3163,7 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
#, fuzzy
@@ -3165,14 +3171,14 @@
msgstr "Usayizi We-Linux (%1)"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
#, fuzzy
msgid "Minimum Size (%1)"
msgstr "Usayizi We-Linux (%1)"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
#, fuzzy
@@ -3180,7 +3186,7 @@
msgstr "Usazizi We-Custom"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
#, fuzzy
msgid "<p>Choose new size.</p>"
msgstr ""
@@ -3190,7 +3196,7 @@
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
#, fuzzy
@@ -3203,7 +3209,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -3212,13 +3218,13 @@
msgstr ""
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
#, fuzzy
msgid "Output of %1"
msgstr "_Okuphumayo:"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
#, fuzzy
msgid "Rescanning disks..."
msgstr "Ifunda ukuhlukaniswa kediski..."
@@ -3438,67 +3444,67 @@
msgstr "I-LDAP URL efakiwe ayisebenzi."
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
#, fuzzy
msgid "Add Partition on %1"
msgstr "Hlela Iphathishini %1"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
msgid "Edit Partition %1"
msgstr "Hlela Iphathishini %1"
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
#, fuzzy
#| msgid "No space is left in the extended partition."
msgid "No space to moved partition %1."
msgstr "Asikho isikhala esishiyiwe kwiphathishini eyandisiwe."
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
#, fuzzy
#| msgid "Adding partition %1 to swap"
msgid "Move partition %1 forward?"
msgstr "Ukunezela iphathishini %1 ozoyishintshanisa"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
msgid "Move partition %1 backward?"
msgstr ""
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
#, fuzzy
msgid "Move partition %1?"
msgstr "iphathishini"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
#, fuzzy
#| msgid "&Forward"
msgid "Forward"
msgstr "&Phambili"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
#, fuzzy
#| msgid "Background"
msgid "Backward"
msgstr "Indawo Yokusebenzela"
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
#, fuzzy
msgid "Confirm Deleting of All Partitions"
msgstr "Ixhakathisa wonke amaphathishini..."
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
msgid ""
"The disk \"%1\" contains at least one partition.\n"
"If you proceed, the following partitions will be deleted:"
msgstr ""
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
#, fuzzy
msgid "Really delete all partitions on \"%1\"?"
msgstr "Uyawasusa ngempela wonke amaphathishini kwi-%1?"
@@ -3506,59 +3512,64 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
#, fuzzy
msgid "No hard disk selected."
msgstr "Abekho ogalaza abatholiwe"
#. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
msgid "The disk is in use and cannot be modified."
msgstr ""
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
#, fuzzy
msgid "Select new partition table type for %1."
msgstr "Ukugcina ithebula lephathishini lediski %1..."
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
#, fuzzy
msgid "No disk selected."
msgstr "Abekho ogalaza abatholiwe"
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
#, fuzzy
msgid "Really delete BIOS RAID %1?"
msgstr "Uyayisula ngempela i-%1?"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
#, fuzzy
#| msgid "Really delete all partitions on %1?"
msgid "Really delete Partitioned RAID %1?"
msgstr "Uyawasusa ngempela wonke amaphathishini kwi-%1?"
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
#, fuzzy
msgid "There are no partitions to delete on this disk."
msgstr "Akukho ongakukhetha ngale moduli"
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
msgid "It is not possible to create a partition on %1."
msgstr "Akunakwenzeka ukwakha iphathishini kwi-%1."
@@ -3566,29 +3577,29 @@
#. error popup
#. error popup
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
#, fuzzy
msgid "No partition selected."
msgstr "Awekho amaphathishini atholakele"
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
msgid ""
"The partition %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
#, fuzzy
msgid "An extended partition cannot be edited."
msgstr "Iphathishini eyandisiwe ayinakwakhiwa."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
#, fuzzy
#| msgid "The /var partition %1 could not be mounted.\n"
msgid ""
@@ -3597,26 +3608,26 @@
msgstr "I-/var partition %1 ayikwazanga ukuxhakathiswa.\n"
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
#, fuzzy
msgid "An extended partition cannot be moved."
msgstr "Iphathishini eyandisiwe ayinakwakhiwa."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
msgid ""
"The partition %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
#, fuzzy
msgid "An extended partition cannot be resized."
msgstr "Iphathishini eyandisiwe ayinakwakhiwa."
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -3626,49 +3637,49 @@
"partitions will be deleted.</p>\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
#, fuzzy
#| msgid "Really delete the selected option?"
msgid "Really delete these partitions?"
msgstr "Ngempela ufuna ukukusula okukhethile?"
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
msgid ""
"There are no partitions on this disk, but a clonable\n"
"disk must have at least one partition.\n"
"Create partitions before cloning the disk.\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
msgid ""
"This disk cannot be cloned. There are no suitable\n"
"disks that could have the same partitioning layout."
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
#, fuzzy
#| msgid "Repair Partition Table of %1"
msgid "Clone partition layout of %1"
msgstr "Lungisa Ithebula Lephathishini le-%1"
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
#, fuzzy
#| msgid "A&vailable are:"
msgid "Available target disks:"
msgstr "O&kutholakalayo yilokhu:"
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
msgid "Select a target disk for creating a clone"
msgstr ""
#. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
@@ -3677,7 +3688,7 @@
"Isetshenziswe ngempela i-dasdfmt kwidiski %1?\n"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3724,8 +3735,7 @@
msgstr "Yenyuka"
#: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43
-#: src/include/partitioning/ep-lvm.rb:65
-#: src/include/partitioning/ep-raid.rb:39
+#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39
#, fuzzy
msgid "Resize"
msgstr "Sh&intsha Usayizi"
@@ -3826,8 +3836,7 @@
#. push button text
#. push button text
-#: src/include/partitioning/ep-hd.rb:496
-#: src/include/partitioning/ep-lvm.rb:213
+#: src/include/partitioning/ep-hd.rb:496 src/include/partitioning/ep-lvm.rb:213
#: src/include/partitioning/ep-lvm.rb:337
#: src/include/partitioning/ep-tmpfs.rb:110
#, fuzzy
@@ -3949,54 +3958,54 @@
msgstr "Iphasiwedi enganembile!"
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
#, fuzzy
msgid "Confirm Deleting Partition Used by LVM"
msgstr "Ukususa ukuhlukaniswa kwamaphathishini %1$s"
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
msgid ""
"The selected partition is used by volume group \"%1\".\n"
"To keep the system in a consistent state, the following volume group\n"
"and its logical volumes will be deleted:\n"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
#, fuzzy
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr "Isikhumulo %1 sesivele sikhona."
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
#, fuzzy
msgid "Confirm Deleting Partition Used by RAID"
msgstr "Ukususa ukuhlukaniswa kwamaphathishini %1$s"
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
"To keep the system in a consistent state, the following\n"
"RAID device will be deleted:\n"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
#, fuzzy
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "Susa ukuhlukaniswa kwamaphathishini %1$s (%2$s)"
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
msgid "Really delete all partitions on %1?"
msgstr "Uyawasusa ngempela wonke amaphathishini kwi-%1?"
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
msgid "Really delete %1?"
msgstr "Uyayisula ngempela i-%1?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -4006,7 +4015,7 @@
#. Guarantee some minimal share (1%) of total graph width to the segment.
#. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
#, fuzzy
msgid "Unpartitioned"
msgstr "Izinhlelo Zamakamelo"
@@ -4015,36 +4024,36 @@
#. or the end of the disk if
#. 1. end +1th cyl is not the next one
#. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
#, fuzzy
msgid "Unallocated"
msgstr "Izinhlelo Zamakamelo"
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
#, fuzzy
msgid "<p>No changes to partitioning.</p>"
msgstr "<h1>Isexwayiso</h1>"
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "<h1>Isexwayiso</h1>"
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
msgid "<p>No changes to storage settings.</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
#, fuzzy
msgid "<p>Storage settings:</p>"
msgstr "Idivayisi Yokugcina Ukwaziswa"
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
#, fuzzy
msgid "<p>Packages to install:</p>"
msgstr "Idivayisi Yokugcina Ukwaziswa"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
msgid "<p>No packages need to be installed.</p>"
msgstr ""
@@ -4172,13 +4181,13 @@
" ukwakha i-flag kusebenze."
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
#, fuzzy
msgid "Add Crypt File"
msgstr "&Hlela Ifayela Yokufaka Amakhodi Okuphepha"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
#, fuzzy
msgid "Edit Crypt File %1"
msgstr "&Hlela Ifayela Yokufaka Amakhodi Okuphepha"
@@ -4524,13 +4533,13 @@
msgstr "Isetshenziswa Ngu"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
#, fuzzy
msgid "Add Logical Volume on %1"
msgstr "Hlela Ivolumu Enengqondo"
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
#, fuzzy
msgid "Edit Logical Volume %1 on %2"
msgstr "Hlela Ivolumu Enengqondo"
@@ -4568,9 +4577,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
#, fuzzy
msgid "No logical volume selected."
msgstr "Alukho uhlelo olukhethiwe."
@@ -4582,7 +4591,7 @@
msgstr "Asikho isikhala esitholakalayo eqenjini levolumu lamanje %1."
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
#, fuzzy
#| msgid ""
#| "\n"
@@ -4597,7 +4606,7 @@
" Ngeke iphinde itholakale.\n"
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
#, fuzzy
msgid ""
"The volume %1 is in use. It cannot be\n"
@@ -5006,19 +5015,19 @@
" </p>\n"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
#, fuzzy
msgid "Add RAID %1"
msgstr "Nezela i-RAI&D"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
#, fuzzy
msgid "Resize RAID %1"
msgstr "Su&sa i-RAID"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
#, fuzzy
msgid "Edit RAID %1"
msgstr "&Hlela I-RAID"
@@ -5314,7 +5323,7 @@
" </p>\n"
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
msgid "Add tmpfs Mount"
msgstr ""
@@ -6253,12 +6262,12 @@
msgstr ""
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:937
+msgid "Operation not permitted on disk %{device}.\n"
msgstr ""
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:942
#, fuzzy
#| msgid ""
#| "\n"
@@ -6272,11 +6281,44 @@
#| "disk here.\n"
msgid ""
"\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+"\n"
+"Ukwenziwa kwamaphathishini ediskini yakho %1 kungenzeka akufundeki ngethuluzi lokwenza\n"
+" amaphathishini elihlukanisiwe elisetshenziselwa\n"
+" ukushintsha ithebula lamaphathishini noma akusekelwa yileli thuluzi.\n"
+" \n"
+" Ungase uwasebenzise amaphathishini ediskini %1 njengoba enjalo noma\n"
+" uwafomathe futhi uwabele izindawo zokuxhakathisa, kodwa\n"
+" ngeke ukwazi ukwenezela, ukuhlela, ukushintsha usayizi, noma ukususa amaphathishini kuleyo\n"
+" diski lapha.\n"
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:954
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The partitioning on your disk %1 is either not readable by\n"
+#| "the partitioning tool parted used to change the\n"
+#| "partition table or is not supported by this tool.\n"
+#| "\n"
+#| "You may use the partitions on disk %1 as they are or\n"
+#| "format them and assign mount points to them, but you\n"
+#| "cannot add, edit, resize, or remove partitions from that\n"
+#| "disk here.\n"
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
"supported by the partitioning tool parted used to change the\n"
"partition table.\n"
"\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
"format them and assign mount points, but you cannot add, edit, \n"
"resize, or remove partitions from that disk here.\n"
msgstr ""
@@ -6290,8 +6332,8 @@
" ngeke ukwazi ukwenezela, ukuhlela, ukushintsha usayizi, noma ukususa amaphathishini kuleyo\n"
" diski lapha.\n"
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:966
#, fuzzy
#| msgid ""
#| "\n"
@@ -6305,11 +6347,11 @@
#| "disk here.\n"
msgid ""
"\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
"compatibility the kernel has automatically generated a\n"
"partition spanning almost the entire disk.\n"
"\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
"format it and assign a mount point, but you cannot resize\n"
"or remove the partition from that disk here.\n"
msgstr ""
@@ -6324,7 +6366,7 @@
" diski lapha.\n"
#. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:982
#, fuzzy
#| msgid ""
#| "\n"
@@ -6348,7 +6390,7 @@
" diski.\n"
#. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:992
msgid ""
"\n"
"\n"
@@ -6366,7 +6408,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
msgid "Resize Not Possible:"
msgstr "Ukushintsha Usayizi Akunakwenzeka:"
@@ -6379,7 +6421,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:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
#, fuzzy
#| msgid ""
#| "Could not set encryption.\n"
@@ -6398,7 +6440,7 @@
" Iphasiwedi yokufaka amakhodi okuphepha kungenzeka ayinembile.\n"
#. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
#, fuzzy
msgid ""
"The first and the second version\n"
@@ -6410,7 +6452,7 @@
" Sicela uphinde uzame."
#. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -6423,29 +6465,29 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "&Enter Encryption Password:"
msgstr "Faka Isikhiye Sokufakwa Kwamakhodi Okuphepha"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
#, fuzzy
#| msgid "Enter Provider Password"
msgid "Provide Password"
msgstr "Faka I-password Yomphakeli"
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
#, fuzzy
msgid "Encrypted Volume Activation"
msgstr "Iqembu Levolumu"
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6453,14 +6495,14 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
#, fuzzy
#| msgid "Do you want to retry?"
msgid "Do you want to provide encryption passwords?"
msgstr "Uyafuna ukuzama futhi?"
#. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6468,60 +6510,60 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "Enter Encryption Password"
msgstr "Faka Isikhiye Sokufakwa Kwamakhodi Okuphepha"
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for any of the following devices:"
msgstr "I-YaST2 ithole ledivayisi elandelayo"
#. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for the following device:"
msgstr "I-YaST2 ithole ledivayisi elandelayo"
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
#, fuzzy
#| msgid "DASD Disks"
msgid "IDE Disk"
msgstr "Amadiski E-DASD"
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
#, fuzzy
#| msgid "DASD Disks"
msgid "SCSI Disk"
msgstr "Amadiski E-DASD"
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
msgid "Disk"
msgstr "Idiski"
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
#, fuzzy
msgid "DM RAID"
msgstr "I-R&AID:"
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
#, fuzzy
msgid "MD RAID"
msgstr "I-R&AID:"
@@ -6529,50 +6571,50 @@
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
msgid "Installing required packages failed."
msgstr "Ukufaka amaphakheji adingekayo kuhlulekile."
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
#, fuzzy
#| msgid "Continue resizing the %1?"
msgid "Continue despite the error?"
msgstr "Qhubeka ushintsha usayisi we-%1?"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6580,7 +6622,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6588,7 +6630,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6596,20 +6638,20 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
#, fuzzy
#| msgid "Set global root filesystem"
msgid "Nothing assigned as root filesystem!"
msgstr "Setha i-filesystem yer-root"
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
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:6032
+#: src/modules/Storage.rb:6042
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -7266,64 +7308,49 @@
"You must quit that application before you can continue."
msgstr ""
-#. enable snapshots for root volume if desired
+#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
#, 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 "Ukufaka usayizi kabusha akunakwenzeka ngenxa ye-fs engavumelani. Zama ukuhlola i-fs ngaphansi kwe-Windows."
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-#, fuzzy
-#| msgid "Create &LVM Based Proposal"
-msgid "Create &LVM-based Proposal"
-msgstr "Yakha Ukuhlongoza Okusekewe Kwi-LVM"
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-#, fuzzy
-msgid "Encr&ypt Volume Group"
-msgstr "Iqembu Levolumu"
-
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6239
#, fuzzy
#| msgid "File system options:"
msgid "File System for Root Partition"
msgstr "Okukhethwa kukho kwesistimu yefayela:"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6286
#, fuzzy
#| msgid "Propose Separate &Home Partition"
msgid "File System for Home Partition"
msgstr "Hlongoza Ukwakha &Iphathishini Ehlukile Yasekuqaleni"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6304
msgid "Enlarge &Swap for Suspend"
msgstr ""
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6314
#, fuzzy
#| msgid "Write global settings"
msgid "Proposal Settings"
msgstr "Bhala amasethingi omhlaba wonke"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
-#, fuzzy
+#: src/modules/StorageProposal.rb:6329
msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
msgstr ""
-"<p>\n"
-"Ukuze wakhe ukuhlongoza okusekelwe kwi-LVM khetha inkinobho ehambisanyo.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6337
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"
@@ -7332,37 +7359,55 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6346
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:6325
+#: src/modules/StorageProposal.rb:6353
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:6350
+#: src/modules/StorageProposal.rb:6378
#, fuzzy
msgid "Enter your password for the proposal encryption."
msgstr "Faka iphasiwedi yakho ngesistimu yefayela efakwe amakhodi okuphepha."
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6385
msgid "Password:"
msgstr "I-password:"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6396
#, fuzzy
msgid "Reenter the password for verification:"
msgstr "Phinde ufake iphasiwedi &yokuqiniseka:"
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6594
+#, fuzzy
+msgid "&Partition-based Proposal"
+msgstr "Izinhlelo Zamakamelo"
+
+#: src/modules/StorageProposal.rb:6596
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "&LVM-based Proposal"
+msgstr "Yakha Ukuhlongoza Okusekewe Kwi-LVM"
+
+#: src/modules/StorageProposal.rb:6598
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "&Encrypted LVM-based Proposal"
+msgstr "Yakha Ukuhlongoza Okusekewe Kwi-LVM"
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -7412,6 +7457,18 @@
msgid "Visible Information on Storage Devices:"
msgstr "Imithombo Yokwaziswa Yomsebenzisi"
+#, fuzzy
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr "Iqembu Levolumu"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+#~ "LVM-based proposal can be encrypted.</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Ukuze wakhe ukuhlongoza okusekelwe kwi-LVM khetha inkinobho ehambisanyo.</p>"
+
#~ msgid "Changes:"
#~ msgstr "Izinguquko:"
@@ -7629,10 +7686,6 @@
#~ msgstr "Isistimu yefayela Yendawo"
#, fuzzy
-#~ msgid "&Partition Based"
-#~ msgstr "Izinhlelo Zamakamelo"
-
-#, fuzzy
#~ msgid "&LVM Based"
#~ msgstr "Kusekelwe emjikelezweni"
Modified: trunk/yast/zu/po/update.zu.po
===================================================================
--- trunk/yast/zu/po/update.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/update.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -439,7 +439,7 @@
msgstr "Ayikho enye kula mafayela etholakalayo:%1"
#. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -890,20 +890,20 @@
#. -----------------------------------------------------------------------
#. GLOBAL FUNCTIONS
#. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
#, fuzzy
msgid "Unknown Product"
msgstr "inqubo engaziwe"
#. If the current default desktop is not installed, it's a valid use case
#. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
msgid ""
"Cannot select these patterns required for installation:\n"
"%{patterns}"
msgstr ""
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
#, fuzzy
#| msgid "Failed to select %1 packages for installation."
msgid ""
Modified: trunk/yast/zu/po/users.zu.po
===================================================================
--- trunk/yast/zu/po/users.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/users.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -123,655 +123,6 @@
msgid "Do not ask for missing data; return error instead."
msgstr ""
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-msgid "User Authentication Method"
-msgstr "Indlela Yokugunyaza Umsebenzisi"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<b>Ukugunyaza</b><br>\n"
-" Khetha indlela yokugunyaza ozoyisebenzisa ngabasebenzisi abakwisistimu yakho.\n"
-" </p>"
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: 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>Khetha u-<b>Ekhaya</b> ukuze ugunyaze abasebenzisi kuphela ngokusebenzisa amafayela asekhaya <i>/etc/passwd</i> kanye no-<i>/etc/shadow</i>.</p>"
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr "Uma kukhona uhlelo obelufakiwe ngaphambili noma enye isistimu, kungenzeka ukwakha abasebenzisi abasekelwe kulo mthombo. Ukuze wenze kanjalo, khetha u-<b>Funda Ukwaziswa Komsebenzisi Ekufakweni Kohlelo Ngesikhathi Esidlule</b>. Lokhu kusebenzisa i-directory esikhona kakade noma kwakhe entsha yomsebenzisi ngamunye endaweni ebonisiwe yalokhu kufakwa kohlelo."
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-msgid "&LDAP"
-msgstr "&LDAP"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-msgid "N&IS"
-msgstr "N&IS"
-
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "&I-Samba"
-
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-msgid "&Windows Domain"
-msgstr "&I-Domain Ye-Windows "
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-msgid "L&ocal (/etc/passwd)"
-msgstr "E&khaya (/etc/passwd)"
-
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-msgid "eDirectory LDAP"
-msgstr "I-LDAP Ye-eDirectory"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Uma usebenzisa isiphakelalwazi se-NIS noma se-LDAP ukuze ugcine ukwaziswa komsebenzisi noma uma ufuna\n"
-"ukugunyaza abasebenzisi ngesiphakelalwazi se-NT, khetha i-value efanelekile. Yibe\n"
-" usuchofoza u-<b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Uma usebenzisa isiphakelalwazi se-NIS noma i-LDAP ukuze ugcine ukwaziswa komsebezisi, khetha\n"
-"i-value efanelekile. Yibe<b> usuchofoza u-</b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Uma usebenzisa isiphakelalwazi se-LDAP ukuze ugcine ukwaziswa komsebenzisi noma uma ufuna\n"
-"ukugunyaza abasebenzisi ngesiphakelalwazi se-NT, khetha i-value efanelekile. Yibe\n"
-" usuchofoza u-<b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Uma usebenzisa isiphakelalwazi se-LDAP ukuze ugcine ukwaziswa komsebezisi, khetha\n"
-"i-value efanelekile. Yibe<b> usuchofoza u-</b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr "<p>Chofoza u-<b>Hlela Ukugunyazwa Kwe-Kerberos</b> ukuze uhlele i-Kerberos ngemva kokuhlela umthombo wokwaziswa komsebenzisi.</p>"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-msgid "&Read User Data from a Previous Installation"
-msgstr "&Funda Ukwaziswa Komsebenzisi Ekufakweni Kohlelo Okudlule"
-
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-msgid "&Choose"
-msgstr "&Khetha"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-msgid "Authentication Method"
-msgstr "Indlela Yokugunyaza"
-
-#. check box label
-#: src/clients/inst_auth.rb:303
-msgid "Set Up &Kerberos Authentication"
-msgstr "Hlela Ukugunyazwa &Kwe-Kerberos"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-msgid "&Select Users to Read"
-msgstr "&Khetha Abasebenzisi Abazofunda"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-msgid "Select or Deselect &All"
-msgstr "Kukhethe Konke Noma Uyeke Ukukukhetha &Obusukukhethile"
-
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-msgid "Password for the System Administrator \"root\""
-msgstr "Iphasiwedi Yomdondisi Wesistimu \"root\""
-
-#. advise user to remember his new password
-#. advise users to remember their new password
-#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
-msgid "Do not forget what you enter here."
-msgstr "Ungakukhohlwa okufaka lapha."
-
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-msgid "&Password for root User"
-msgstr "&Iphasiwedi Yomsebenzisi ongumqondisi"
-
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-msgid "Con&firm Password"
-msgstr "Qin&isekisa Iphasiwedi"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-#, fuzzy
-msgid "&Test Keyboard Layout"
-msgstr "&I-Layout Yekhibhodi"
-
-#. push button
-#: src/clients/inst_root.rb:119
-msgid "E&xpert Options..."
-msgstr "Okukhethwa Kukho K&ongoti..."
-
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ngokungafani nabasebenzisi abavamile besistimu, ababhala imibhalo, yakha\n"
-" izithombe, noma upheqe i-Inthanethi, i-\"root\" exists on\n"
-" yomsebenzisi ikhona kuwo wonke amasistimu futhi iyacelwa ukuba yenze okuthile lapho imisebenzi yokuqondisa\n"
-" kudingeka ukuba yenziwe. Ngena kuphela njengomqondisi\n"
-" lapho udinga ukuba ngumqondisi wesistimu.\n"
-" </p>\n"
-
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ngenxa yokuthi umsebenzisi ongumqondisi uhlonyiswe ngezimvume eziningi, iphasiwedi \n"
-" ye-\"root\" kufanele ikhethwe ngokukhulu ukucophelela. Ingxube yezinhlamvu nezinombolo\n"
-" iyatuseka. Ukuze uqinisekise ukuthi iphasiwedi ifakwe ngokunembile,\n"
-" yiphinde ngokufana ncamashi esikhaleni sesibili.\n"
-" </p>\n"
-
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-#, fuzzy
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Yonke imithetho yamaphasiwedi abasebenzisi iyasebenza kwiphasiwedi ye-\"root\":\n"
-" Hlukanisa phakathi konobumbakazi nonobumba abavamile. Iphasiwedi kufanele okungenani\n"
-" ibe nezihlamvu ezingu-5, futhi njengomthetho, ingabi nezinhlamvu ezikhethekile\n"
-" njengezinhlamvu ezinama-accent noma ama-umlaut.\n"
-" </p>\n"
-
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ungayikhohlwa le phasiwedi ye-\"root\".\n"
-" </p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-"<p>Uma uhlose ukusebenzisa le phasiwedi ukuze wakhe izitifiketi,\n"
-"kumelwe okungenani ibe nezinhlamvu ezingu-%1 ubude.</p>"
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr ""
-
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. 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: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."
-msgstr ""
-"Amaphasiwedi awahambelani.\n"
-"Phinda uzame."
-
-#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"Ayikho iphasiwedi efakiwe.\n"
-"Phinda uzame."
-
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-#, fuzzy
-#| msgid ""
-#| "If you intend to create certificates,\n"
-#| "the password should have at least %1 characters.\n"
-#| "Really use this shorter password?"
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"Uma uhlose ukwakha izitifiketi,\n"
-"iphasiwedi kufanele okungenani ibe nezinhlamvu ezingu-%1 ubude.\n"
-" Uyafuna ngempela ukusebenzisa le phasiwedi emfushane?"
-
-#. last part of message popup
-#. last part of message popup
-#. 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:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-#, fuzzy
-#| msgid "&Reset Password"
-msgid "Really use this password?"
-msgstr "&Setha Kabusha Iphasiwedi"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-"Iphasiwedi ayivumanga ukusetheka.\n"
-"Ungase ungakwazi ukungena.\n"
-" Zama ukuphinde uyisethe futhi?\n"
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-msgid "Initialization of module for configuration of authentication..."
-msgstr "Ukulungiselela ukuqalisa imoduli yokuhlela kokugunyaza..."
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"Iphakheji %1 ayifakiwe.\n"
-"Yifake manje?\n"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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 "I-DES"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55
-#: src/include/users/helps.rb:56
-msgid "MD5"
-msgstr "I-MD5"
-
-#. encryption type
-#. encryption type
-#: 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:95 src/clients/users_proposal.rb:59
-msgid "SHA-512"
-msgstr ""
-
-#. frame label
-#: src/clients/inst_user_first.rb:143
-#, fuzzy
-msgid "Password Encryption Type"
-msgstr "Ukufaka Amakhodi Okuphepha Kwiphasiwedi"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: 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:151 src/include/users/widgets.rb:515
-msgid "&MD5"
-msgstr "I-MD5"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha256 crypt
-#: 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: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:162
-#, fuzzy
-#| msgid "<p><b>Login Settings</b></p>"
-msgid "<p><b>Authentication</b><br></p>"
-msgstr "<p><b>Amasethingi Okungena</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-#, fuzzy
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Indlela Yokufaka Amaphasiwedi Amakhodi Okuphepha"
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: 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:223 src/include/users/dialogs.rb:403
-msgid "User's &Full Name"
-msgstr "Igama &Lomsebenzizi Eliphelele"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-msgid "&Username"
-msgstr "&Igama Lomsebenzisi"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-#, fuzzy
-msgid "U&se this password for system administrator"
-msgstr "Iphasiwedi Yomdondisi Wesistimu \"root\""
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-msgid "Receive S&ystem Mail"
-msgstr "Yamukela I&meyili Yesistimu"
-
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-#, fuzzy
-msgid "&Automatic Login"
-msgstr "U&kungena Ngokuzenzakalelayo"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-#, fuzzy
-msgid "Create New User"
-msgstr "Yakha Ikamelo Elisha"
-
-#. yes-no popup headline
-#. 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:342 src/include/users/dialogs.rb:1112
-msgid "Empty User Login"
-msgstr "I-Login Yomsebenzisi Engenalutho"
-
-#. yes-no popup contents
-#. yes-no popup contents
-#: 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"
-"Leave it empty?"
-msgstr ""
-"ukushiya igama lomsebenzisi lingenalutho kuba nengqondo kuphela\n"
-"kwinethiwekhi enesiphakelalwazi esinesigunyazo.\n"
-" Lishiye lingenalutho? Lishiye lingenalutho?"
-
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: 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"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Faka <b>Igama Lomsebenzisi Eliphelele</b>, <b>Igama Lomsebenzisi</b>, kanye ne-<b>Phasiwedi</b> ukuze\n"
-" wabele le-akhawunti yomsebenzisi.\n"
-" </p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-#, fuzzy
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Lapho ufaka iphasiwedi, hlukanisa phakathi konobumbakazi\n"
-" nonobumba abancane. Amaphasiwedi akufanele abe nezinhlamvu ezikhethekile, njengezinhlamvu\n"
-" ezifakwe izimpawu (accents). \n"
-" </p>\n"
-
-#. 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:457 src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ngokufakwa kwamakhodi okuphepha kwiphasiwedi yamanje (%1), ubude bephasiwedi kufanele bube phakathi kwezinhlamvu ezingu-\n"
-" %2 nezingu-%3.\n"
-" </p>"
-
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-#, fuzzy
-#| msgid ""
-#| "<p>If you intend to use this password for creating certificates,\n"
-#| "it has to be at least %1 characters long.</p>"
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>Uma uhlose ukusebenzisa le phasiwedi ukuze wakhe izitifiketi,\n"
-"kumelwe okungenani ibe nezinhlamvu ezingu-%1 ubude.</p>"
-
-#. help text for main add user dialog
-#. help text 4/4
-#: 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"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ukuze uqinisekise ukuthi iphasiwedi ifakwe ngokunembile,\n"
-" yiphinde ngokufana ncamashi esikhaleni sesibili. Ungayikhohlwa iphasiwedi yakho.\n"
-" </p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:476
-#, fuzzy
-msgid ""
-"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ngokuthi <b>Igama Lomsebenzisi</b>, sebenzisa kuphela\n"
-" izinhlamvu zamagama (ezingafakiwe izimpawu), izinombolo kanye ne-<tt>._-</tt>.\n"
-" Ungabasebenzisi onobumbakazi kule entry ngale kokuba wazi ukuthi yini oyenzayo.\n"
-" Amagama abasebenzisi anemigoqo eqinile kunamaphasiwedi. Ungayilungisa le migoqo\n"
-" kwifayele ethi /etc/login.defs. Funda ikhasi layo eliyinhloko ukuze uthole ukwaziswa.\n"
-" </p>\n"
-
-#. help text for main add user dialog
-#: 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 ""
-
-#. 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: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"
-msgstr ""
-"<p>\n"
-"Igama lomsebenzisi nephasiwedi okwakhiwe lapha kuyadingeka ukuze ungene futhi usebenze ngesistimu yakho yakwa-Linux. Uma <b>Ukungena Ngokuzenzakalelayo</b> kuvuliwe, inqubo yokungena iyeqiwa. Umsebenzisi ungena ngokuzenzakalelayo.</p>\n"
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: 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"
-msgstr ""
-"<p>\n"
-"Yenza ukuba imeyili yomqondisi ithunyelwe kulo msebenzisi ngokuhlola okuthi <b>Yamukela Imeyili Yesistimu</b>.</p>\n"
-
-#. 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:573
-msgid "Expert Settings"
-msgstr "Amasethingi Enzelwe Ongoti"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-msgid "The authentication method is local /etc/passwd."
-msgstr ""
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-#, fuzzy
-msgid "The password encryption method is %s."
-msgstr "Indlela Yokufaka Amaphasiwedi Amakhodi Okuphepha"
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-#, fuzzy
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] "Isevisi %1 izoqalwa kabusha"
-msgstr[1] "Isevisi %1 izoqalwa kabusha"
-
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-msgid "&Change..."
-msgstr "&Shintsha..."
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-msgid "Summary"
-msgstr "Amabalengwe"
-
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-#, fuzzy
-#| msgid ""
-#| "If you intend to create certificates,\n"
-#| "the password should have at least %1 characters.\n"
-#| "Really use this shorter password?"
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Uma uhlose ukwakha izitifiketi,\n"
-"iphasiwedi kufanele okungenani ibe nezinhlamvu ezingu-%1 ubude.\n"
-" Uyafuna ngempela ukusebenzisa le phasiwedi emfushane?"
-
#. translators: command line help text for Users module
#: src/clients/users.rb:102
msgid "User configuration module"
@@ -893,12 +244,6 @@
msgid "New UID of the user"
msgstr "I-UID entsha yomsebenzisi"
-#. progress step title
-#: src/clients/users_finish.rb:63
-#, fuzzy
-msgid "Writing Users Configuration..."
-msgstr "Ibhala Ukuhlelwa Kwe-NIS..."
-
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -1157,106 +502,6 @@
msgid "Seconds"
msgstr "Imizuzwana"
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr "NIS"
-
-#. authentication type
-#: src/clients/users_proposal.rb:46
-#, fuzzy
-msgid "Samba (Windows Domain)"
-msgstr "&I-Domain Ye-Windows "
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-#, fuzzy
-msgid "<%1>Root Password<%2> set"
-msgstr "Iphasiwedi Yomqondisi"
-
-#: src/clients/users_proposal.rb:74
-#, fuzzy
-msgid "<%1>Root Password<%2> not set"
-msgstr "Iphasiwedi Yomqondisi"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-#, fuzzy
-msgid "No <%1>user<%2> configured"
-msgstr "Ayihleliwe"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "Ukugunyaza"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr "Ukugunyaza"
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-#, fuzzy
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr "%1 okufakiwe okuhleliwe"
-
-#. summary line, <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-#, fuzzy
-msgid "<%1>User<%2> %3 will be imported."
-msgstr "%1 okufakiwe okuhleliwe"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-#, fuzzy
-msgid "<%1>User<%2> %3 configured"
-msgstr "%1 okufakiwe okuhleliwe"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-#, fuzzy
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "%1 okufakiwe okuhleliwe"
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-#, fuzzy
-msgid "Password Encryption Method: %1"
-msgstr "Indlela Yokufaka Ip&hasiwedi Amakhodi Okuphepha"
-
-#. rich text label
-#: src/clients/users_proposal.rb:170
-#, fuzzy
-msgid "User Settings"
-msgstr "Amasethingi Esizinda"
-
-#. menu button label
-#: src/clients/users_proposal.rb:173
-msgid "&User"
-msgstr "&Umsebenzisi"
-
-#. menu button label
-#: src/clients/users_proposal.rb:175
-#, fuzzy
-msgid "&Root Password"
-msgstr "Iphasiwedi Yomqondisi"
-
#. password entering label
#: src/include/users/cmdline.rb:55
msgid "LDAP Server Password:"
@@ -1419,6 +664,24 @@
"amasethingi okufaka izihluthulelo zokuphepha zalo msebenzisi,\n"
" faka iphasiwedi yomsebenzisi yamanje."
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:471
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"Amaphasiwedi awahambelani.\n"
+"Phinda uzame."
+
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -1446,6 +709,13 @@
msgstr "Shintsha i-directory esekuqaleni ibe ku-%1?"
#. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:583
+msgid "User's &Full Name"
+msgstr "Igama &Lomsebenzizi Eliphelele"
+
+#. text entry
#: src/include/users/dialogs.rb:411
msgid "&First Name"
msgstr "&Igama"
@@ -1463,11 +733,31 @@
"Kubasebenzisi abakude, ubulungu beqembu\n"
"elengeziwe kuphela obungashintshwa."
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:590
+msgid "&Username"
+msgstr "&Igama Lomsebenzisi"
+
#. checkbox label
+#: src/include/users/dialogs.rb:446
+msgid "Receive S&ystem Mail"
+msgstr "Yamukela I&meyili Yesistimu"
+
+#. checkbox label
#: src/include/users/dialogs.rb:456
msgid "A&utomatic Login"
msgstr "U&kungena Ngokuzenzakalelayo"
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:614
+#, fuzzy
+msgid "U&se this password for system administrator"
+msgstr "Iphasiwedi Yomdondisi Wesistimu \"root\""
+
#. check box label
#: src/include/users/dialogs.rb:480
msgid "D&isable User Login"
@@ -1639,6 +929,35 @@
msgid "Plu&g-Ins"
msgstr "Ama-Plu&g-In"
+#. 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/include/users/dialogs.rb:1112
+msgid "Empty User Login"
+msgstr "I-Login Yomsebenzisi Engenalutho"
+
+#. yes-no popup contents
+#: 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"
+"Leave it empty?"
+msgstr ""
+"ukushiya igama lomsebenzisi lingenalutho kuba nengqondo kuphela\n"
+"kwinethiwekhi enesiphakelalwazi esinesigunyazo.\n"
+" Lishiye lingenalutho? Lishiye lingenalutho?"
+
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:483
+#, fuzzy
+#| msgid "&Reset Password"
+msgid "Really use this password?"
+msgstr "&Setha Kabusha Iphasiwedi"
+
#. popup question
#: src/include/users/dialogs.rb:1308
msgid "Change home directory to %1?"
@@ -1731,6 +1050,20 @@
msgid "Group &Data"
msgstr "Ukwaziswa &Kweqembu"
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+msgid "DES"
+msgstr "I-DES"
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+msgid "MD5"
+msgstr "I-MD5"
+
#. help text 1/4
#: src/include/users/helps.rb:62
#, fuzzy
@@ -1746,6 +1079,32 @@
" ezifakwe izimpawu (accents). \n"
" </p>\n"
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ngokufakwa kwamakhodi okuphepha kwiphasiwedi yamanje (%1), ubude bephasiwedi kufanele bube phakathi kwezinhlamvu ezingu-\n"
+" %2 nezingu-%3.\n"
+" </p>"
+
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ukuze uqinisekise ukuthi iphasiwedi ifakwe ngokunembile,\n"
+" yiphinde ngokufana ncamashi esikhaleni sesibili. Ungayikhohlwa iphasiwedi yakho.\n"
+" </p>\n"
+
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -1912,6 +1271,19 @@
" <b>Phasiwedi</b> ozokwabela lo msebenzisi.\n"
" </p>\n"
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Faka <b>Igama Lomsebenzisi Eliphelele</b>, <b>Igama Lomsebenzisi</b>, kanye ne-<b>Phasiwedi</b> ukuze\n"
+" wabele le-akhawunti yomsebenzisi.\n"
+" </p>\n"
+
#. help text 2/7
#: src/include/users/helps.rb:226
msgid ""
@@ -1952,6 +1324,25 @@
" kwifayele ethi /etc/login.defs. Funda ikhasi layo eliyinhloko ukuze uthole ukwaziswa.\n"
" </p>\n"
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
+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"
+msgstr ""
+"<p>\n"
+"Igama lomsebenzisi nephasiwedi okwakhiwe lapha kuyadingeka ukuze ungene futhi usebenze ngesistimu yakho yakwa-Linux. Uma <b>Ukungena Ngokuzenzakalelayo</b> kuvuliwe, inqubo yokungena iyeqiwa. Umsebenzisi ungena ngokuzenzakalelayo.</p>\n"
+
+#. help text 5/7 (only during installation)
+#: 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"
+msgstr ""
+"<p>\n"
+"Yenza ukuba imeyili yomqondisi ithunyelwe kulo msebenzisi ngokuhlola okuthi <b>Yamukela Imeyili Yesistimu</b>.</p>\n"
+
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2715,7 +2106,8 @@
msgstr "&Abasebenzisi Besistimu"
#. the type of user set
-#: src/include/users/widgets.rb:79
+#. New user is the default option
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
#, fuzzy
msgid "Local Users"
msgstr "&Abasebenzisi Abasekhaya"
@@ -2800,6 +2192,11 @@
msgstr "Amaqembu E-Sam&ba"
#. richtext label
+#: src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr "NIS"
+
+#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr ""
@@ -2819,6 +2216,11 @@
msgid "&SSSD"
msgstr ""
+#. menubutton label
+#: src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "&I-Samba"
+
#. tab header
#: src/include/users/widgets.rb:168
msgid "&Users"
@@ -2948,6 +2350,11 @@
" amaphrothokholi enethiwekhi awayisekeli le nto futhi kungenzeka ube nezinkinga nge-NIS.\n"
" </p>"
+#. Help text for password expert dialog 4/5
+#: 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 ""
+
#. Label
#: src/include/users/widgets.rb:499
msgid "Password Encryption"
@@ -2958,6 +2365,26 @@
msgid "Encryption Type"
msgstr "Uhlobo Lokufaka Amakhodi Okuphepha"
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr ""
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr "I-MD5"
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr ""
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr ""
+
#. help text 1/3
#: src/include/users/widgets.rb:582
msgid ""
@@ -3259,6 +2686,12 @@
#. type of user/group
#. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
msgid "System"
msgstr "Isistimu"
@@ -3595,6 +3028,15 @@
msgid "Package %1 is not available for installation."
msgstr "Iphakheji %1 edingekayo ayifakiwe futhi ayitholakali ukuze ifakwe."
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"Iphakheji %1 ayifakiwe.\n"
+"Yifake manje?\n"
+
#. dialog caption
#: src/include/users/wizards.rb:102
msgid "User and Group Administration"
@@ -3612,6 +3054,438 @@
msgid "Initializing..."
msgstr "Ilungiselela ukuqala..."
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+#, fuzzy
+#| msgid ""
+#| "If you intend to create certificates,\n"
+#| "the password should have at least %1 characters.\n"
+#| "Really use this shorter password?"
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Uma uhlose ukwakha izitifiketi,\n"
+"iphasiwedi kufanele okungenani ibe nezinhlamvu ezingu-%1 ubude.\n"
+" Uyafuna ngempela ukusebenzisa le phasiwedi emfushane?"
+
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+#, fuzzy
+#| msgid ""
+#| "<p>If you intend to use this password for creating certificates,\n"
+#| "it has to be at least %1 characters long.</p>"
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>Uma uhlose ukusebenzisa le phasiwedi ukuze wakhe izitifiketi,\n"
+"kumelwe okungenani ibe nezinhlamvu ezingu-%1 ubude.</p>"
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+#, fuzzy
+msgid "Writing Users Configuration..."
+msgstr "Ibhala Ukuhlelwa Kwe-NIS..."
+
+#. Copyright (c) 2016 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+#, fuzzy
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Indlela Yokufaka Amaphasiwedi Amakhodi Okuphepha"
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr ""
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+#, fuzzy
+msgid "Password Encryption Type"
+msgstr "Ukufaka Amakhodi Okuphepha Kwiphasiwedi"
+
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+msgid "Do not forget what you enter here."
+msgstr "Ungakukhohlwa okufaka lapha."
+
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+msgid "&Password for root User"
+msgstr "&Iphasiwedi Yomsebenzisi ongumqondisi"
+
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+msgid "Con&firm Password"
+msgstr "Qin&isekisa Iphasiwedi"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+#, fuzzy
+msgid "&Test Keyboard Layout"
+msgstr "&I-Layout Yekhibhodi"
+
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngokungafani nabasebenzisi abavamile besistimu, ababhala imibhalo, yakha\n"
+" izithombe, noma upheqe i-Inthanethi, i-\"root\" exists on\n"
+" yomsebenzisi ikhona kuwo wonke amasistimu futhi iyacelwa ukuba yenze okuthile lapho imisebenzi yokuqondisa\n"
+" kudingeka ukuba yenziwe. Ngena kuphela njengomqondisi\n"
+" lapho udinga ukuba ngumqondisi wesistimu.\n"
+" </p>\n"
+
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngenxa yokuthi umsebenzisi ongumqondisi uhlonyiswe ngezimvume eziningi, iphasiwedi \n"
+" ye-\"root\" kufanele ikhethwe ngokukhulu ukucophelela. Ingxube yezinhlamvu nezinombolo\n"
+" iyatuseka. Ukuze uqinisekise ukuthi iphasiwedi ifakwe ngokunembile,\n"
+" yiphinde ngokufana ncamashi esikhaleni sesibili.\n"
+" </p>\n"
+
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+#, fuzzy
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Yonke imithetho yamaphasiwedi abasebenzisi iyasebenza kwiphasiwedi ye-\"root\":\n"
+" Hlukanisa phakathi konobumbakazi nonobumba abavamile. Iphasiwedi kufanele okungenani\n"
+" ibe nezihlamvu ezingu-5, futhi njengomthetho, ingabi nezinhlamvu ezikhethekile\n"
+" njengezinhlamvu ezinama-accent noma ama-umlaut.\n"
+" </p>\n"
+
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ungayikhohlwa le phasiwedi ye-\"root\".\n"
+" </p>"
+
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+msgid "Password for the System Administrator \"root\""
+msgstr "Iphasiwedi Yomdondisi Wesistimu \"root\""
+
+#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"Ayikho iphasiwedi efakiwe.\n"
+"Phinda uzame."
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:134
+#, fuzzy
+#| 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>"
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr "<p>Khetha u-<b>Ekhaya</b> ukuze ugunyaze abasebenzisi kuphela ngokusebenzisa amafayela asekhaya <i>/etc/passwd</i> kanye no-<i>/etc/shadow</i>.</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+msgid "Create new user"
+msgstr "Yakha Ikamelo Elisha"
+
+#: src/lib/users/dialogs/inst_user_first.rb:142
+#, fuzzy
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Lapho ufaka iphasiwedi, hlukanisa phakathi konobumbakazi\n"
+" nonobumba abancane. Amaphasiwedi akufanele abe nezinhlamvu ezikhethekile, njengezinhlamvu\n"
+" ezifakwe izimpawu (accents). \n"
+" </p>\n"
+
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:149
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "With the current password encryption (%1), the password length should be between\n"
+#| " %2 and %3 characters.\n"
+#| "</p>"
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngokufakwa kwamakhodi okuphepha kwiphasiwedi yamanje (%1), ubude bephasiwedi kufanele bube phakathi kwezinhlamvu ezingu-\n"
+" %2 nezingu-%3.\n"
+" </p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:165
+#, fuzzy
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngokuthi <b>Igama Lomsebenzisi</b>, sebenzisa kuphela\n"
+" izinhlamvu zamagama (ezingafakiwe izimpawu), izinombolo kanye ne-<tt>._-</tt>.\n"
+" Ungabasebenzisi onobumbakazi kule entry ngale kokuba wazi ukuthi yini oyenzayo.\n"
+" Amagama abasebenzisi anemigoqo eqinile kunamaphasiwedi. Ungayilungisa le migoqo\n"
+" kwifayele ethi /etc/login.defs. Funda ikhasi layo eliyinhloko ukuze uthole ukwaziswa.\n"
+" </p>\n"
+
+#: src/lib/users/dialogs/inst_user_first.rb:172
+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 ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "Import User Data from a Previous Installation"
+msgstr "&Funda Ukwaziswa Komsebenzisi Ekufakweni Kohlelo Okudlule"
+
+#: src/lib/users/dialogs/inst_user_first.rb:184
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:193
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:275
+#, fuzzy
+msgid "Local User"
+msgstr "&Abasebenzisi Abasekhaya"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:330
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:387
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:514
+#, fuzzy
+msgid "&Create New User"
+msgstr "Yakha Ikamelo Elisha"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:537
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "&Import User Data from a Previous Installation"
+msgstr "&Funda Ukwaziswa Komsebenzisi Ekufakweni Kohlelo Okudlule"
+
+#: src/lib/users/dialogs/inst_user_first.rb:547
+#, fuzzy
+msgid "Choose Users"
+msgstr "&Abasebenzisi Besistimu"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:563
+msgid "&Skip User Creation"
+msgstr ""
+
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:619
+#, fuzzy
+msgid "&Automatic Login"
+msgstr "U&kungena Ngokuzenzakalelayo"
+
+#: src/lib/users/dialogs/inst_user_first.rb:626
+#, fuzzy
+#| msgid "No user was specified."
+msgid "No users selected"
+msgstr "Akekho umsebenzisi obonisiwe."
+
+#: src/lib/users/dialogs/inst_user_first.rb:628
+#, fuzzy
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] "Isevisi %1 izoqalwa kabusha"
+msgstr[1] "Isevisi %1 izoqalwa kabusha"
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+msgid "&Select Users to Read"
+msgstr "&Khetha Abasebenzisi Abazofunda"
+
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+msgid "Select or Deselect &All"
+msgstr "Kukhethe Konke Noma Uyeke Ukukukhetha &Obusukukhethile"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+msgid "SHA-256"
+msgstr ""
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+msgid "SHA-512"
+msgstr ""
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "Indlela Yokufaka Ip&hasiwedi Amakhodi Okuphepha"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+msgid "Password &Encryption Type"
+msgstr "Ukufaka Amakhodi Okuphepha Kwiphasiwedi"
+
+#. rich text label
+#: src/lib/users/proposal.rb:75
+#, fuzzy
+msgid "User Settings"
+msgstr "Amasethingi Esizinda"
+
+#. menu button label
+#: src/lib/users/proposal.rb:78
+msgid "&User"
+msgstr "&Umsebenzisi"
+
+#. menu button label
+#: src/lib/users/proposal.rb:80
+#, fuzzy
+msgid "&Root Password"
+msgstr "Iphasiwedi Yomqondisi"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+#, fuzzy
+msgid "<%1>Root Password<%2> set"
+msgstr "Iphasiwedi Yomqondisi"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+#, fuzzy
+msgid "<%1>Root Password<%2> not set"
+msgstr "Iphasiwedi Yomqondisi"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+#, fuzzy
+msgid "No <%1>user<%2> configured"
+msgstr "Ayihleliwe"
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+#, fuzzy
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] "%1 okufakiwe okuhleliwe"
+msgstr[1] "%1 okufakiwe okuhleliwe"
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+#, fuzzy
+msgid "<%1>User<%2> %3 configured"
+msgstr "%1 okufakiwe okuhleliwe"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+#, fuzzy
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "%1 okufakiwe okuhleliwe"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "Indlela Yokufaka Ip&hasiwedi Amakhodi Okuphepha"
+
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
msgid "root"
@@ -4086,7 +3960,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:722
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -4105,202 +3979,202 @@
" ngemva kokuba uwaxhakathise ngendlela efanele. Qhubeka nokuhlela komsebenzisi?"
#. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:970
msgid "Multiple users satisfy the input conditions."
msgstr "Abasebenzisi abaningi bayahlangabezana nezidingo zokwaziswa okufakiwe."
#. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1548
msgid "Initializing User and Group Configuration"
msgstr "Ilungiselela Ukuqalisa Ukuhlela Kweqembu Labasebenzisi"
#. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1555
msgid "Read the default login settings"
msgstr "Funda amasethingi okungena ayi-default"
#. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1557
msgid "Read the default system settings"
msgstr "Funda amasethingi esistimu ayi-default"
#. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1559
msgid "Read the configuration type"
msgstr "Funda uhlobo lokuvumelanisa"
#. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1561
msgid "Read the user custom settings"
msgstr "Funda amasethingi afanelaniswe nezidingo zomsebenzisi"
#. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1563
msgid "Read users and groups"
msgstr "Funda abasebenzisi namaqembu"
#. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1565
msgid "Build the cache structures"
msgstr "Yakha izinhlaka zengobolwazi yesikhashana"
#. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1569
msgid "Reading the default login settings..."
msgstr "Ifunda amasethingi okungena ayi-default..."
#. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1571
msgid "Reading the default system settings..."
msgstr "Ifunda amasethingi esistimu ayi-default..."
#. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1573
msgid "Reading the configuration type..."
msgstr "Ifunda uhlobo lokuhlela..."
#. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1575
msgid "Reading custom settings..."
msgstr "Ifunda amasethingi avunyelaniswe nezidingo zomsebenzisi..."
#. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1577
msgid "Reading users and groups..."
msgstr "Ifunda abasebenzisi namaqembu..."
#. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1579
msgid "Building the cache structures..."
msgstr "Yakha izinhlaka zengobolwazi yesikhashana..."
#. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
msgid "Finished"
msgstr "Iphothulile"
#. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2137
msgid "User does not exist."
msgstr "Umsebenzisi akatholakali."
#. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2389
msgid "Group does not exist."
msgstr "Iqembu alitholakali:"
#. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4258
msgid "Writing User and Group Configuration"
msgstr "Ibhala Ukuhlela Komsebenzisi Neqembu"
#. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4267
msgid "Write LDAP users and groups"
msgstr "Bhala abasebenzisi namaqembu e-LDAP"
#. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4269
msgid "Write groups"
msgstr "Bhala amaqembu"
#. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4271
msgid "Check for deleted users"
msgstr "Hlola abasebenzisi abasusiwe"
#. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4273
msgid "Write users"
msgstr "Bhala abasebenzisi"
#. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4275
msgid "Write passwords"
msgstr "Bhala amaphasiwedi"
#. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4277
msgid "Write the custom settings"
msgstr "Bhala amasethingi avunyelaniswe nezidingo zomsebenzisi"
#. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4279
msgid "Write the default login settings"
msgstr "Bhala amasethingi okungena ayi-default"
#. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4282
msgid "Writing LDAP users and groups..."
msgstr "Ibhala abasebenzisi namaqembu e-LDAP..."
#. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4284
msgid "Writing groups..."
msgstr "Ibhala amaqembu..."
#. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4286
msgid "Checking deleted users..."
msgstr "Ihlola abasebenzisi abasusiwe..."
#. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4288
msgid "Writing users..."
msgstr "Ibhala abasebenzisi..."
#. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4290
msgid "Writing passwords..."
msgstr "Ibhala amaphasiwedi..."
#. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4292
msgid "Writing the custom settings..."
msgstr "Ibhala amasethingi avunyelaniswe nezidingo zabasebenzisi..."
#. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4294
msgid "Writing the default login settings..."
msgstr "Ibhala amasethingi okungena ayi-default..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4379
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr "Ifayela %s ayizange ifundwe ngokunembile, ngakho ngeke ibhalwe."
#. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
msgid "An error occurred while removing users."
msgstr "Kwenzeke iphutha ngesikhathi kususwa abasebenzisi."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr "Ifayela %s ayizange ifundwe ngokunembile, ngakho ngeke ibhalwe."
#. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4565
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
msgid "An error occurred while setting forwarding for root's mail."
msgstr "Kwenzeke iphutha ngesikhathi isetha uhlelo lokuthumela kwimeyili yomsebenzisi."
#. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4843
msgid "No UID is available for this type of user."
msgstr "Ayikho i-UID etholakalayo yalolu hlobo lomsebenzisi."
#. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4874
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4310,7 +4184,7 @@
"Khetha i-interger ephakathi kuka-%i no-%i."
#. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4905
msgid ""
"The user ID entered is already in use.\n"
"Really use it?"
@@ -4319,7 +4193,7 @@
"Ufuna ukuyisebenzisa ngempela?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4918
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4331,7 +4205,7 @@
" Ufuna ukuyisebenzisa ngempela?"
#. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4933
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4343,7 +4217,7 @@
" Ingabe ngempela ufuna ukulushintsha lolu hlobo lube ‘olwasekhaya’?"
#. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4947
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4354,14 +4228,14 @@
"ngoba le-ID ingaphansi kuka-%i.\n"
" Ingabe ngempela ufuna ukulushintsha lolu hlobo lube ‘olwesistimu’?"
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4981
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
msgstr ""
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4985
#, fuzzy
msgid ""
"There is a conflict between the entered\n"
@@ -4373,7 +4247,7 @@
" Zama elinye igama."
#. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5015
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
@@ -4382,7 +4256,7 @@
"ukuba ne-colon (:). Phinda uzame."
#. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5022
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4393,7 +4267,7 @@
" Susa ezinye."
#. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5085
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4404,7 +4278,7 @@
" Phinda uzame."
#. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5108
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4414,7 +4288,7 @@
"Khetha omunye umgudu we-directory esekuqaleni."
#. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5119
msgid ""
"The home directory is used by another user.\n"
"Try again."
@@ -4423,7 +4297,7 @@
"Phinda uzame."
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5161
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4434,7 +4308,7 @@
" Ufuna ukuwusebenzisa ngempela lo mgudu?"
#. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5172
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4444,7 +4318,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5179
#, fuzzy, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4456,7 +4330,7 @@
" Yisebenzise le directory?"
#. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5188
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4470,7 +4344,7 @@
" Yisebenzise le directory?"
#. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5216
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
@@ -4479,12 +4353,12 @@
"Lisebenzise leli gobolondo?"
#. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5236
msgid "No GID is available for this type of group."
msgstr "Ayikho i-GID etholakalayo yalolu hlobo lweqembu."
#. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5269
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4494,7 +4368,7 @@
"Khetha i-interger ephakathi kuka-%i no-%i."
#. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5299
msgid ""
"The group ID entered is already in use.\n"
"Really use it?"
@@ -4503,7 +4377,7 @@
"Ufuna ukuyisebenzisa ngempela?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5311
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4515,7 +4389,7 @@
" Ufuna ukuyisebenzisa ngempela?"
#. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5326
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4527,7 +4401,7 @@
" Ingabe ngempela ufuna ukulushintsha lolu hlobo lube ‘olwasekhaya’?"
#. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5340
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4539,7 +4413,7 @@
" Ingabe ngempela ufuna ukulushintsha lolu hlobo lube ‘olwesistimu’?"
#. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5359
msgid ""
"No group name entered.\n"
"Try again."
@@ -4548,7 +4422,7 @@
"Phinda uzame."
#. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5376
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4558,7 +4432,7 @@
"Phinda uzame."
#. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5389
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4571,7 +4445,7 @@
" Phinda uzame."
#. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5397
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
@@ -4581,14 +4455,14 @@
"leqembu elifakiwe kanye negama leqembu eselikhona kakade.\n"
" Zama elinye igama."
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5513
#, fuzzy, perl-format
#| msgid "User does not exist."
msgid "User %s does not exist."
msgstr "Umsebenzisi akatholakali."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5567
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4599,7 +4473,7 @@
" njengeqembu labo labasebenzisi"
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5574
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4610,23 +4484,23 @@
" Susa laba basebenzisi kuqala eqenjini."
#. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6587
msgid "<h3>Users</h3>"
msgstr "<h3>Abasebenzisi</h3>"
#. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6597
msgid "<h3>Groups</h3>"
msgstr "<h3>Amaqembu</h3>"
#. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6608
#, fuzzy
msgid "<h3>Login Settings</h3>"
msgstr "Amasethingi Okungena"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6610
msgid "User %1 configured for automatic login"
msgstr ""
@@ -4646,22 +4520,22 @@
"etholakala esiphakelalwazini se-LDAP. Yakhe manje?"
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
#, fuzzy
msgid "Kerberos Configuration"
msgstr "Ukuhlela Ukuzifaka Kohlelo (Autoinstall Configuration)"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
msgid "No Kerberos Management for Groups"
msgstr ""
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
msgid "Manage Kerberos Principials"
msgstr ""
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
msgid "Cannot execute kadmin.local."
msgstr ""
@@ -4797,7 +4671,7 @@
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:505
+#: src/modules/UsersSimple.pm:379
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -4809,7 +4683,7 @@
" Phinda uzame."
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4824,7 +4698,7 @@
" </p>"
#. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
msgid ""
"The user's full name cannot contain\n"
"\":\" or \",\" characters.\n"
@@ -4835,7 +4709,7 @@
" Phinda uzame."
#. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
#, fuzzy
#| msgid ""
#| "You have used the group name as a part of the password.\n"
@@ -4846,7 +4720,7 @@
"Lona umkhuba obeka engozini ukuphepha kwakho. Ufuna ukuyisebenzisa ngempela le phasiwedi?"
#. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
#, fuzzy
#| msgid ""
#| "You have used the username as a part of the password.\n"
@@ -4857,7 +4731,7 @@
"Lona umkhuba obeka engozini ukuphepha kwakho. Ufuna ukuyisebenzisa ngempela le phasiwedi?"
#. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -4868,7 +4742,7 @@
"Usebenzise onobumbakazi kwi-entry yokungena yomsebenzisi.</p>"
#. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -4879,7 +4753,7 @@
"Usebenzise onobumbakazi kwi-entry yokungena yomsebenzisi.</p>"
#. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -4890,12 +4764,12 @@
"Ukushintshile ukufakwa kwamakhodi okuyi-default kwamaphasiwedi abasebenzisi.</p>"
#. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
msgid "You have used only digits for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
#, fuzzy, perl-format
#| msgid ""
#| "The password is too long for the current encryption method.\n"
@@ -4908,7 +4782,7 @@
"Yinqunte ibe yizinhlamvu ezingu-%s?"
#. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
#, fuzzy, perl-format
#| msgid ""
#| "The password is too simple:\n"
@@ -4923,7 +4797,7 @@
" Ufuna ukuyisebenzisa ngempela le phasiwedi?"
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
#, fuzzy, perl-format
#| msgid ""
#| "The password must have at least %1 characters.\n"
@@ -4934,7 +4808,7 @@
"Phinda uzame.\n"
#. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
msgid ""
"No username entered.\n"
"Try again."
@@ -4943,7 +4817,7 @@
"Phinda uzame."
#. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
#, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -4953,7 +4827,7 @@
"Phinda uzame."
#. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
msgid ""
"The username may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4966,7 +4840,7 @@
" Phinda uzame."
#. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
msgid ""
"There is a conflict between the entered\n"
"username and an existing username.\n"
@@ -4976,16 +4850,14 @@
"elifakiwe kanye negama lomsebenzisi eselikhona kakade.\n"
" Zama elinye igama."
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
#, fuzzy
msgid "Retrieving %1 extension..."
msgstr "Ifunda awe- %1 Amasethingi"
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
#, fuzzy
msgid "Releasing %1 extension..."
msgstr "Ifunda awe- %1 Amasethingi"
@@ -5053,7 +4925,152 @@
msgid "There are multiple users satisfying the input conditions."
msgstr "Kunabasebenzisi abaningi abahlangabezanayo nezidingo zokwaziswa okufakiwe."
+#~ msgid "User Authentication Method"
+#~ msgstr "Indlela Yokugunyaza Umsebenzisi"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b>Authentication</b><br>\n"
+#~ "Select the authentication method to use for users on your system.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b>Ukugunyaza</b><br>\n"
+#~ " Khetha indlela yokugunyaza ozoyisebenzisa ngabasebenzisi abakwisistimu yakho.\n"
+#~ " </p>"
+
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "Uma kukhona uhlelo obelufakiwe ngaphambili noma enye isistimu, kungenzeka ukwakha abasebenzisi abasekelwe kulo mthombo. Ukuze wenze kanjalo, khetha u-<b>Funda Ukwaziswa Komsebenzisi Ekufakweni Kohlelo Ngesikhathi Esidlule</b>. Lokhu kusebenzisa i-directory esikhona kakade noma kwakhe entsha yomsebenzisi ngamunye endaweni ebonisiwe yalokhu kufakwa kohlelo."
+
+#~ msgid "&LDAP"
+#~ msgstr "&LDAP"
+
+#~ msgid "N&IS"
+#~ msgstr "N&IS"
+
+#~ msgid "&Windows Domain"
+#~ msgstr "&I-Domain Ye-Windows "
+
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "E&khaya (/etc/passwd)"
+
+#~ msgid "eDirectory LDAP"
+#~ msgstr "I-LDAP Ye-eDirectory"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Uma usebenzisa isiphakelalwazi se-NIS noma se-LDAP ukuze ugcine ukwaziswa komsebenzisi noma uma ufuna\n"
+#~ "ukugunyaza abasebenzisi ngesiphakelalwazi se-NT, khetha i-value efanelekile. Yibe\n"
+#~ " usuchofoza u-<b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Uma usebenzisa isiphakelalwazi se-NIS noma i-LDAP ukuze ugcine ukwaziswa komsebezisi, khetha\n"
+#~ "i-value efanelekile. Yibe<b> usuchofoza u-</b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Uma usebenzisa isiphakelalwazi se-LDAP ukuze ugcine ukwaziswa komsebenzisi noma uma ufuna\n"
+#~ "ukugunyaza abasebenzisi ngesiphakelalwazi se-NT, khetha i-value efanelekile. Yibe\n"
+#~ " usuchofoza u-<b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Uma usebenzisa isiphakelalwazi se-LDAP ukuze ugcine ukwaziswa komsebezisi, khetha\n"
+#~ "i-value efanelekile. Yibe<b> usuchofoza u-</b>Okulandelayo</b> ukuze uqhubeke nokuhlela i-client yakho.</p>"
+
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>Chofoza u-<b>Hlela Ukugunyazwa Kwe-Kerberos</b> ukuze uhlele i-Kerberos ngemva kokuhlela umthombo wokwaziswa komsebenzisi.</p>"
+
+#~ msgid "&Choose"
+#~ msgstr "&Khetha"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Indlela Yokugunyaza"
+
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "Hlela Ukugunyazwa &Kwe-Kerberos"
+
+#~ msgid "E&xpert Options..."
+#~ msgstr "Okukhethwa Kukho K&ongoti..."
+
+#~ msgid ""
+#~ "<p>If you intend to use this password for creating certificates,\n"
+#~ "it has to be at least %1 characters long.</p>"
+#~ msgstr ""
+#~ "<p>Uma uhlose ukusebenzisa le phasiwedi ukuze wakhe izitifiketi,\n"
+#~ "kumelwe okungenani ibe nezinhlamvu ezingu-%1 ubude.</p>"
+
#, fuzzy
+#~| msgid ""
+#~| "If you intend to create certificates,\n"
+#~| "the password should have at least %1 characters.\n"
+#~| "Really use this shorter password?"
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "Uma uhlose ukwakha izitifiketi,\n"
+#~ "iphasiwedi kufanele okungenani ibe nezinhlamvu ezingu-%1 ubude.\n"
+#~ " Uyafuna ngempela ukusebenzisa le phasiwedi emfushane?"
+
+#~ msgid ""
+#~ "The root password could not be set.\n"
+#~ "You might not be able to log in.\n"
+#~ "Try setting it again?\n"
+#~ msgstr ""
+#~ "Iphasiwedi ayivumanga ukusetheka.\n"
+#~ "Ungase ungakwazi ukungena.\n"
+#~ " Zama ukuphinde uyisethe futhi?\n"
+
+#~ msgid "Initialization of module for configuration of authentication..."
+#~ msgstr "Ukulungiselela ukuqalisa imoduli yokuhlela kokugunyaza..."
+
+#, fuzzy
+#~| msgid "<p><b>Login Settings</b></p>"
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>Amasethingi Okungena</b></p>"
+
+#~ msgid "Expert Settings"
+#~ msgstr "Amasethingi Enzelwe Ongoti"
+
+#, fuzzy
+#~ msgid "The password encryption method is %s."
+#~ msgstr "Indlela Yokufaka Amaphasiwedi Amakhodi Okuphepha"
+
+#~ msgid "&Change..."
+#~ msgstr "&Shintsha..."
+
+#~ msgid "Summary"
+#~ msgstr "Amabalengwe"
+
+#, fuzzy
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "&I-Domain Ye-Windows "
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "Ukugunyaza"
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+#~ msgstr "Ukugunyaza"
+
+#, fuzzy
+#~ msgid "<%1>Users<%2> %3 selected for import"
+#~ msgstr "%1 okufakiwe okuhleliwe"
+
+#, fuzzy
#~| msgid "No Password Expiration"
#~ msgid "No Password Entered"
#~ msgstr "Akukho Ukuphelelwa Isikhathi Kwephasiwedi"
Modified: trunk/yast/zu/po/vm.zu.po
===================================================================
--- trunk/yast/zu/po/vm.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/vm.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -29,12 +29,12 @@
msgstr "Ukuhlela umshini osebenzelanayo..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr ""
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -44,178 +44,178 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
msgid "Verify Installed Packages"
msgstr "Qinisekisa Amaphakheji Afakiwe"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
#, fuzzy
msgid "Network Bridge Configuration"
msgstr "Ukuhlelwa Kwekhadi Lenethiwekhi"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
msgid "Configuring the VM Server (domain 0)"
msgstr "Ukuhlela Isiphakelalwazi Se-VM (i-domain 0)"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr "<p><big><b>Ukuhlelwa Kwesiphakelalwazi Se-VM</b></big></p><p>Ukuhlelwa Kwesiphakelalwazi Se-VM (i-domain 0) kunezingxenye ezimbili.</p>"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
#, fuzzy
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr "<p>Amaphakheji adingekayo afakwe kwisistimu kuqala. Khona-ke i-boot loader ishintshelwa kwi-GRUB uma kuwukuthi ayisasetshenziswa kakade futhi ingxenye ye-Xen inezelwa kwimenu ye-bootloader uma ingatholakali.</p>"
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
#, fuzzy
#| msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>"
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr "<p>I-GRUB iyadingeka ngoba isekela indinganiso ye-multiboot edingekayo ukuze kuqaliswe i-Xen nekheneli ye-Linux.</p>"
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
#, fuzzy
#| msgid "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>"
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr "<p>Lapho ukuhlela kuphothulwe ngempumelelo, kungenzeka ukuqalisa Isiphakelalwazi se-VM kwimenu ye-boot loader.</p>"
#. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
msgid "The installation will be aborted."
msgstr "Ukufakwa kohlelo kuzoyekwa."
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Choose Hypervisor(s) to install"
msgstr "I-ypervisor namathuluzi kufakiwe."
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
msgid "Server: Minimal system to get a running Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
#, fuzzy
#| msgid "Configuring the virtual machine..."
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "Ukuhlela umshini osebenzelanayo..."
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
msgid "KVM Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
#, fuzzy
#| msgid "Broken server"
msgid "KVM server"
msgstr "Isiphakelalwazi esilimele"
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
msgid "KVM tools"
msgstr ""
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
msgid "libvirt LXC containers"
msgstr ""
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
msgid "libvirt LXC daemon"
msgstr ""
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
msgid "Software to connect to Virtualization server"
msgstr ""
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Virtualization client tools"
msgstr "I-ypervisor namathuluzi kufakiwe."
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
msgid "Xen Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
#, fuzzy
#| msgid "Broken server"
msgid "Xen server"
msgstr "Isiphakelalwazi esilimele"
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
#, fuzzy
#| msgid "Xen Section"
msgid "Xen tools"
msgstr "Ingxenye ye-Xen"
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
#, fuzzy
#| msgid "The installation will be aborted."
msgid "Package installation failed\n"
msgstr "Ukufakwa kohlelo kuzoyekwa."
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
#, fuzzy
#| msgid "The installation will be aborted."
msgid "Package installation failed for lxc\n"
msgstr "Ukufakwa kohlelo kuzoyekwa."
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
msgid "Package installation failed for sled client pattern\n"
msgstr ""
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
msgid "Package installation failed for sles patterns\n"
msgstr ""
#. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
msgid "Running in text mode. Install graphical components anyway?"
msgstr ""
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
msgid "Checking packages..."
msgstr "Ihlola amaphakheji..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
msgid "Installing packages..."
msgstr "Ifaka amaphakheji..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
msgid "Cannot install required packages."
msgstr "Ayikwazi ukufaka amaphakheji adingekayo."
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
#, fuzzy
#| msgid "Updating configuration files..."
msgid "Updating grub2 configuration files..."
msgstr "Ivuselela amafayela okuhlela..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
#, fuzzy
msgid "Configuring Default Network Bridge..."
msgstr "Ukuhlela amasethingi avamile..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
#, fuzzy
#| msgid "Network Bridge"
msgid "Network Bridge."
msgstr "Ibhuloho Lenethiwekhi"
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr ""
@@ -228,11 +228,11 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
#, fuzzy
#| msgid ""
#| "The machine is ready to start the VM Server.\n"
@@ -244,7 +244,7 @@
"\n"
" Qalisa kabusha umshini bese ukhetha ingxenye ye-Xen kwimenu ye-boot loader ukuze uqalise it.\n"
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
#, fuzzy
#| msgid ""
#| "The machine is ready to start the VM Server.\n"
@@ -256,19 +256,19 @@
"\n"
" Qalisa kabusha umshini bese ukhetha ingxenye ye-Xen kwimenu ye-boot loader ukuze uqalise it.\n"
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Xen Hypervisor and tools are installed."
msgstr "I-ypervisor namathuluzi kufakiwe."
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Virtualization client tools are installed."
msgstr "I-ypervisor namathuluzi kufakiwe."
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Libvirt LXC components are installed."
Modified: trunk/yast/zu/po/vpn.zu.po
===================================================================
--- trunk/yast/zu/po/vpn.zu.po 2016-09-02 21:45:30 UTC (rev 96727)
+++ trunk/yast/zu/po/vpn.zu.po 2016-09-02 21:45:57 UTC (rev 96728)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -234,14 +234,14 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "The user name is already used."
msgstr "Igama %1 le-queue elibonisiwe seliyasetshenziswa kakade."
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
msgid "Cannot find a matching client connection."
msgstr ""
@@ -344,118 +344,118 @@
msgstr "Ingabe ungathanda ukushintsha i-CD bese uphinda uzama?"
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
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
+#: src/lib/vpn/main_dialog.rb:365
msgid "Name"
msgstr "Igama"
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
msgid "Description"
msgstr "Incazelo"
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
msgid "All IPv6 networks (::/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
#, fuzzy
#| msgid "Connection Type"
msgid "Connection name: "
msgstr "Uhlobo Lokuxhumana"
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
msgid "Type"
msgstr "Uhlobo"
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
#, fuzzy
#| msgid "Name Servers"
msgid "Gateway (Server)"
msgstr "Iziphakelalwazi Zegama"
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
#, fuzzy
#| msgid "Clients"
msgid "Client"
msgstr "Ama-client"
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
#, fuzzy
#| msgid "The scheme name"
msgid "The scenario is"
msgstr "Igama lohlelo"
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
#, fuzzy
#| msgid "You must select a certificate."
msgid "Secure communication with a certificate"
msgstr "Kumelwe ukhethe isitifiketi."
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
#, fuzzy
#| msgid "&Edit Crypt File"
msgid "Edit Credentials"
msgstr "&Hlela Ifayela Yokufaka Amakhodi Okuphepha"
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
#, fuzzy
#| msgid "Set Up &Kerberos Authentication"
msgid "The gateway requires authentication"
msgstr "Hlela Ukugunyazwa &Kwe-Kerberos"
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
#, fuzzy
#| msgid "Read certificates"
msgid "By a certificate"
msgstr "Funda izitifiketi"
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
msgid "VPN gateway IP"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -562,38 +562,38 @@
msgstr ""
#. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Failed to install IPSec packages."
msgstr "Ihlulekile ukufaka amaphakheji adingekayo."
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
#, fuzzy
#| msgid "Restart NTP daemon"
msgid "Failed to start IPSec daemon."
msgstr "Qala kabusha i-daemon ye-NTP"
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr ""
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
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
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
#, fuzzy
#| msgid "Failed to restore MBR."
msgid "Failed to restart SuSE firewall."
msgstr "Ihlulekile ukubuyisela i-MBR."
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
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"
@@ -601,35 +601,35 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
#, fuzzy
#| msgid "&Expert Global Settings"
msgid "VPN Global Settings"
msgstr "&Amasethingi Enzelwe Ongoti"
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
#, fuzzy
#| msgid "Enable VPN Services"
msgid "Enable VPN (IPSec) daemon: %s"
msgstr "Vula Amasevisi e-VPN"
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
#, fuzzy
#| msgid "Create Client Connection"
msgid "Gateway and Connections"
msgstr "Yakha Ukuxhumana Kwe-Client"
#. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
#, fuzzy
#| msgid "Read current connection setup"
msgid "A client connecting to "
1
0
02 Sep '16
Author: minton
Date: 2016-09-02 23:45:30 +0200 (Fri, 02 Sep 2016)
New Revision: 96727
Modified:
trunk/yast/zh_CN/po/add-on.zh_CN.po
trunk/yast/zh_CN/po/auth-client.zh_CN.po
trunk/yast/zh_CN/po/auth-server.zh_CN.po
trunk/yast/zh_CN/po/autoinst.zh_CN.po
trunk/yast/zh_CN/po/base.zh_CN.po
trunk/yast/zh_CN/po/bootloader.zh_CN.po
trunk/yast/zh_CN/po/ca-management.zh_CN.po
trunk/yast/zh_CN/po/cio.zh_CN.po
trunk/yast/zh_CN/po/cluster.zh_CN.po
trunk/yast/zh_CN/po/control.zh_CN.po
trunk/yast/zh_CN/po/country.zh_CN.po
trunk/yast/zh_CN/po/dhcp-server.zh_CN.po
trunk/yast/zh_CN/po/dns-server.zh_CN.po
trunk/yast/zh_CN/po/docker.zh_CN.po
trunk/yast/zh_CN/po/drbd.zh_CN.po
trunk/yast/zh_CN/po/fcoe-client.zh_CN.po
trunk/yast/zh_CN/po/firewall.zh_CN.po
trunk/yast/zh_CN/po/firstboot.zh_CN.po
trunk/yast/zh_CN/po/fonts.zh_CN.po
trunk/yast/zh_CN/po/geo-cluster.zh_CN.po
trunk/yast/zh_CN/po/installation.zh_CN.po
trunk/yast/zh_CN/po/iscsi-client.zh_CN.po
trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po
trunk/yast/zh_CN/po/kdump.zh_CN.po
trunk/yast/zh_CN/po/mail.zh_CN.po
trunk/yast/zh_CN/po/network.zh_CN.po
trunk/yast/zh_CN/po/nfs.zh_CN.po
trunk/yast/zh_CN/po/nfs_server.zh_CN.po
trunk/yast/zh_CN/po/nis.zh_CN.po
trunk/yast/zh_CN/po/ntp-client.zh_CN.po
trunk/yast/zh_CN/po/packager.zh_CN.po
trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po
trunk/yast/zh_CN/po/printer.zh_CN.po
trunk/yast/zh_CN/po/rdp.zh_CN.po
trunk/yast/zh_CN/po/rear.zh_CN.po
trunk/yast/zh_CN/po/registration.zh_CN.po
trunk/yast/zh_CN/po/reipl.zh_CN.po
trunk/yast/zh_CN/po/samba-client.zh_CN.po
trunk/yast/zh_CN/po/services-manager.zh_CN.po
trunk/yast/zh_CN/po/snapper.zh_CN.po
trunk/yast/zh_CN/po/storage.zh_CN.po
trunk/yast/zh_CN/po/update.zh_CN.po
trunk/yast/zh_CN/po/users.zh_CN.po
trunk/yast/zh_CN/po/vm.zh_CN.po
Log:
zh_CN merged
Modified: trunk/yast/zh_CN/po/add-on.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/add-on.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/add-on.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2013-02-02 22:16+0800\n"
"Last-Translator: 玛格丽特 · 苏 <i(a)marguerite.su>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -85,15 +85,16 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li> 媒体: %1,路径: %2,产品: %3</li>\n"
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr "请让附加产品 \"%1\" 可通过 \"%2\" 使用。"
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
msgid "Failed to add add-on product."
msgstr "未能添加附加产品。"
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr "请让附加产品 \"%1\" 可通过 \"%2\" 使用。"
-
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
#. placeholder for unknown directory
Modified: trunk/yast/zh_CN/po/auth-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/auth-client.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/auth-client.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2016-06-06 18:16+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -36,8 +36,7 @@
msgstr "主力密钥分发服务器主机名 (可选)"
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
-msgid ""
-"Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
msgstr "密钥分发中心 (若启用通过 DNS 自动发现则为可选)"
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
@@ -68,9 +67,7 @@
#. Add an auth_to_local_names
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
-msgid ""
-"Please type in the principal name and user name in the format of "
-"\"princ_name = user_name\":"
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
msgstr "请以 \"主体名 = 用户名\" 格式输入主体名和用户名:"
#. Save realm settings
@@ -139,48 +136,39 @@
#: src/lib/authui/ldapkrb/main_dialog.rb:76
msgid ""
"This computer is currently using SSSD to authenticate users.\n"
-"Before you may use legacy LDAP authentication (pam_ldap), please disable "
-"SSSD from \"User Logon Management\"."
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
msgstr ""
"此计算机当前正在使用 SSSD 认证用户。\n"
"在您使用传统的 LDAP 认证 (pam_ldap) 前,请在“用户登入管理”中禁用 SSSD。"
#: src/lib/authui/ldapkrb/main_dialog.rb:84
msgid ""
-"This computer is currently reading user database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP user database (nss_ldap), please disable SSSD user "
-"database from \"User Logon Management\"."
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
msgstr ""
"此计算机当前正在从 SSSD 身份提供方读取用户数据库。\n"
"在您使用 LDAP 用户数据库 (nss_ldap) 前,请在“用户登入管理”中禁用 SSSD 用户数据库。"
#: src/lib/authui/ldapkrb/main_dialog.rb:92
msgid ""
-"This computer is currently reading group database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP group database (nss_ldap), please disable SSSD group "
-"database from \"User Logon Management\"."
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
msgstr ""
"此计算机当前正在从 SSSD 身份提供方读取组数据库。\n"
"在您使用 LDAP 组数据库 (nss_ldap) 前,请在“用户登入管理”中禁用 SSSD 组数据库。"
#: src/lib/authui/ldapkrb/main_dialog.rb:100
msgid ""
-"This computer is currently reading sudoers database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD "
-"sudo database from \"User Logon Management\"."
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
msgstr ""
"此计算机当前正在从 SSSD 身份提供方读取 sudoers 数据库。\n"
"在您使用 LDAP sudoers 数据库 (nss_ldap) 前,请在“用户登入管理”中禁用 SSSD sudo 数据库。"
#: src/lib/authui/ldapkrb/main_dialog.rb:108
msgid ""
-"This computer is currently reading automount database from SSSD identity "
-"provider.\n"
-"Before you may use LDAP automount database (nss_ldap), please disable SSSD "
-"automount database from \"User Logon Management\"."
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
msgstr ""
"此计算机当前正在从 SSSD 身份提供方读取自动挂载点数据库。\n"
"在您使用 LDAP 自动挂载点数据库 (nss_ldap) 前,请在“用户登入管理”中禁用 SSSD 自动挂载点数据库。"
@@ -225,10 +213,8 @@
#: src/lib/authui/ldapkrb/main_dialog.rb:163
msgid ""
-"The name service cache is should only used with legacy LDAP identity "
-"provider,\n"
-"but your system currently has authentication domain enabled, which is not "
-"compatible with the cache.\n"
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
"\n"
"Do you still wish to enable the cache?"
msgstr ""
@@ -241,8 +227,7 @@
#: src/lib/authui/ldapkrb/main_dialog.rb:176
msgid ""
"This computer is currently using SSSD to authenticate users.\n"
-"Before you may use Kerberos authentication (pam_krb5), please disable SSSD "
-"from \"User Logon Management\"."
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
msgstr ""
"此计算机当前正在使用 SSSD 认证用户。\n"
"在您使用 Kerberos 认证 (pam_krb5) 前,请在“用户登入管理”中禁用 SSSD。"
@@ -614,10 +599,8 @@
#. Enable/disable SSSD daemon
#: src/lib/authui/sssd/main_dialog.rb:252
msgid ""
-"This computer is currently using legacy LDAP or Kerberos method to "
-"authenticate users.\n"
-"Before you may use SSSD to authenticate users, please disable LDAP and "
-"Kerberos authentication from \"LDAP and Kerberos Client\"."
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
msgstr ""
"此计算机当前正在使用传统的 LDAP 或 Kerberos 方式认证用户。\n"
"在您使用 SSSD 认证用户前,请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 和 Kerberos 认证。"
@@ -625,10 +608,8 @@
#. Enable/disable NSS password database
#: src/lib/authui/sssd/main_dialog.rb:284
msgid ""
-"This computer is currently reading user database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD user database, please disable LDAP user database "
-"from \"LDAP and Kerberos Client\"."
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
msgstr ""
"此计算机当前正在从 LDAP 身份提供方读取用户数据库。\n"
"在您使用 SSSD 用户数据库前,请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 用户数据库。"
@@ -636,10 +617,8 @@
#. Enable/disable NSS group database
#: src/lib/authui/sssd/main_dialog.rb:302
msgid ""
-"This computer is currently reading group database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD group database, please disable LDAP group database "
-"from \"LDAP and Kerberos Client\"."
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
msgstr ""
"此计算机当前正在从 LDAP 身份提供方读取组数据库。\n"
"在您使用 SSSD 组数据库前,请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 组数据库。"
@@ -647,10 +626,8 @@
#. Enable/disable NSS sudoers database
#: src/lib/authui/sssd/main_dialog.rb:320
msgid ""
-"This computer is currently reading sudoers database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD sudoers database, please disable LDAP sudoers "
-"database from \"LDAP and Kerberos Client\"."
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
msgstr ""
"此计算机当前正在从 LDAP 身份提供方读取 sudoers 数据库。\n"
"在您使用 SSSD sudoers 数据库前,请在“LDAP 和 Kerberos 客户端”中禁用 LDAP sudoers 数据库。"
@@ -658,8 +635,7 @@
#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
"Sudo data source has been globally enabled.\n"
-"Please remember to also customise \"sudo_provider\" parameter in Extended "
-"Options of each individual domain that provides sudo data."
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
msgstr ""
"Sudo 数据来源已全局启用。\n"
"请记得在每个提供了 sudo 数据的独立域的扩展选项中自定义 \"sudo_provider\" 参数。"
@@ -667,10 +643,8 @@
#. Enable/disable NSS automount database
#: src/lib/authui/sssd/main_dialog.rb:342
msgid ""
-"This computer is currently reading automount database from LDAP identity "
-"provider.\n"
-"Before you may use SSSD automount database, please disable LDAP automount "
-"database from \"LDAP and Kerberos Client\"."
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
msgstr ""
"此计算机当前正在从 LDAP 身份提供方读取自动挂载点数据库。\n"
"在您使用 SSSD 自动挂载点数据库前,请在“LDAP 和 Kerberos 客户端”中禁用 LDAP 自动挂载点数据库。"
@@ -678,8 +652,7 @@
#: src/lib/authui/sssd/main_dialog.rb:350
msgid ""
"Automount data source has been globally enabled.\n"
-"Please remember to also customise \"autofs_provider\" parameter in Extended "
-"Options of each individual domain that provides automount data."
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
msgstr ""
"自动挂载点数据来源已全局启用。\n"
"请记得在每个提供了自动挂载点数据的独立域的扩展选项中自定义 \"autofs_provider\" 参数。"
@@ -688,10 +661,8 @@
#: src/lib/authui/sssd/main_dialog.rb:374
msgid ""
"MS-PAC data source has been globally enabled.\n"
-"This optional feature depends on the capabilities of your Microsoft Active "
-"Directory domain.\n"
-"SSSD may fail to start if Active Directory domain lacks the support, in "
-"which case please turn off this feature."
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
msgstr ""
"MS-PAC 数据已全局启用。\n"
"此可选功能取决于您的 Miscrosoft 活动目录域的能力。\n"
@@ -709,8 +680,7 @@
#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause configuration "
-"failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
"Please consult SSSD manual page before moving on.\n"
"Do you still wish to remove the parameter?"
msgstr ""
@@ -725,8 +695,7 @@
#: src/lib/authui/sssd/main_dialog.rb:435
msgid ""
-"You have not configured any authentication domain, yet you chose to enable "
-"domain authentication.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
"SSSD will fail to start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
@@ -742,9 +711,7 @@
#. The frame is shown only if AD server can be discovered or is explicitly specified
#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
#: src/lib/authui/sssd/manage_ad_dialog.rb:68
-msgid ""
-"Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this "
-"computer:"
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
msgstr "请输入活动目录用户信息 (例 Administrator) 来登记或重登记此计算机:"
#: src/lib/authui/sssd/manage_ad_dialog.rb:69
@@ -778,10 +745,8 @@
#: src/lib/authui/sssd/manage_ad_dialog.rb:83
msgid ""
-"The name resolution service on this computer does not satisfy AD enrollment "
-"requirements.\n"
-"Please configure your network environment to use AD server as the name "
-"resolver."
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
msgstr ""
"此计算机上的名称解析服务不满足活动目录登记要求。\n"
"请配置您的网络使用活动目录服务器作为名称解析服务器。"
@@ -813,9 +778,7 @@
#. join_ad will configure and apply Kerberos and then join AD
#: src/lib/authui/sssd/manage_ad_dialog.rb:144
-msgid ""
-"AD enrollment details have been saved for AutoYast. Please keep in mind that "
-"AD user password is saved in plain text."
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
msgstr "已为 AutoYast 保存活动目录登记细节。请留神活动目录用户密码是明文保存的。"
#: src/lib/authui/sssd/manage_ad_dialog.rb:150
@@ -879,9 +842,7 @@
msgstr "域名 (诸如 example.com):"
#: src/lib/authui/sssd/new_section_dialog.rb:78
-msgid ""
-"Which service provides identity data, such as user names and group "
-"memberships?"
+msgid "Which service provides identity data, such as user names and group memberships?"
msgstr "提供身份数据诸如用户名和组成员资格的服务"
#: src/lib/authui/sssd/new_section_dialog.rb:83
@@ -898,9 +859,7 @@
msgstr "请输入域名。"
#: src/lib/authui/sssd/new_section_dialog.rb:109
-msgid ""
-"The domain name collides with a reserved keyword. Please choose a different "
-"name."
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
msgstr "该域名与保留关键字相抵触。请选择一个不同的名称。"
#: src/lib/authui/sssd/new_section_dialog.rb:112
@@ -914,9 +873,7 @@
msgstr "配置文件语法版本 (1 或 2)"
#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
-msgid ""
-"Number of times services should attempt to reconnect in the event of a Data "
-"Provider crash or restart before they give up"
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
msgstr "当数据提供者崩溃或重启时在放弃前服务应尝试重连的次数"
#: src/lib/authui/sssd/params.rb:119
@@ -924,21 +881,15 @@
msgstr "正则表达式会将用户名和域名解析到部件中"
#: src/lib/authui/sssd/params.rb:123
-msgid ""
-"The default printf(3)-compatible format that describes translation of a name/"
-"domain tuple into FQDN"
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
msgstr "默认的 printf(3)-compatible 格式描述了如何转义名称/域数组为完全限定名称。"
#: src/lib/authui/sssd/params.rb:127
-msgid ""
-"Whether or not to use inotify mechanism to monitor resolv.conf to update "
-"internal DNS resolver"
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
msgstr "是否使用 inotify 机制监视 resolv.conf 来更新内部 DNS 解析器"
#: src/lib/authui/sssd/params.rb:131
-msgid ""
-"Directory on the filesystem where SSSD should store Kerberos replay cache "
-"files"
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
msgstr "文件系统上 SSSD 应存储 Kerberos 回放缓存文件的文件夹"
#: src/lib/authui/sssd/params.rb:135
@@ -957,9 +908,7 @@
#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
-msgid ""
-"Level of details for logging. Can be numeric (0-9) or a big mask such as "
-"0x0010 (lowest level) or 0xFFF (highest level)"
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
msgstr "日志详细级别。可为数字 (0-9) 或者一个大掩码诸如 0x0010 (最低级) 或 0xFFF (最高级)"
#: src/lib/authui/sssd/params.rb:151
@@ -975,46 +924,28 @@
msgstr "此服务心跳间超时秒数"
#: src/lib/authui/sssd/params.rb:171
-msgid ""
-"Maximum number of file descriptors that may be opened at a time by SSSD "
-"service process"
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
msgstr "SSSD 服务进程同一时间可打开的最大文件描述符数目"
#: src/lib/authui/sssd/params.rb:176
-msgid ""
-"Number of seconds a client of SSSD process can hold onto a file descriptor "
-"without any communication"
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
msgstr "SSSD 进程客户端可持有文件描述符而不与之通信的秒数"
#: src/lib/authui/sssd/params.rb:181
-msgid ""
-"The service will receive SIGTERM after this number of seconds of consecutive "
-"ping check failure"
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
msgstr "服务收到 SIGTERM 前连续 ping 检查失败的秒数"
#: src/lib/authui/sssd/params.rb:193
-msgid ""
-"How many seconds should cache nss_sss enumerations (requests for info about "
-"all users)?"
+msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr "缓存 nss_css 枚举 (对全部用户信息的请求) 的秒数"
#: src/lib/authui/sssd/params.rb:198
-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 ""
-"若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比,则可将条目缓存设"
-"为在后台自动更新条目。"
+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 "若请求条目时间超出了该域 entry_cache_timeout 值的某个百分比,则可将条目缓存设为在后台自动更新条目。"
#: src/lib/authui/sssd/params.rb:203
-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 ""
-"指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即,针对无效数据库条目如不存"
-"在条目的查询) 的秒数。"
+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 "指定了再次询问后端前 nss_sss 应缓存否定缓存次数 (即,针对无效数据库条目如不存在条目的查询) 的秒数。"
#: src/lib/authui/sssd/params.rb:209
msgid "Exclude certain users from being fetched by SSS backend"
@@ -1025,20 +956,15 @@
msgstr "排除特定组不被 SSS 后端获取"
#: src/lib/authui/sssd/params.rb:220
-msgid ""
-"If you want filtered user to still be group members set this option to false."
+msgid "If you want filtered user to still be group members set this option to false."
msgstr "若您想使被过滤的用户仍留作组成员则请设置此选项为假。"
-#: src/lib/authui/sssd/params.rb:224
-msgid ""
-"Override the user's home directory. You can either provide an absolute value "
-"or a template."
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
+msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr "覆盖用户主文件夹。您可以提供一个绝对值或一个模板。"
-#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1209
-msgid ""
-"Set a default template for a user's home directory if one is not specified "
-"explicitly by the domain's data provider."
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
+msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr "设置当某域的数据提供者未显式指定用户主文件夹时所用的默认模板。"
#: src/lib/authui/sssd/params.rb:232
@@ -1054,89 +980,61 @@
msgstr "使用 shell_fallback 替换这些壳层中的任何一种"
#: src/lib/authui/sssd/params.rb:245
-msgid ""
-"The default shell to use if an allowed shell is not installed on the machine."
+msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr "机器上未安装获准使用的壳层时所使用的默认壳层。"
-#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1213
-msgid ""
-"The default shell to use if the provider does not return one during lookup."
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
+msgid "The default shell to use if the provider does not return one during lookup."
msgstr "查询时提供者未返回值时所使用的默认壳层。"
#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
-msgid ""
-"Specifies time in seconds for which the list of subdomains will be "
-"considered valid."
+msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr "指定了子域列表被认定有效的秒数 。"
#: src/lib/authui/sssd/params.rb:259
-msgid ""
-"Specifies time in seconds for which records in the in-memory cache will be "
-"valid."
+msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr "指定了内存缓存中记录的有效秒数。"
#: src/lib/authui/sssd/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)."
+msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)."
msgstr "认证提供者离线时应允许缓存登入的天数 (自上次成功在线登入起的天数)"
#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/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 ""
-"触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时"
-"间。"
+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 "触及 offline_failed_login_attempts 后可进行新登录尝试前必须等待的以分钟计的时间。"
#: src/lib/authui/sssd/params.rb:286
-msgid ""
-"Controls what kind of messages are shown to the user during authentication."
+msgid "Controls what kind of messages are shown to the user during authentication."
msgstr "控制在认证期间展示给用户的消息类型。"
#: src/lib/authui/sssd/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 ""
-"SSSD 在线时对于任何 PAM 请求,SSSD 均会尝试立即更新缓存的该用户身份信息以确保"
-"认证使用了最新信息。"
+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 "SSSD 在线时对于任何 PAM 请求,SSSD 均会尝试立即更新缓存的该用户身份信息以确保认证使用了最新信息。"
#. The kerberos domain section
-#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:811
-#: src/lib/authui/sssd/params.rb:1096
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
msgid "Display a warning N days before the password expires."
msgstr "在密码过期前 N 天展示一条警告。"
#: src/lib/authui/sssd/params.rb:313
-msgid ""
-"Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes "
-"that implement time-dependent sudoers entries."
+msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr "是否评骘实现了随时间变化的 sudoer 项的 sudoNotBefore 和 sudoNotAfter 属性。"
#: src/lib/authui/sssd/params.rb:325
-msgid ""
-"Specifies for how many seconds the autofs responder should cache negative "
-"hits before asking the back end again."
+msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr "指定了再次询问后端前 autofs 回应者应缓存否定次数的秒数。"
#: src/lib/authui/sssd/params.rb:337
-msgid ""
-"Whether or not to hash host names and addresses in the managed known_hosts "
-"file."
+msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr "是否在受管 known_hosts 文件中哈希化主机名和地址。"
#: src/lib/authui/sssd/params.rb:342
-msgid ""
-"How many seconds to keep a host in the managed known_hosts file after its "
-"host keys were requested."
+msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr "已请求主机密钥后在受管 known_hosts 文件中保存主机的秒数。"
#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
-msgid ""
-"UID and GID limits for the domain. If a domain contains an entry that is "
-"outside these limits, it is ignored."
+msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr "该域的 UID 和 GID 限制。若某域含有一个超出这些限制的项,则忽略该项。"
#: src/lib/authui/sssd/params.rb:366
@@ -1144,53 +1042,35 @@
msgstr "从后端数据库读取全部项 (会增加服务器负载)"
#: src/lib/authui/sssd/params.rb:371
-msgid ""
-"If the service does not terminate after “force_timeout” seconds, the monitor "
-"will forcibly shut it down by sending a SIGKILL signal."
-msgstr ""
-"若服务在 \"force_timeout\" 秒后未终止,监控器将发送一个 SIGKILL 信号强制关闭"
-"它。"
+msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
+msgstr "若服务在 \"force_timeout\" 秒后未终止,监控器将发送一个 SIGKILL 信号强制关闭它。"
#: src/lib/authui/sssd/params.rb:376
-msgid ""
-"How many seconds nss_sss should consider entries valid before asking the "
-"backend again."
+msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr "再次询问后端前 nss_sss 应认定条目有效的秒数。"
#: src/lib/authui/sssd/params.rb:381
-msgid ""
-"How many seconds nss_sss should 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 "再次询问后端前 nss_sss 应认定用户项有效的秒数。"
#: src/lib/authui/sssd/params.rb:386
-msgid ""
-"How many seconds nss_sss should 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 "再次询问后端前 nss_sss 应认定组项有效的秒数。"
#: src/lib/authui/sssd/params.rb:391
-msgid ""
-"How many seconds nss_sss should 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 "再次询问后端前 nss_sss 应认定网络组项有效的秒数。"
#: src/lib/authui/sssd/params.rb:396
-msgid ""
-"How many seconds nss_sss should 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 "再次询问后端前 nss_sss 应认定服务项有效的秒数。"
#: src/lib/authui/sssd/params.rb:401
-msgid ""
-"How many seconds sudo should consider rules valid before asking the backend "
-"again."
+msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr "再次询问后端前 sudo 应认定规则有效的秒数。"
#: src/lib/authui/sssd/params.rb:406
-msgid ""
-"How many seconds the autofs service should consider automounter maps valid "
-"before asking the backend again."
+msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr "再次询问后端前 autofs 服务应认定自动挂载器映射有效的秒数。"
#: src/lib/authui/sssd/params.rb:412
@@ -1198,9 +1078,7 @@
msgstr "缓存机要信息以供离线使用"
#: src/lib/authui/sssd/params.rb:417
-msgid ""
-"Number of days entries are left in cache after last successful login before "
-"being removed during a cleanup of the cache."
+msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr "在自缓存清理期间移除前应在缓存中保留条目的从最后成功登入日起计的天数。"
#: src/lib/authui/sssd/params.rb:424
@@ -1208,12 +1086,8 @@
msgstr "该域所用的标识提供者。"
#: src/lib/authui/sssd/params.rb:429
-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 ""
-"使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录"
-"名。"
+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 "使用完整名称和域 (格式化成该域的完整名称格式) 作为汇报给 NSS 的该用户的登录名。"
#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
@@ -1224,8 +1098,7 @@
msgstr "该域所用的访问控制提供者。"
#: src/lib/authui/sssd/params.rb:447
-msgid ""
-"The provider which should handle change password operations for the domain."
+msgid "The provider which should handle change password operations for the domain."
msgstr "应受理该域的密码变更操作的提供者。"
#: src/lib/authui/sssd/params.rb:453
@@ -1249,849 +1122,613 @@
msgstr "用于撷取主机身份信息的提供者。"
#: src/lib/authui/sssd/params.rb:482
-msgid ""
-"Regular expression for this domain that describes how to parse the string "
-"containing user name and domain into these components."
+msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr "用于此域的正则表达式,描述了如何解析包含用户名和域的字符串到这些组件中。"
#: src/lib/authui/sssd/params.rb:487
-msgid ""
-"A printf(3)-compatible format that describes how to translate a (name, "
-"domain) tuple for this domain into a fully qualified name."
-msgstr ""
-"一种 printf(3) 兼容格式,描述了如何转义此域的 (name, domain) 元组为完全限定名"
-"称。"
+msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
+msgstr "一种 printf(3) 兼容格式,描述了如何转义此域的 (name, domain) 元组为完全限定名称。"
#: src/lib/authui/sssd/params.rb:493
-msgid ""
-"Provides the ability to select preferred address family to use when "
-"performing DNS lookups."
+msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr "提供了执行 DNS 查询时选择偏好的地址族的能力。"
#: src/lib/authui/sssd/params.rb:498
-msgid ""
-"Defines the amount of time (in seconds) to wait for a reply from the DNS "
-"resolver before assuming that it is unreachable."
+msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr "定义了假设其不可达前等待 DNS 解析者回复的以秒计的时间。"
#: src/lib/authui/sssd/params.rb:502
-msgid ""
-"If service discovery is used in the back end, specifies the domain part of "
-"the service discovery DNS query."
+msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr "若后端使用了服务发现,则指定了服务发现 DNS 查询的域部分。"
#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr "使用指定组 ID 值覆盖主要组 ID 值。"
-#: src/lib/authui/sssd/params.rb:512
+#: src/lib/authui/sssd/params.rb:516
msgid "Treat user and group names as case sensitive."
msgstr "视用户和组名称为大小写敏感的。"
-#: src/lib/authui/sssd/params.rb:517
-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 ""
-"当在代理提供者上按名称查询某个用户或组时,也执行按 ID 的二次查询以 '规范化' "
-"该名称以防止所请求的名称是一个别名。"
+#: src/lib/authui/sssd/params.rb:521
+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 "当在代理提供者上按名称查询某个用户或组时,也执行按 ID 的二次查询以 '规范化' 该名称以防止所请求的名称是一个别名。"
-#: src/lib/authui/sssd/params.rb:522
-msgid ""
-"Use this homedir as default value for all subdomains within this domain."
+#: src/lib/authui/sssd/params.rb:526
+msgid "Use this homedir as default value for all subdomains within this domain."
msgstr "使用此主文件夹作为此域中全部子域的默认值。"
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/authui/sssd/params.rb:528
+#: src/lib/authui/sssd/params.rb:532
msgid "Comma separated list of users who are allowed to log in."
msgstr "逗号分隔的允许登入用户列表。"
-#: src/lib/authui/sssd/params.rb:533
-msgid ""
-"Comma separated list of groups who are allowed to log in. This applies only "
-"to groups within this SSSD domain."
+#: src/lib/authui/sssd/params.rb:537
+msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr "逗号分隔的允许登入组列表。这仅应用于此 SSSD 域中的组。"
-#: src/lib/authui/sssd/params.rb:538
-msgid ""
-"Comma separated list of groups that are explicitly denied access. This "
-"applies only to groups within this SSSD domain."
+#: src/lib/authui/sssd/params.rb:542
+msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr "逗号分隔的显式拒绝访问组列表。这仅应用于此 SSSD 域中的组。"
#. 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/lib/authui/sssd/params.rb:547
-msgid ""
-"The tools append the login name to base_directory and use that as the home "
-"directory."
+#: src/lib/authui/sssd/params.rb:551
+msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr "此工具会追加登入名到 base_directory 并用其作为主文件夹。"
-#: src/lib/authui/sssd/params.rb:552
-msgid ""
-"Indicate if a home directory should be created by default for new users."
+#: src/lib/authui/sssd/params.rb:556
+msgid "Indicate if a home directory should be created by default for new users."
msgstr "指出是否应为新用户默认创建主文件夹。"
-#: src/lib/authui/sssd/params.rb:557
-msgid ""
-"Indicate if a home directory should be removed by default for deleted users."
+#: src/lib/authui/sssd/params.rb:561
+msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr "指出是否应默认移除已删除用户的主文件夹。"
-#: src/lib/authui/sssd/params.rb:562
-msgid ""
-"Used by sss_useradd(8) to specify the default permissions on a newly created "
-"home directory."
+#: src/lib/authui/sssd/params.rb:566
+msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr "被 sss_useradd(8) 用来指定新创建的主文件夹的默认权限。"
-#: src/lib/authui/sssd/params.rb:567
-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 ""
-"骨架文件夹,其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件"
-"和文件夹。"
+#: src/lib/authui/sssd/params.rb:571
+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 "骨架文件夹,其收纳了当 sss_useradd(8) 创建主文件夹时复制至用户主文件夹的文件和文件夹。"
-#: src/lib/authui/sssd/params.rb:572
+#: src/lib/authui/sssd/params.rb:576
msgid "The mail spool directory."
msgstr "邮件卷文件夹。"
-#: src/lib/authui/sssd/params.rb:576
+#: src/lib/authui/sssd/params.rb:580
msgid "The command that is run after a user is removed."
msgstr "移除用户后运行的命令。"
#. The ldap domain section
-#: src/lib/authui/sssd/params.rb:585
+#: src/lib/authui/sssd/params.rb:589
msgid "(Active Directory specific) Use token-groups attribute if available"
msgstr "(活动目录特定) 若可用则使用 token 组属性"
-#: src/lib/authui/sssd/params.rb:591
+#: src/lib/authui/sssd/params.rb:595
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr "LDAP 服务器 URI (ldap://) (逗号分隔)"
-#: src/lib/authui/sssd/params.rb:597
+#: src/lib/authui/sssd/params.rb:601
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr "用于执行 LDAP sudo 规则的默认基本判别名。"
-#: src/lib/authui/sssd/params.rb:602
-msgid ""
-"Specifies the comma-separated list of URIs of the LDAP servers to which SSSD "
-"should connect in the order of preference."
+#: src/lib/authui/sssd/params.rb:606
+msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr "指定了逗号分隔的 SSSD 应以优先级顺序连接的 LDAP 服务器 URI 列表。"
-#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:614
-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 ""
-"指定了逗号分隔的 LDAP 服务器 URI 列表,SSSD 应以优先级顺序连接以修改用户密"
-"码。"
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
+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 "指定了逗号分隔的 LDAP 服务器 URI 列表,SSSD 应以优先级顺序连接以修改用户密码。"
-#: src/lib/authui/sssd/params.rb:620
+#: src/lib/authui/sssd/params.rb:624
msgid "Base DN for LDAP search"
msgstr "LDAP 搜索的基础判别名"
-#: src/lib/authui/sssd/params.rb:627
+#: src/lib/authui/sssd/params.rb:631
msgid "LDAP schema type"
msgstr "LDAP 方案类型"
-#: src/lib/authui/sssd/params.rb:631
+#: src/lib/authui/sssd/params.rb:635
msgid "The default bind DN to use for performing LDAP operations."
msgstr "指定 LDAP 操作所用的默认绑定判别名。"
-#: src/lib/authui/sssd/params.rb:637
+#: src/lib/authui/sssd/params.rb:641
msgid "The type of the authentication token of the default bind DN."
msgstr "默认绑定判别名的认证 token 的类型。"
-#: src/lib/authui/sssd/params.rb:641
+#: src/lib/authui/sssd/params.rb:645
msgid "The authentication token of the default bind DN."
msgstr "默认绑定判别名的认证 token。"
-#: src/lib/authui/sssd/params.rb:646
+#: src/lib/authui/sssd/params.rb:650
msgid "The object class of a user entry in LDAP."
msgstr "LDAP 中用户项的对象类。"
-#: src/lib/authui/sssd/params.rb:651
+#: src/lib/authui/sssd/params.rb:655
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr "对应着用户登录名的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:656
+#: src/lib/authui/sssd/params.rb:660
msgid "The LDAP attribute that corresponds to the user's id."
msgstr "对应着用户 ID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:661
+#: src/lib/authui/sssd/params.rb:665
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr "对应着用户的首要组 ID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:666
+#: src/lib/authui/sssd/params.rb:670
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr "对应着用户 gecos 字段的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:671
-msgid ""
-" The LDAP attribute that contains the name of the user's home directory."
+#: src/lib/authui/sssd/params.rb:675
+msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr "存放用户主文件夹名称的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:676
+#: src/lib/authui/sssd/params.rb:680
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr "存放用户默认壳层路径的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:681
+#: src/lib/authui/sssd/params.rb:685
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr "存放 LDAP 用户对象的 UUID/GUID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:686
+#: src/lib/authui/sssd/params.rb:690
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr "存放 LDAP 用户对象的 objectSID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:691 src/lib/authui/sssd/params.rb:896
-msgid ""
-"The LDAP attribute that contains timestamp of the last modification of the "
-"parent object."
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
+msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr "存放父对象最后修订时间戳记的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:696
-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 ""
-"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(上次"
-"密码变更日期) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:700
+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 "当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(上次密码变更日期) 的 LDAP 属性名称。"
-#: src/lib/authui/sssd/params.rb:701
-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 ""
-"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(最小"
-"密码有效期) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:705
+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 "当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(最小密码有效期) 的 LDAP 属性名称。"
-#: src/lib/authui/sssd/params.rb:706
-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 ""
-"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(最大"
-"密码有效期) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:710
+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 "当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(最大密码有效期) 的 LDAP 属性名称。"
-#: src/lib/authui/sssd/params.rb:711
-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 ""
-"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(密码"
-"告警时间) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:715
+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 "当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(密码告警时间) 的 LDAP 属性名称。"
-#: src/lib/authui/sssd/params.rb:716
-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 ""
-"当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(密码"
-"无活动时间) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:720
+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 "当使用 ldap_pwd_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(密码无活动时间) 的 LDAP 属性名称。"
-#: src/lib/authui/sssd/params.rb:721
-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 ""
-"当使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow 时,此参数"
-"存放了对应着其 shadow(5) 对手方(账户过期日) 的 LDAP 属性名称。"
+#: src/lib/authui/sssd/params.rb:725
+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 "当使用 ldap_pwd_policy=shadow 或 ldap_account_expire_policy=shadow 时,此参数存放了对应着其 shadow(5) 对手方(账户过期日) 的 LDAP 属性名称。"
-#: src/lib/authui/sssd/params.rb:726
-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 ""
-"当使用 ldap_pwd_policy=mit_kerberos 时,此参数存放了存储 kerberos 中上次密码"
-"变更日期和时间的 LDAP 属性的名称。"
+#: src/lib/authui/sssd/params.rb:730
+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 "当使用 ldap_pwd_policy=mit_kerberos 时,此参数存放了存储 kerberos 中上次密码变更日期和时间的 LDAP 属性的名称。"
-#: src/lib/authui/sssd/params.rb:731
-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 ""
-"当使用 ldap_pwd_policy=mit_kerberos 时,此参数存放了存储当前密码过期日期和时"
-"间的 LDAP 属性的名称。"
+#: src/lib/authui/sssd/params.rb:735
+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 "当使用 ldap_pwd_policy=mit_kerberos 时,此参数存放了存储当前密码过期日期和时间的 LDAP 属性的名称。"
-#: src/lib/authui/sssd/params.rb:736
-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 ""
-"当使用 ldap_account_expire_policy=ad 时,此参数存放了存储账户过期时间的 LDAP "
-"属性的名称。"
+#: src/lib/authui/sssd/params.rb:740
+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 "当使用 ldap_account_expire_policy=ad 时,此参数存放了存储账户过期时间的 LDAP 属性的名称。"
-#: src/lib/authui/sssd/params.rb:741
-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 ""
-"当使用 ldap_account_expire_policy=ad 时,此参数存放了存储用户账户控制字节段"
-"的 LDAP 属性的名称。"
+#: src/lib/authui/sssd/params.rb:745
+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 "当使用 ldap_account_expire_policy=ad 时,此参数存放了存储用户账户控制字节段的 LDAP 属性的名称。"
-#: src/lib/authui/sssd/params.rb:746
-msgid ""
-"When using ldap_account_expire_policy=rhds or equivalent, this parameter "
-"determines if access is allowed or not."
+#: src/lib/authui/sssd/params.rb:750
+msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr "当使用 ldap_account_expire_policy=rhds 或等价物时,此参数确定了是否允许访问。"
-#: src/lib/authui/sssd/params.rb:751
-msgid ""
-"When using ldap_account_expire_policy=nds, this attribute determines if "
-"access is allowed or not."
+#: src/lib/authui/sssd/params.rb:755
+msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr "当使用 ldap_account_expire_policy=nds 时,此属性确定了是否允许访问。"
-#: src/lib/authui/sssd/params.rb:756
-msgid ""
-"When using ldap_account_expire_policy=nds, this attribute determines until "
-"which date access is granted."
+#: src/lib/authui/sssd/params.rb:760
+msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr "当使用 ldap_account_expire_policy=nds 时,此属性确定了准予访问至的日期。"
-#: src/lib/authui/sssd/params.rb:761
-msgid ""
-"When using ldap_account_expire_policy=nds, this attribute determines the "
-"hours of a day in a week when access is granted."
-msgstr ""
-"当使用 ldap_account_expire_policy=nds 时,此属性确定了一周中每天准予访问的小"
-"时数。"
+#: src/lib/authui/sssd/params.rb:765
+msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
+msgstr "当使用 ldap_account_expire_policy=nds 时,此属性确定了一周中每天准予访问的小时数。"
-#: src/lib/authui/sssd/params.rb:766
-msgid ""
-"The LDAP attribute that contains the user's Kerberos User Principal Name "
-"(UPN)."
+#: src/lib/authui/sssd/params.rb:770
+msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr "存放用户的 Kerberos 用户实体名称 (UPN) 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:770
+#: src/lib/authui/sssd/params.rb:774
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr "存放用户 SSH 公钥的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:775
-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 ""
-"某些目录服务器,例如活动目录服务器,可能会以小写传递 UPN 的领域部分,这可能造"
-"成认证失败。"
+#: src/lib/authui/sssd/params.rb:779
+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 "某些目录服务器,例如活动目录服务器,可能会以小写传递 UPN 的领域部分,这可能造成认证失败。"
-#: src/lib/authui/sssd/params.rb:776
+#: src/lib/authui/sssd/params.rb:780
msgid "Set this option to true if you want to use an upper-case realm."
msgstr "若您想要使用大写领域则请将此选项设为真。"
-#: src/lib/authui/sssd/params.rb:781
-msgid ""
-"Specifies how many seconds SSSD has to wait before refreshing its cache of "
-"enumerated records."
+#: src/lib/authui/sssd/params.rb:785
+msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr "指定了刷新其枚举记录缓存前 SSSD 必须等待的秒数。"
-#: src/lib/authui/sssd/params.rb:786
-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 ""
-"确定了检查缓存中不活动项 (诸如没有成员的组和从未登入过的用户) 并移除它们节省"
-"空间的频率。"
+#: src/lib/authui/sssd/params.rb:790
+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 "确定了检查缓存中不活动项 (诸如没有成员的组和从未登入过的用户) 并移除它们节省空间的频率。"
-#: src/lib/authui/sssd/params.rb:791
+#: src/lib/authui/sssd/params.rb:795
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr "对应着用户完整名称的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:796
+#: src/lib/authui/sssd/params.rb:800
msgid "The LDAP attribute that lists the user's group memberships."
msgstr "列出了用户的组成员资格的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:801
-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 ""
-"若 access_provider=ldap 且 ldap_access_order=authorized_service,SSSD 将依据 "
-"authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。"
+#: src/lib/authui/sssd/params.rb:805
+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 "若 access_provider=ldap 且 ldap_access_order=authorized_service,SSSD 将依据 authorizedService 属性是否在该用户 LDAP 项中出现来确定访问权限。"
-#: src/lib/authui/sssd/params.rb:806
-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 ""
-"若 access_provider=ldap 且 ldap_access_order=host,SSSD 将依据主机属性是否在"
-"该用户 LDAP 项中出现来确定访问权限。"
+#: src/lib/authui/sssd/params.rb:810
+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 "若 access_provider=ldap 且 ldap_access_order=host,SSSD 将依据主机属性是否在该用户 LDAP 项中出现来确定访问权限。"
-#: src/lib/authui/sssd/params.rb:816
+#: src/lib/authui/sssd/params.rb:820
msgid "The object class of a group entry in LDAP."
msgstr "LDAP 中组项的对象类。"
-#: src/lib/authui/sssd/params.rb:821
+#: src/lib/authui/sssd/params.rb:825
msgid "The LDAP attribute that corresponds to the group name."
msgstr "对应着组名称的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:826
+#: src/lib/authui/sssd/params.rb:830
msgid "The LDAP attribute that corresponds to the group's id."
msgstr "对应着组 ID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:831
+#: src/lib/authui/sssd/params.rb:835
msgid "The LDAP attribute that contains the names of the group's members."
msgstr "存放组成员名称的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:836
+#: src/lib/authui/sssd/params.rb:840
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr "存放某 LDAP 组对象的 UUID/GUID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:841
+#: src/lib/authui/sssd/params.rb:845
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr "存放某 LDAP 组对象的 objectSID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:846
-msgid ""
-" The LDAP attribute that contains timestamp of the last modification of the "
-"parent object."
+#: src/lib/authui/sssd/params.rb:850
+msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr "存放父对象最后修订时间戳记的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:852
-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 ""
-"若 ldap_schema 设为支持嵌套组的方案格式 (例如 RFC2307bis),则此选项控制了 "
-"SSSD 将跟随的嵌套级数。"
+#: src/lib/authui/sssd/params.rb:856
+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 "若 ldap_schema 设为支持嵌套组的方案格式 (例如 RFC2307bis),则此选项控制了 SSSD 将跟随的嵌套级数。"
-#: src/lib/authui/sssd/params.rb:858
-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 ""
-"此选项告知 SSSD 利用一项活动目录独有特性,其可能加速在具有复杂或深度嵌套的组"
-"的部署上的组查询操作。"
+#: src/lib/authui/sssd/params.rb:862
+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 "此选项告知 SSSD 利用一项活动目录独有特性,其可能加速在具有复杂或深度嵌套的组的部署上的组查询操作。"
-#: src/lib/authui/sssd/params.rb:864
-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 ""
-"此选项告知 SSSD 利用一项活动目录独有特性,其可能加速 initgroups 操作 (当处理"
-"复杂或深度嵌套的组时最为显著)。"
+#: src/lib/authui/sssd/params.rb:868
+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 "此选项告知 SSSD 利用一项活动目录独有特性,其可能加速 initgroups 操作 (当处理复杂或深度嵌套的组时最为显著)。"
-#: src/lib/authui/sssd/params.rb:870
+#: src/lib/authui/sssd/params.rb:874
msgid " The object class of a netgroup entry in LDAP."
msgstr " LDAP 中网络组项的对象类。"
-#: src/lib/authui/sssd/params.rb:876
+#: src/lib/authui/sssd/params.rb:880
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr "对应着网络组名称的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:881
+#: src/lib/authui/sssd/params.rb:885
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr "存放网络组成员名称的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:886
-msgid ""
-"The LDAP attribute that contains the (host, user, domain) netgroup triples."
+#: src/lib/authui/sssd/params.rb:890
+msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr "存放 (主机,用户,域) 网络组铁三角的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:891
-msgid ""
-"The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
+#: src/lib/authui/sssd/params.rb:895
+msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr "存放某个 LDAP 网络组对象的 UUID/GUID 的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:901
+#: src/lib/authui/sssd/params.rb:905
msgid "The object class of a service entry in LDAP."
msgstr "LDAP 中服务项的对象类。"
-#: src/lib/authui/sssd/params.rb:906
-msgid ""
-"The LDAP attribute that contains the name of service attributes and their "
-"aliases."
+#: src/lib/authui/sssd/params.rb:910
+msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr "存放服务属性名称和其别名的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:911
+#: src/lib/authui/sssd/params.rb:915
msgid "The LDAP attribute that contains the port managed by this service."
msgstr "存放此服务管理的端口的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:916
-msgid ""
-"The LDAP attribute that contains the protocols understood by this service."
+#: src/lib/authui/sssd/params.rb:920
+msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr "存放此服务可解析协议的 LDAP 属性。"
-#: src/lib/authui/sssd/params.rb:922
-msgid ""
-"An optional base DN, search scope and LDAP filter to restrict LDAP searches "
-"for this attribute type."
+#: src/lib/authui/sssd/params.rb:926
+msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr "一个可选的基本判别名/搜索范围/LDAP 过滤器,可限制 LDAP 搜索只搜索此属性类型。"
-#: src/lib/authui/sssd/params.rb:927
-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)."
+#: src/lib/authui/sssd/params.rb:931
+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 "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 搜索允许运行的以秒计超时。"
-#: src/lib/authui/sssd/params.rb:932
-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 ""
-"指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 用户和组枚举搜索允许运行的"
-"以秒计超时。"
+#: src/lib/authui/sssd/params.rb:936
+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 "指定了取消并返回缓存结果 (并进入离线模式) 前 LDAP 用户和组枚举搜索允许运行的以秒计超时。"
-#: src/lib/authui/sssd/params.rb:937
-msgid ""
-"Specifies the timeout (in seconds) after which the poll(2)/select(2) "
-"following a connect(2) returns in case of no activity."
+#: src/lib/authui/sssd/params.rb:941
+msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr "指定了无活动时 poll(2)/select(2) 跟随 connect(2) 返回的以秒计超时。"
-#: src/lib/authui/sssd/params.rb:942
-msgid ""
-"Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs "
-"will abort if no response is received."
+#: src/lib/authui/sssd/params.rb:946
+msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr "指定了无回应时同步 LDAP API 调用中止的以秒计超时。"
-#: src/lib/authui/sssd/params.rb:947
-msgid ""
-"Specifies a timeout (in seconds) that a connection to an LDAP server will be "
-"maintained."
+#: src/lib/authui/sssd/params.rb:951
+msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr "指定了维持到 LDAP 服务器连接的以秒计超时。"
-#: src/lib/authui/sssd/params.rb:952
-msgid ""
-"Specify the number of records to retrieve from LDAP in a single request. "
-"Some LDAP servers enforce a maximum limit per-request."
+#: src/lib/authui/sssd/params.rb:956
+msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr "指定了单一请求从 LDAP 撷取的记录数。某些 LDAP 服务器强制单一请求最大限制。"
-#: src/lib/authui/sssd/params.rb:957
+#: src/lib/authui/sssd/params.rb:961
msgid "Disable the LDAP paging control."
msgstr "禁用 LDAP 分页控制。"
-#: src/lib/authui/sssd/params.rb:961
-msgid ""
-"When communicating with an LDAP server using SASL, specify the minimum "
-"security level necessary to establish the connection."
+#: src/lib/authui/sssd/params.rb:965
+msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr "当使用 SASL 与 LDAP 服务器通信时,请指定建立连接必需的最小安全级别。"
-#: src/lib/authui/sssd/params.rb:966
-msgid ""
-"Specify the number of group members that must be missing from the internal "
-"cache in order to trigger a dereference lookup."
+#: src/lib/authui/sssd/params.rb:970
+msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr "指定了为触发解引用查询内部缓存必须缺失的组成员数。"
-#: src/lib/authui/sssd/params.rb:973
+#: src/lib/authui/sssd/params.rb:977
msgid "Validate server certification in LDAP TLS session"
msgstr "在 LDAP TLS 会话中验证服务器证书"
-#: src/lib/authui/sssd/params.rb:977
-msgid ""
-"Specifies the file that contains certificates for all of the Certificate "
-"Authorities that sssd will recognize."
+#: src/lib/authui/sssd/params.rb:981
+msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr "指定了包含全部 sssd 应认得的证书授权机构证书的文件。"
-#: src/lib/authui/sssd/params.rb:981
-msgid ""
-"Specifies the path of a directory that contains Certificate Authority "
-"certificates in separate individual files."
+#: src/lib/authui/sssd/params.rb:985
+msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr "指定了包含以几个单独文件形式存在的证书授权机构证书的文件夹路径。"
-#: src/lib/authui/sssd/params.rb:985
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the certificate for the client's key."
msgstr "指定了包含客户端密钥证书的文件。"
-#: src/lib/authui/sssd/params.rb:989
+#: src/lib/authui/sssd/params.rb:993
msgid "Specifies the file that contains the client's key."
msgstr "指定了包含客户端密钥的文件。"
-#: src/lib/authui/sssd/params.rb:994
+#: src/lib/authui/sssd/params.rb:998
msgid "Specifies acceptable cipher suites."
msgstr "指定了可接受的密码套件。"
-#: src/lib/authui/sssd/params.rb:999
-msgid ""
-"Specifies that the id_provider connection must also use tls to protect the "
-"channel."
+#: src/lib/authui/sssd/params.rb:1003
+msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr "指定了 id_provider 连接必须也使用 TLS 来保护通道。"
-#: src/lib/authui/sssd/params.rb:1004
-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 ""
-"指定了 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户"
-"和组 ID 而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。"
-
#: src/lib/authui/sssd/params.rb:1008
+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 "指定了 SSSD 应尝试从 ldap_user_objectsid 和 ldap_group_objectsid 属性映射用户和组 ID 而不是依赖于 ldap_user_uid_number 和 ldap_group_gid_number。"
+
+#: src/lib/authui/sssd/params.rb:1012
msgid "Specify the SASL mechanism to use."
msgstr "指定了要使用的 SASL 机制。"
-#: src/lib/authui/sssd/params.rb:1013
+#: src/lib/authui/sssd/params.rb:1017
msgid "Specify the SASL authorization id to use."
msgstr "指定了要使用的 SASL 认证 ID。"
-#: src/lib/authui/sssd/params.rb:1018
+#: src/lib/authui/sssd/params.rb:1022
msgid "Specify the SASL realm to use."
msgstr "指定了要使用的 SASL 领域。"
-#: src/lib/authui/sssd/params.rb:1023
-msgid ""
-"If set to true, the LDAP library would perform a reverse lookup to "
-"canonicalize the host name during a SASL bind."
+#: src/lib/authui/sssd/params.rb:1027
+msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr "若设为真,LDAP 函数库在 SASL 绑定时应执行一次反向查询以规范化主机名。"
-#: src/lib/authui/sssd/params.rb:1028
+#: src/lib/authui/sssd/params.rb:1032
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr "指定了使用 SASL/GSSAPI 时使用的密钥表。"
-#: src/lib/authui/sssd/params.rb:1033
+#: src/lib/authui/sssd/params.rb:1037
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr "指定了 id_provider 应初始化 Kerberos 机要资料 (票据授权票据)。"
-#: src/lib/authui/sssd/params.rb:1038
+#: src/lib/authui/sssd/params.rb:1042
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr "指定了使用 GSSAPI 时票据授权票据以秒计的生命周期。"
-#: src/lib/authui/sssd/params.rb:1043
-msgid ""
-"Select the policy to evaluate the password expiration on the client side."
+#: src/lib/authui/sssd/params.rb:1047
+msgid "Select the policy to evaluate the password expiration on the client side."
msgstr "选择客户端方面用于评估密码有效期的策略。"
-#: src/lib/authui/sssd/params.rb:1048
+#: src/lib/authui/sssd/params.rb:1052
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr "指定了是否应启用自动引用跟踪。"
-#: src/lib/authui/sssd/params.rb:1053
+#: src/lib/authui/sssd/params.rb:1057
msgid "Specifies the service name to use when service discovery is enabled."
msgstr "制定了当启用了服务发现时使用的服务名称。"
-#: src/lib/authui/sssd/params.rb:1057
-msgid ""
-"Specifies the service name to use to find an LDAP server which allows "
-"password changes when service discovery is enabled."
+#: src/lib/authui/sssd/params.rb:1061
+msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr "指定了当启用了服务发现时用于查找允许密码变更的 LDAP 服务器的服务名称。"
-#: src/lib/authui/sssd/params.rb:1062
-msgid ""
-"Specifies whether to update the ldap_user_shadow_last_change attribute with "
-"days since the Epoch after a password change operation."
-msgstr ""
-"指定了在密码变更操作过后是否使用上次操作天数更新 "
-"ldap_user_shadow_last_change 属性。"
+#: src/lib/authui/sssd/params.rb:1066
+msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
+msgstr "指定了在密码变更操作过后是否使用上次操作天数更新 ldap_user_shadow_last_change 属性。"
-#: src/lib/authui/sssd/params.rb:1067
-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 ""
-"若使用了 access_provider = ldap 和 ldap_access_order = filter (默认),则此选"
-"项是必需的。它指定了一个 LDAP 搜索过滤器标准,用户想要获得此主机的访问权就必"
-"须满足此标准。"
+#: src/lib/authui/sssd/params.rb:1071
+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 "若使用了 access_provider = ldap 和 ldap_access_order = filter (默认),则此选项是必需的。它指定了一个 LDAP 搜索过滤器标准,用户想要获得此主机的访问权就必须满足此标准。"
-#: src/lib/authui/sssd/params.rb:1072
-msgid ""
-" With this option a client side evaluation of access control attributes can "
-"be enabled."
+#: src/lib/authui/sssd/params.rb:1076
+msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr "使用此选项可启用客户端访问控制属性评估。"
-#: src/lib/authui/sssd/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1082
msgid "Comma separated list of access control options."
msgstr "逗号分隔的访问控制选项列表。"
-#: src/lib/authui/sssd/params.rb:1083
+#: src/lib/authui/sssd/params.rb:1087
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr "指定了执行搜索时如何解引用别名。"
-#: src/lib/authui/sssd/params.rb:1088
-msgid ""
-"Allows to retain local users as members of an LDAP group for servers that "
-"use the RFC2307 schema."
+#: src/lib/authui/sssd/params.rb:1092
+msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr "针对使用 RFC2307 方案的服务器允许保留本地用户作为某个 LDAP 组的成员。"
-#: src/lib/authui/sssd/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1105
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr "Kerberos 服务器 IP 地址或主机名 (逗号分隔)"
-#: src/lib/authui/sssd/params.rb:1105
-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 ""
-"指定了逗号分隔的 SSSD 应以优先级顺序连接的 Kerberos 服务器 IP 地址或主机名列"
-"表。"
+#: src/lib/authui/sssd/params.rb:1109
+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 "指定了逗号分隔的 SSSD 应以优先级顺序连接的 Kerberos 服务器 IP 地址或主机名列表。"
-#: src/lib/authui/sssd/params.rb:1110
+#: src/lib/authui/sssd/params.rb:1114
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr "Kerberos 领域 (例如 EXAMPLE.COM)"
-#: src/lib/authui/sssd/params.rb:1114 src/lib/authui/sssd/params.rb:1119
-msgid ""
-"If the change password service is not running on the KDC, alternative "
-"servers can be defined here."
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
+msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr "若 KDC 上未运行密码变更服务,则可在此定义替代服务器。"
-#: src/lib/authui/sssd/params.rb:1124
+#: src/lib/authui/sssd/params.rb:1128
msgid "Directory to store credential caches."
msgstr "存储机要缓存的文件夹。"
-#: src/lib/authui/sssd/params.rb:1129
+#: src/lib/authui/sssd/params.rb:1133
msgid "Location of the user's credential cache."
msgstr "用户机要缓存的位置。"
-#: src/lib/authui/sssd/params.rb:1134
-msgid ""
-" Timeout in seconds after an online authentication request or change "
-"password request is aborted."
+#: src/lib/authui/sssd/params.rb:1138
+msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr "在线认证请求或密码变更请求以秒计的超时。"
-#: src/lib/authui/sssd/params.rb:1139
-msgid ""
-"Verify with the help of krb5_keytab that the TGT obtained has not been "
-"spoofed."
+#: src/lib/authui/sssd/params.rb:1143
+msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr "在 krb5_keytab 的帮助下校验获取的票据授权票据未被冒名顶替。"
-#: src/lib/authui/sssd/params.rb:1144
-msgid ""
-"The location of the keytab to use when validating credentials obtained from "
-"KDCs."
+#: src/lib/authui/sssd/params.rb:1148
+msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr "当认证从 KDC 获取的机要资料时所用的密钥表的位置。"
-#: src/lib/authui/sssd/params.rb:1149
-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."
+#: src/lib/authui/sssd/params.rb:1153
+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 "若提供者离线则存储用户密码并在提供者再次上线时用其请求票据授权票据。"
-#: src/lib/authui/sssd/params.rb:1153
-msgid ""
-"Request a renewable ticket with a total lifetime, given as an integer "
-"immediately followed by a time unit."
+#: src/lib/authui/sssd/params.rb:1157
+msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr "请求可续期票据和其完整生命期,以整数后接时间单位的形式给出。"
-#: src/lib/authui/sssd/params.rb:1157
-msgid ""
-"Request ticket with a with a lifetime, given as an integer immediately "
-"followed by a time unit."
+#: src/lib/authui/sssd/params.rb:1161
+msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr "请求票据和其生命期,以整数后接时间单位的形式给出。"
-#: src/lib/authui/sssd/params.rb:1161
+#: src/lib/authui/sssd/params.rb:1165
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr "当票据授权票据应续期时两次检查间的秒数。"
-#: src/lib/authui/sssd/params.rb:1166
-msgid ""
-"Enables flexible authentication secure tunneling (FAST) for Kerberos pre-"
-"authentication."
+#: src/lib/authui/sssd/params.rb:1170
+msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr "为 Kerberos 预认证启用灵活认证安全隧道 (FAST)。"
-#: src/lib/authui/sssd/params.rb:1170
+#: src/lib/authui/sssd/params.rb:1174
msgid "Specifies the server principal to use for FAST."
msgstr "指定了用于灵活认证安全隧道的服务器实体。"
-#: src/lib/authui/sssd/params.rb:1175
+#: src/lib/authui/sssd/params.rb:1179
msgid "Specifies if the host and user principal should be canonicalized."
msgstr "指定了是否应规范化主机和用户实体。"
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1187
+#: src/lib/authui/sssd/params.rb:1191
msgid "Specifies the name of the Active Directory domain."
msgstr "指定了活动目录域的名称。"
-#: src/lib/authui/sssd/params.rb:1192
+#: src/lib/authui/sssd/params.rb:1196
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr "AD 服务器 IP 地址或主机名 (逗号分隔)"
-#: src/lib/authui/sssd/params.rb:1196
-msgid ""
-"The comma-separated list of IP addresses or hostnames of the AD servers to "
-"which SSSD should connect in order of preference."
-msgstr ""
-"以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名"
-"列表。"
+#: src/lib/authui/sssd/params.rb:1200
+msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
+msgstr "以优先级顺序指定了 SSSD 应连接的活动目录服务器的以逗号分隔的 IP 地址或主机名列表。"
-#: src/lib/authui/sssd/params.rb:1201
-msgid ""
-"AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN "
-"used by AD to identify this host."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
msgstr "活动目录主机名(可选) - 可在 hostname(5) 未反映活动目录用于识别此主机的完全限定名称时设置。"
-#: src/lib/authui/sssd/params.rb:1205
+#: src/lib/authui/sssd/params.rb:1209
msgid "Override the user's home directory."
msgstr "覆盖用户主文件夹。"
-#: src/lib/authui/sssd/params.rb:1218
-msgid ""
-" Specifies the lower bound of the range of POSIX IDs to use for mapping "
-"Active Directory user and group SIDs."
+#: src/lib/authui/sssd/params.rb:1222
+msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的下界。"
-#: src/lib/authui/sssd/params.rb:1223
-msgid ""
-"Specifies the upper bound of the range of POSIX IDs to use for mapping "
-"Active Directory user and group SIDs."
+#: src/lib/authui/sssd/params.rb:1227
+msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr "指定了用于映射活动目录用户和组 SID 的 POSIX ID 范围的上界。"
-#: src/lib/authui/sssd/params.rb:1228
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specifies the number of IDs available for each slice."
msgstr "指定了每一切片可用的 ID 数。"
-#: src/lib/authui/sssd/params.rb:1232
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the domain SID of the default domain."
msgstr "指定默认域的域 SID。"
-#: src/lib/authui/sssd/params.rb:1236
+#: src/lib/authui/sssd/params.rb:1240
msgid "Specify the name of the default domain."
msgstr "指定默认域的名称。"
-#: src/lib/authui/sssd/params.rb:1241
-msgid ""
-"Changes the behavior of the ID-mapping algorithm to behave more similarly to "
-"winbind's “idmap_autorid” algorithm."
+#: src/lib/authui/sssd/params.rb:1245
+msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr "修改 ID 映射算法的行为以与 winbind 的 \"idmap_autorid\" 算法更加相似。"
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1257
msgid "Specifies the name of the IPA domain."
msgstr "指定 IPA 域的名称。"
-#: src/lib/authui/sssd/params.rb:1258
+#: src/lib/authui/sssd/params.rb:1262
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr "IPA 服务器 IP 地址或主机名 (逗号分隔)"
-#: src/lib/authui/sssd/params.rb:1263
-msgid ""
-"IPA hostname (optional) - may be set if hostname(5) does not reflect the "
-"FQDN used by IPA to identify this host."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
msgstr "IPA 主机名 (可选) - 可在 hostname(5) 未反映 IPA 用于识别此主机的完全限定名称时设置。"
-#: src/lib/authui/sssd/params.rb:1268
+#: src/lib/authui/sssd/params.rb:1272
msgid "The automounter location this IPA client will be using."
msgstr "将使用此 IPA 客户端的自动挂载器位置。"
-#: src/lib/authui/sssd/params.rb:1273
-msgid ""
-"This option tells SSSD to automatically update the DNS server built into "
-"FreeIPA v2 with the IP address of this client."
-msgstr ""
-"此选项告知 SSSD 使用此客户端的 IP 地址自动更新被构建成 FreeIPA v2 的 DNS 服务"
-"器。"
+#: src/lib/authui/sssd/params.rb:1277
+msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
+msgstr "此选项告知 SSSD 使用此客户端的 IP 地址自动更新被构建成 FreeIPA v2 的 DNS 服务器。"
-#: src/lib/authui/sssd/params.rb:1278
+#: src/lib/authui/sssd/params.rb:1282
msgid "The TTL to apply to the client DNS record when updating it."
msgstr "更新客户端 DNS 记录时应用的 TTL。"
-#: src/lib/authui/sssd/params.rb:1282
-msgid ""
-"Choose the interface whose IP address should be used for dynamic DNS updates."
+#: src/lib/authui/sssd/params.rb:1286
+msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr "选择其 IP 地址应用于动态 DNS 更新的接口。"
#~ msgid "Authentication client configuration module"
@@ -2158,8 +1795,7 @@
#~ msgid "Indicates what is the syntax of the config file."
#~ msgstr "揭示了配置文件的语法。"
-#~ msgid ""
-#~ "Comma separated list of services that are started when sssd itself starts."
+#~ msgid "Comma separated list of services that are started when sssd itself starts."
#~ msgstr "以逗号分隔的当 sssd 自身启动时也将启动的服务列表。"
#~ msgid ""
@@ -2169,49 +1805,28 @@
#~ "\n"
#~ "支持的服务:nss, pam, sudo, autofs, ssh"
-#~ msgid ""
-#~ "SSSD can use more domains at the same time, but at least one must be "
-#~ "configured or SSSD won't start."
+#~ msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
#~ msgstr "SSSD 可同时使用更多域,但必须配置至少一个否则 SSSD 不会启动。"
-#~ msgid ""
-#~ "This parameter contains the list of domains in the order these will be "
-#~ "queried."
+#~ msgid "This parameter contains the list of domains in the order these will be queried."
#~ msgstr "此参数包含了以查询顺序排列的域列表。"
-#~ 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 ""
-#~ "默认我们将尝试使用 inotify,若 inotify 不可用则回退为每五秒轮询 resolv."
-#~ "conf 一次。"
+#~ 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 "默认我们将尝试使用 inotify,若 inotify 不可用则回退为每五秒轮询 resolv.conf 一次。"
-#~ 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 ""
-#~ "表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值,0xFFF0是最详尽"
-#~ "模式。"
+#~ 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 "表示可见调试级别的位掩码。0x0010 是默认值也是允许的最小值,0xFFF0是最详尽模式。"
-#~ 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 ""
-#~ "若服务不响应 ping 检查 (参考「超时」选项) ,它将会先发送 SIGTERM 信号引导"
-#~ "服务优雅地退出。"
+#~ 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 "若服务不响应 ping 检查 (参考「超时」选项) ,它将会先发送 SIGTERM 信号引导服务优雅地退出。"
-#~ msgid ""
-#~ "May be set on machines where the hostname(5) does not reflect the fully "
-#~ "qualified name."
+#~ msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
#~ msgstr "可以在 hostname(5) 未反映完全限定名称的机器上设置。"
#~ msgid "Failed to enable %s service. Please use system journal to diagnose."
#~ msgstr "启用 %s 服务失败。请使用系统日志进行诊断。"
-#~ msgid ""
-#~ "Failed to start %s service. Please use system journal (journalctl -n -u "
-#~ "%s) to diagnose."
+#~ msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
#~ msgstr "启动 %s 服务失败。请使用系统日志 (journalctl -n -u %s) 进行诊断。"
#~ msgid "System is configured for using nss_ldap.\n"
@@ -2304,44 +1919,13 @@
#~ msgid "Edit"
#~ msgstr "编辑"
-#~ 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>"
-#~ msgstr ""
-#~ "SSSD 提供了一系列守护进程来管理对远程文件夹的访问权和认证机制。 <br>您必须"
-#~ "配置至少一个认证域。<br>您必须为认证域设置的首先是该域所用的身份和认证提供"
-#~ "方。<br>下一步您必须为所选提供方设置一些必需参数。稍后您可以选择全部可用于"
-#~ "所选身份和认证提供方的参数。SSSD 提供了以下 id_provider:<br><b>proxy</"
-#~ "b>: 支持传统的 NSS 提供方。<br><b>local</b>: 用于本地用户的 SSSD 内部提供"
-#~ "方。<br><b>ldap</b>: LDAP 提供方。可参考 sssd-ldap(5) 获取更多信息配置 "
-#~ "LDAP。<br><b>ipa</b>: FreeIPA 和 Red Hat Enterprise Identity Management 提"
-#~ "供方。<br><b>ad</b>: 活动目录提供方。<br>支持的认证提供方有:<br><b>ldap</"
-#~ "b> 用于原生 LDAP 认证。<br><b>krb5</b> 用于 Kerberos 认证。<br><b>ipa</b> "
-#~ "FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b> 活"
-#~ "动目录提供方。<br><b>proxy</b> 用于对某些其它 PAM 对象的延迟认证。"
-#~ "<br><b>none</b> 显式禁用认证。<br>默认认证提供方与 id_provider 相同。<br>"
+#~ 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 Ident
ity 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>"
+#~ msgstr "SSSD 提供了一系列守护进程来管理对远程文件夹的访问权和认证机制。 <br>您必须配置至少一个认证域。<br>您必须为认证域设置的首先是该域所用的身份和认证提供方。<br>下一步您必须为所选提供方设置一些必需参数。稍后您可以选择全部可用于所选身份和认证提供方的参数。SSSD 提供了以下 id_provider:<br><b>proxy</b>: 支持传统的 NSS 提供方。<br><b>local</b>: 用于本地用户的 SSSD 内部提供方。<br><b>ldap</b>: LDAP 提供方。可参考 sssd-ldap(5) 获取更多信息配置 LDAP。<br><b>ipa</b>: FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b>: 活动目录提供方。<br>支持的认证提供方有:<br><b>ldap</b> 用于原生 LDAP 认证。<br><b>krb5</b> 用于 Kerberos 认证。<br><b>ipa</b> FreeIPA 和 Red Hat Enterprise Identity Management 提供方。<br><b>ad</b> 活动目录提供方。<br><b>proxy</b> 用于对某�
�其它 PAM 对象的延迟认证。<br><b>none</b> 显式禁用认证。<br>默认认证提供方与 id_provider 相同。<br>"
#~ msgid "Determines if a domain can be enumerated."
#~ msgstr "确定某域是否可枚举。"
-#~ msgid ""
-#~ "Determines if user credentials are also cached in the local LDB cache."
+#~ msgid "Determines if user credentials are also cached in the local LDB cache."
#~ msgstr "确定是否也在本地 LDB 缓存中缓存用户机要。"
#~ msgid "The authentication provider used for the domain."
@@ -2359,20 +1943,14 @@
#~ msgid "Specifies the Schema Type in use on the target LDAP server."
#~ msgstr "指定了目标 LDAP 服务器上使用的方案类型。"
-#~ msgid ""
-#~ "Specifies what checks to perform on server certificates in a TLS session, "
-#~ "if any."
+#~ msgid "Specifies what checks to perform on server certificates in a TLS session, if any."
#~ msgstr "指定了若需要检查则在 TLS 会话中对服务器证书要进行的检查。"
#~ msgid "The name of the Kerberos realm."
#~ msgstr "Kerberos 领域的名称。"
-#~ 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 ""
-#~ "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列"
-#~ "表。"
+#~ 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 "指定了逗号分隔的 SSSD 应以优先级顺序连接的 IPA 服务器 IP 地址或主机名列表。"
#~ msgid "SPAM Prevention"
#~ msgstr "SPAM 防护"
Modified: trunk/yast/zh_CN/po/auth-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/auth-server.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/auth-server.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-10-30 17:17+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <kde-i18n-doc(a)kde.org>\n"
@@ -299,8 +299,7 @@
msgstr "于 &SLP 守护进程注册"
#. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
msgid "Firewall Settings"
msgstr "防火墙设置"
@@ -445,12 +444,12 @@
msgid "Configure Account for Replication"
msgstr "配置用于复制的账户"
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
msgid "is not a valid LDAP DN"
msgstr "不是一个有效的 LDAP 判别名"
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
msgid "Password"
msgstr "密码"
@@ -476,8 +475,8 @@
msgid "Provider Details"
msgstr "提供者细节"
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
msgid "Protocol"
msgstr "协议"
@@ -485,7 +484,7 @@
msgid "Provider Hostname"
msgstr "提供者主机名"
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
msgid "Use StartTLS"
msgstr "使用 StartTLS"
@@ -568,8 +567,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr "检查提供者服务器上的复制配置中定义的认证资料失败。\n"
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
msgid "The test returned the following error messages:"
msgstr "测试返回了以下错误消息:"
@@ -1953,8 +1952,7 @@
#. Initialization dialog contents
#. Initialization dialog contents
#: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
#: src/include/auth-server/wizards.rb:207
#: src/include/auth-server/wizards.rb:300
msgid "Initializing..."
@@ -2328,7 +2326,7 @@
msgid "Index Cache (IDL cache)"
msgstr "索引缓存 (IDL 缓存)"
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
msgid "Checkpoint Settings"
msgstr "检查点设置"
@@ -2396,7 +2394,7 @@
msgstr "添加索引"
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
msgid "Password Policy Settings"
msgstr "密码策略设置"
@@ -2559,237 +2557,237 @@
msgstr "文件夹不存在。创建它吗?"
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr "认证失败。密码可能不正确。\n"
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
msgid "The error message was: '"
msgstr "错误消息为:'"
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
msgid "Try again?"
msgstr "重试吗?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
msgid "Available Attribute Types"
msgstr "可用属性类型"
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
msgid "Selected Attribute Types"
msgstr "所选属性类型"
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
msgid "Who should this rule apply to"
msgstr "规则应用对象"
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
msgid "Entry DN"
msgstr "条目判别名"
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
msgid "Select"
msgstr "选择"
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
msgid "Define the Access Level"
msgstr "定义访问级别"
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
msgid "Stop access control evaluation here (default)"
msgstr "在此停止访问控制评估 (默认)"
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
msgid "Continue with next access control rule (\"break\")"
msgstr "继续下一条访问控制规则 (\"断点\")"
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
msgid "Continue evaluation of this rule (\"continue\")"
msgstr "继续评估此规则 (\"继续\")"
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
msgid "Please enter a DN in the textfield"
msgstr "请在文本框中输入一个判别名"
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
msgid "Subtree DN"
msgstr "子树判别名"
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
msgid "Group DN"
msgstr "组判别名"
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
msgid "Edit Access Control Rule"
msgstr "编辑访问控制规则"
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
msgid "Target Objects"
msgstr "目标对象"
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
msgid "Matching the filter:"
msgstr "匹配过滤器:"
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
msgid "LDAP Filter"
msgstr "LDAP 过滤器"
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
msgid "Apply this rule only to the listed attribute"
msgstr "仅将此规则应用到列出的属性"
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
msgid "Attributes"
msgstr "属性"
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
msgid "Edit"
msgstr "编辑"
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
msgid "Access Level"
msgstr "访问级别"
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
msgid "Who"
msgstr "谁"
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
msgid "DN"
msgstr "判别名"
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
msgid "Flow Control"
msgstr "流程控制"
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
msgid "Up"
msgstr "向上"
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
msgid "Down"
msgstr "向下"
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr "在<b>属性</b>文本框中输入有效属性列表"
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
msgid "Enter valid a LDAP filter in the textfield"
msgstr "在文本框中输入一个有效的 LDAP 过滤器"
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
msgid "You must add at least one item to the \"Access Level\" list."
msgstr "您必须添加至少一个条目到 \"访问级别\" 列表。"
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Target"
msgstr "目标"
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Filter"
msgstr "过滤器"
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
msgstr "所选数据库包含目前 YaST 不支持的访问控制规则。将禁用访问控制对话框。\n"
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
msgid "This database is a Replication Consumer."
msgstr "此数据库是一个复制使用者。"
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
msgid "Provider Name"
msgstr "提供者名称"
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
msgid "Port"
msgstr "端口"
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
msgid "Replication Type"
msgstr "复制类型"
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
msgid "Replication Interval"
msgstr "复制周期"
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
msgid "Days"
msgstr "天"
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
msgid "Hours"
msgstr "小时"
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
msgid "Minutes"
msgstr "分钟"
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
msgid "Seconds"
msgstr "秒"
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
msgid "Authentication DN"
msgstr "认证判别名"
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
msgid "Custom update referral"
msgstr "自定义更新来源"
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
msgid "Target Host"
msgstr "目标主机"
#. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
msgid "Invalid replication interval specified"
msgstr "指定了无效的复制周期"
#. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
msgid "Checking LDAP connectivity to the provider failed."
msgstr "检查提供者的 LDAP 连通性失败。"
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
msgid "Do you still want to continue?"
msgstr "您仍然想要继续吗?"
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr "检查提供者的 LDAPsync 能力失败。"
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr "请验证目标服务器是否已启用为一个 LDAPsync 提供者"
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
msgid "Enable ldapsync provider for this database"
msgstr "启用此数据库作为 ldapsync 提供者"
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
msgid "Operations"
msgstr "操作"
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
msgid "Session Log"
msgstr "会话日志"
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
msgid "Enable Session Log"
msgstr "启用会话日志"
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
msgid "Replication Settings"
msgstr "复制设置"
Modified: trunk/yast/zh_CN/po/autoinst.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/autoinst.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/autoinst.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-10-18 12:20+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -37,7 +37,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:358
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
msgid "This may take a while"
msgstr "这可能要花费一点时间"
@@ -57,14 +57,13 @@
#. command line options
#. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. unique id
#. Backup
#. Now check if there any classes defined in theis pre final control file
#: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
@@ -127,8 +126,7 @@
#. if we get no argument or map of options we are not in command line
#: src/clients/clone_system.rb:66
-msgid ""
-"Client for creating an AutoYaST profile based on the currently running system"
+msgid "Client for creating an AutoYaST profile based on the currently running system"
msgstr "基于当前运行中系统创建 AutoYaST 方案的客户端"
#: src/clients/clone_system.rb:76
@@ -157,20 +155,15 @@
#: src/clients/files_auto.rb:170
msgid ""
"<p>Using this dialog, copy the contents of the file and specify the final\n"
-"path on the installed system. YaST will copy this file to the specified "
-"location.</p>"
-msgstr ""
-"<p>使用此对话框复制文件内容并指定其在安装好的系统上的最终路径。YaST2 会把此文"
-"件复制到指定的位置。</p>"
+"path on the installed system. YaST will copy this file to the specified location.</p>"
+msgstr "<p>使用此对话框复制文件内容并指定其在安装好的系统上的最终路径。YaST2 会把此文件复制到指定的位置。</p>"
#. help 2/2
#: src/clients/files_auto.rb:177
msgid ""
"<p>To protect copied files, set the owner and the permissions of the files.\n"
-"Set the owner using the syntax <i>userid:groupid</i>. Permissions can be a "
-"symbolic\n"
-"representation of changes to make or an octal number representing the bit "
-"pattern for the\n"
+"Set the owner using the syntax <i>userid:groupid</i>. Permissions can be a symbolic\n"
+"representation of changes to make or an octal number representing the bit pattern for the\n"
"new permissions.</p>"
msgstr ""
"<p>为了保护所复制的文件,请设置文件的所有者和权限。\n"
@@ -246,10 +239,8 @@
#: src/clients/files_auto.rb:321
msgid ""
"<p>For many applications and services, you might have prepared\n"
-"a configuration file that should be copied in a complete form to a location "
-"in the\n"
-"installed system. For example, this is the case if you are installing a web "
-"server\n"
+"a configuration file that should be copied in a complete form to a location in the\n"
+"installed system. For example, this is the case if you are installing a web server\n"
"and have an httpd.conf configuration file prepared.</p>"
msgstr ""
"<p>对于许多应用程序和服务,您可能早就优化出了一个配置文件,\n"
@@ -262,7 +253,7 @@
msgstr "请先从表中选择一个文件。"
#. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -273,43 +264,27 @@
"</p>"
#. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
msgid "Progress"
msgstr "进度"
#. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
msgid "Configuring System according to auto-install settings"
msgstr "正在根据自动安装设置配置系统"
#. 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 ""
-"AutoYaST 方案的这些部分不再支持了:\n"
-"\n"
-"%s\n"
-"\n"
-"请使用,例如 <scripts/> 或 <files/> 来修改配置。"
-
-#. 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."
+#: src/clients/inst_autoconfigure.rb:94
+#, fuzzy
+#| 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."
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section."
msgstr ""
"AutoYaST 方案的这些部分无法在此系统上进行:\n"
"\n"
@@ -319,25 +294,28 @@
#. determine name of client, if not use default name
#. Call::Function(module_auto, ["Import", eval(Profile::current[resource]:$[]) ]);
-#: src/clients/inst_autoconfigure.rb:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
msgid "Configuring %1"
msgstr "配置 %1"
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
msgid "Not Configuring %1"
msgstr "未配置 %1"
#. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
msgid "Executing Post-Scripts"
msgstr "正在执行安装后脚本"
-#: src/clients/inst_autoconfigure.rb:303
+#. Do not restart NetworkManager* services
+#. bnc#955260
+#: src/clients/inst_autoconfigure.rb:304
msgid "Restarting all running services"
msgstr "正在重启全部运行中的服务"
+#. Filtering out all services which must not to be restarted
#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr "正在激活 systemd 默认对象"
@@ -348,7 +326,7 @@
msgstr "正在完成配置"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:444
+#: src/clients/inst_autoconfigure.rb:447
msgid "Processing resource %1"
msgstr "正在处理资源 %1"
@@ -408,8 +386,15 @@
"运行映像脚本失败:\n"
"%1"
-#. import "Arch";
#. encoding: utf-8
+#. File: clients/inst_autoinit.ycp
+#. Package: Auto-installation
+#. Summary: Parses XML Profile for automatic installation
+#. Authors: Anas Nashif <nashif(a)suse.de>
+#.
+#. $Id$
+#.
+#. encoding: utf-8
#. File: clients/autoinst_post.ycp
#. Package: Auto-installation
#. Author: Anas Nashif <nashif(a)suse.de>
@@ -417,7 +402,7 @@
#. the system as described in the profile file.
#.
#. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
msgid ""
"<p>\n"
"Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -425,59 +410,57 @@
"<p>\n"
"系统正在准备自动安装,请稍候。</p>\n"
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
msgid "Probe hardware"
msgstr "检测硬件"
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
msgid "Retrieve & Read Control File"
msgstr "撷取并读取控制文件"
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
msgid "Parse control file"
msgstr "解析控制文件"
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
msgid "Initial Configuration"
msgstr "初始配置"
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
msgid "Preparing System for Automatic Installation"
msgstr "准备系统以进行自动安装"
#. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
msgid "Preprobing stage"
msgstr "预检测阶段"
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
msgid "Probing hardware..."
msgstr "正在检测硬件..."
+#. 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_autoinit.rb:128
+#, fuzzy
+#| 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."
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+"AutoYaST 方案的这些部分不再支持了:\n"
+"\n"
+"%s\n"
+"\n"
+"请使用,例如 <scripts/> 或 <files/> 来修改配置。"
+
#. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
msgid "Parsing control file"
msgstr "正在解析控制文件"
@@ -521,92 +504,126 @@
#. Uwe Gansert <ug(a)suse.de>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>系统正在准备自动安装,请稍候。</P>"
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
msgid "Execute pre-install user scripts"
msgstr "执行安装前用户脚本"
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
msgid "Configure General Settings "
msgstr "配置常规设置"
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
msgid "Set up language"
msgstr "设置语言"
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:58
msgid "Create partition plans"
msgstr "创建分区计划"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
msgid "Configure Bootloader"
msgstr "配置引导加载器"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
msgid "Registration"
msgstr "注册"
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure Software selections"
msgstr "配置软件选集"
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:62
msgid "Configure Systemd Default Target"
msgstr "配置 Systemd 默认对象"
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:63
+msgid "Configure users and groups"
+msgstr "配置用户和组"
+
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "配置驱动器"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
msgid "Executing pre-install user scripts..."
msgstr "正在执行安装前用户脚本..."
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configuring general settings..."
msgstr "正在配置常规设置..."
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
msgid "Setting up language..."
msgstr "正在设置语言..."
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
msgid "Creating partition plans..."
msgstr "正在创建分区计划..."
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
msgid "Configuring Bootloader..."
msgstr "正在配置引导加载器..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
msgid "Registering the system..."
msgstr "正在注册系统..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring Software selections..."
msgstr "正在配置软件选集..."
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
msgid "Configuring Systemd Default Target..."
msgstr "正在配置 Systemd 默认对象..."
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:77
+msgid "Importing users and groups configuration..."
+msgstr "正在导入用户和组配置..."
+
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "正在导入 Kickstart 文件..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "正在配置语言..."
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
msgid "Preparing System for Automated Installation"
msgstr "准备系统以进行自动安装"
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. Second stage of installation will not be called but a
+#. network configuration is available. So this will be written
+#. while the general inst_finish process at the end of the
+#. first stage. But for the installation workflow the linuxrc
+#. network settings will be taken. (bnc#944942)
+#: src/clients/inst_autosetup.rb:185
msgid "Handling Add-On Products..."
msgstr "正在处理附加产品..."
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
msgid "Configuring language..."
msgstr "正在配置语言..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:273
+#: src/clients/inst_autosetup.rb:298
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -614,8 +631,9 @@
"配置分区时出错。\n"
"请重试。\n"
-#. Software
-#: src/clients/inst_autosetup.rb:331
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -675,8 +693,7 @@
#: src/clients/report_auto.rb:217
msgid ""
-"<p>Depending on your experience, you can skip, log, and show (with time-"
-"out)\n"
+"<p>Depending on your experience, you can skip, log, and show (with time-out)\n"
"installation messages.</p> \n"
msgstr "<p>取决于您的经验,您可以跳过、记录和显示 (允许超时) 安装消息。</p> \n"
@@ -684,9 +701,7 @@
msgid ""
"<p>It is recommended to show all <b>messages</b> with time-out.\n"
"Warnings can be skipped in some places, but should not be ignored.</p>\n"
-msgstr ""
-"<p>推荐显示全部<b>消息</b>并允许超时。在某些地方可以跳过警告,但不应忽略它"
-"们。</p>\n"
+msgstr "<p>推荐显示全部<b>消息</b>并允许超时。在某些地方可以跳过警告,但不应忽略它们。</p>\n"
#: src/clients/report_auto.rb:230
msgid "Messages and Logging"
@@ -694,40 +709,37 @@
#. Select packages
#. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
msgid "Software Selection"
msgstr "软件选集"
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
msgid ""
"<p>\n"
-"Select one of the following <b>base</b> selections and click <i>Detailed<i> "
-"to add\n"
+"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
"more <b>add-on</b> selections and packages.\n"
"</p>\n"
msgstr ""
"<p>\n"
-"请选择以下<b>基本</b>选集之一并点击<i>细节<i>添加更多<b>附加</b>选集和软件"
-"包。\n"
+"请选择以下<b>基本</b>选集之一并点击<i>细节<i>添加更多<b>附加</b>选集和软件包。\n"
"</p>\n"
#. AutoinstSoftware::pmInit();
#. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
#. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
msgstr "安装来源位置 (如 http://myhost/13.1/DVD1/)"
-#: src/clients/software_auto.rb:128
-msgid ""
-"The inst-source of this system (you can't create images if you choose this)"
+#: src/clients/software_auto.rb:129
+msgid "The inst-source of this system (you can't create images if you choose this)"
msgstr "此系统的安装来源 (若您选了则不能创建映像,因为映像不是动态的)"
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
msgid "using that installation source failed"
msgstr "使用该安装来源失败"
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
msgid "Reading package database..."
msgstr "正在读取软件包数据库..."
@@ -736,12 +748,9 @@
msgid ""
"<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. This identification can be changed so the file system "
-"to mount\n"
-"\tis found by searching for a UUID or a volume label. Not all file systems "
-"can be\n"
-"\tmounted by UUID or a volume label. If an option is disabled, it is not "
-"possible.\n"
+"\tby the device name. This identification can be changed so the file system to mount\n"
+"\tis found by searching for a UUID or a volume label. Not all file systems can be\n"
+"\tmounted by UUID or a volume label. If an option is disabled, it is not possible.\n"
"\t"
msgstr ""
"<p><b>挂载在 /etc/fstab 中的方式:</b>\n"
@@ -755,8 +764,7 @@
#: src/include/autoinstall/AdvancedPartitionDialog.rb:71
msgid ""
"<p><b>Volume Label:</b>\n"
-"\t The name entered in this field is used as the volume label. This usually "
-"makes sense only \n"
+"\t The name entered in this field is used as the volume label. This usually makes sense only \n"
"\t when you activate the option for mounting by volume label.\n"
"\t A volume label cannot contain the / character or spaces.\n"
"\t "
@@ -862,9 +870,7 @@
msgid ""
"You selected to create the partition, but you did not select a valid file\n"
"system. Select a valid filesystem to continue.\n"
-msgstr ""
-"您选择了创建分区,但您未选择有效的文件系统。请选择一个有效的文件系统以继"
-"续。\n"
+msgstr "您选择了创建分区,但您未选择有效的文件系统。请选择一个有效的文件系统以继续。\n"
#. We don't use the return value of the check, because we
#. currently can't stop the dialog switch from happening, so we
@@ -932,8 +938,7 @@
#. user selected this partition to be part of volgroup
#: src/include/autoinstall/PartitionDialog.rb:592
-msgid ""
-"Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected."
+msgid "Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected."
msgstr "大小 \"auto\" 仅在选中挂载点 \"/boot\" 或者 \"swap\" 时有效。"
#: src/include/autoinstall/PartitionDialog.rb:600
@@ -984,6 +989,11 @@
msgid "Volgroup device name"
msgstr "卷组设备名"
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
#. Shows a dialog when 'control file' can't be found
#. @param [String] original Original value
#. @return [String] new value
@@ -1037,8 +1047,7 @@
"</p>"
msgstr ""
"<p>\n"
-"在此显示了在您的系统上自动检测到的全部硬盘。请选择在哪张硬盘上安装 "
-"&product;。\n"
+"在此显示了在您的系统上自动检测到的全部硬盘。请选择在哪张硬盘上安装 &product;。\n"
"</p>"
#. force help text width
@@ -1117,8 +1126,7 @@
msgid ""
"<p>For example, you can define a class of configurations for\n"
"a specific department, group, or site in your company environment.</p>\n"
-msgstr ""
-"<p>例如,您可以为您所处公司环境中的特定部门、小组或地点定义一类配置。</p>\n"
+msgstr "<p>例如,您可以为您所处公司环境中的特定部门、小组或地点定义一类配置。</p>\n"
#: src/include/autoinstall/classes.rb:213
msgid ""
@@ -1190,8 +1198,7 @@
"creating the classes.</P>\n"
msgstr ""
"<p>若您已定义并创建了<b>类</b>,您将能够使用此界面合并这些类来创建一个\n"
-"新<i>方案</i>,该方案将根据创建类时设置的优先级 (顺序) 吸收每个类的信息。</"
-"P>\n"
+"新<i>方案</i>,该方案将根据创建类时设置的优先级 (顺序) 吸收每个类的信息。</P>\n"
#: src/include/autoinstall/classes.rb:497
msgid ""
@@ -1389,9 +1396,7 @@
#. 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?"
+msgid "Do you really want to apply the settings of the module '%1' to your current system?"
msgstr "您真的想要应用模块 '%1' 的设置到您当前系统吗?"
#. opening/parsing the xml file failed
@@ -1406,9 +1411,7 @@
#. FIXME: sucks sucks sucks sucks sucks
#: src/include/autoinstall/conftree.rb:749
-msgid ""
-"Do you really want to apply the settings of the profile to your current "
-"system?"
+msgid "Do you really want to apply the settings of the profile to your current system?"
msgstr "您真的想要应用方案中的设置到您当前系统吗?"
#. EXIT
@@ -1545,8 +1548,7 @@
#: src/include/autoinstall/dialogs.rb:348
msgid ""
"Kickstart file was imported.\n"
-"Check the imported syntax and make sure the package selection and "
-"partitioning\n"
+"Check the imported syntax and make sure the package selection and partitioning\n"
"were imported correctly."
msgstr ""
"已导入 Kickstart 文件。\n"
@@ -1584,7 +1586,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
msgid "Checking XML with RNG validation..."
msgstr "正在进行 RNG 校验以检查 XML..."
@@ -1594,7 +1596,7 @@
msgstr "部分 %1:"
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
msgid "Checking XML with RNC validation..."
msgstr "正在进行 RNC 校验以检查 XML..."
@@ -1633,7 +1635,7 @@
msgstr "第二阶段后重启计算机"
#: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:121
+#: src/modules/AutoinstGeneral.rb:126
msgid "Signature Handling"
msgstr "签名处理"
@@ -1678,8 +1680,7 @@
"The installation confirmation option is selected by default\n"
"to avoid unwanted installation. It stops the system\n"
"during installation and shows a summary of requested operations in the\n"
-"usual proposal screen. Uncheck this option to install automatically without "
-"interruption.\n"
+"usual proposal screen. Uncheck this option to install automatically without interruption.\n"
"</P>\n"
msgstr ""
"<P>\n"
@@ -1691,14 +1692,12 @@
#: src/include/autoinstall/general_dialogs.rb:155
msgid ""
"<P>\n"
-"If you turn off the second stage of AutoYaST, the installation continues in "
-"manual mode\n"
+"If you turn off the second stage of AutoYaST, the installation continues in manual mode\n"
"after the first reboot (after package installation).\n"
"</P>\n"
msgstr ""
"<P>\n"
-"若您关闭了 AutoYaST 第二阶段,安装将在首次引导后以手动模式继续 (软件包安装"
-"后)。\n"
+"若您关闭了 AutoYaST 第二阶段,安装将在首次引导后以手动模式继续 (软件包安装后)。\n"
"</P>\n"
#: src/include/autoinstall/general_dialogs.rb:165
@@ -1842,14 +1841,12 @@
#: src/include/autoinstall/helps.rb:17
msgid ""
-"<p>This tool uses <em>xmllint</em> to validate the profile against the DTD "
-"and\n"
+"<p>This tool uses <em>xmllint</em> to validate the profile against the DTD and\n"
"it checks for missing data. Some missing data might be intentional and any\n"
"reported errors can be ignored, for example, when creating classes.</p>\n"
msgstr ""
"<p>此工具使用 <em>xmllint</em> 根据 DTD 校验该方案并检查缺失的数据。\n"
-"某些数据的缺失可能是故意的,任何报告的错误都可以忽略,例如,创建类时的此类错"
-"误。</p>\n"
+"某些数据的缺失可能是故意的,任何报告的错误都可以忽略,例如,创建类时的此类错误。</p>\n"
#: src/include/autoinstall/helps.rb:22
msgid ""
@@ -1868,15 +1865,13 @@
"to add more configuration options available with SUSE.</p>\n"
msgstr ""
"<p>要导入 Kickstart 文件,请输入配置文件的路径。\n"
-"导入的数据将被加载到配置管理系统中以添加更多可通过 SUSE 使用的配置选项。</"
-"p>\n"
+"导入的数据将被加载到配置管理系统中以添加更多可通过 SUSE 使用的配置选项。</p>\n"
#: src/include/autoinstall/helps.rb:31
msgid ""
"<p>This tool creates a reference profile by reading\n"
"information from this system. Select the resources to read from this system\n"
-"in addition to the default resources, like partitioning and package "
-"selections.</p>\n"
+"in addition to the default resources, like partitioning and package selections.</p>\n"
msgstr ""
"<p>此工具通过从此系统读取信息创建一个参考方案。\n"
"请在默认资源外选择一些要从此系统读取的资源,诸如分区和软件包选集。</p>\n"
@@ -1887,8 +1882,7 @@
#: src/include/autoinstall/helps.rb:37
msgid ""
-"<p>The table to the right shows the partitions to create on the target "
-"system.\n"
+"<p>The table to the right shows the partitions to create on the target system.\n"
"</p>\n"
msgstr ""
"<p>右侧的表显示了要在目标系统上创建的分区。\n"
@@ -1929,12 +1923,9 @@
#: src/include/autoinstall/helps.rb:53
msgid ""
"If no partitions are defined and the specified drive is also\n"
-"the drive where the root partition should reside, the following partitions "
-"are\n"
+"the drive where the root partition should reside, the following partitions are\n"
"created automatically:"
-msgstr ""
-"若未定义分区且指定的驱动器还是根分区应驻留的驱动器,则系统会自动创建以下分"
-"区:"
+msgstr "若未定义分区且指定的驱动器还是根分区应驻留的驱动器,则系统会自动创建以下分区:"
#: src/include/autoinstall/helps.rb:58
msgid ""
@@ -1949,30 +1940,20 @@
msgstr "<p><b>高级选项</b></p>"
#: src/include/autoinstall/helps.rb:62
-msgid ""
-"By default, AutoYaST will create an extended partition and adds all new "
-"partitions as logical devices. It is possible, however, to instruct AutoYaST "
-"to create a certain partition as a primary partition or as extended "
-"partition. Additionally, it is possible to specify the size of a partition "
-"using sectors rather than size in MBytes."
-msgstr ""
-"默认情况下,AutoYaST2 将创建一个扩展分区并将全部新分区作为逻辑设备进行添加。"
-"但是,可以指示 AutoYaST2 创建一个特定分区作为主分区或扩展分区。另外,也可以使"
-"用扇区而不是 MB 表示的大小来指定分区的大小。"
+msgid "By default, AutoYaST will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes."
+msgstr "默认情况下,AutoYaST2 将创建一个扩展分区并将全部新分区作为逻辑设备进行添加。但是,可以指示 AutoYaST2 创建一个特定分区作为主分区或扩展分区。另外,也可以使用扇区而不是 MB 表示的大小来指定分区的大小。"
#: src/include/autoinstall/helps.rb:65
msgid ""
"These options and other advanced options cannot be configured using this\n"
"interface. Instead, add them manually to the control file.\n"
-msgstr ""
-"使用此界面无法配置这些选项和其它高级选项。它们只能手动添加到控制文件中。\n"
+msgstr "使用此界面无法配置这些选项和其它高级选项。它们只能手动添加到控制文件中。\n"
#: src/include/autoinstall/helps.rb:68
msgid ""
"<p>\n"
"For LVM and RAID setup, consult the documentation and add the configuration\n"
-"to an existing control file. You can only create unformatted LVM and RAID "
-"partitions as\n"
+"to an existing control file. You can only create unformatted LVM and RAID partitions as\n"
"a preparation.\n"
"</p>\n"
msgstr ""
@@ -1981,67 +1962,6 @@
"您只可以创建未格式化的 LVM 和 RAID 分区为安装做好准备。\n"
"</p>\n"
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "无法通过 HTTP(S) 协议找到 URL '%1'。服务器返回了代码 %2。"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "无法通过 FTP 协议找到 URL '%1'。服务器返回了代码 %2。"
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "读取 %1/%2 上的文件失败。\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr "读取 %1 上的文件失败。\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:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "挂载 %1 失败。"
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "读取 CD 上的文件失败。路径:%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:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "无法撷取远程文件 %1"
-
-#. this is workaround for bnc#849767
-#. 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:485
-msgid "%1 is not mounted and mount failed"
-msgstr "%1 未挂载,尝试挂载但失败了"
-
-#. autoyast tried to copy a file but that file can't be found
-#: src/include/autoinstall/io.rb:505
-msgid "File %1 cannot be found"
-msgstr "未找到文件 %1"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "无法通过 TFTP 协议找到 URL '%1'。"
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "未知协议 %1。"
-
#. Script Configuration
#. @return script configuration dialog
#: src/include/autoinstall/script_dialogs.rb:30
@@ -2076,8 +1996,7 @@
msgid ""
"\n"
"<h3>Postinstallation Scripts</h3>\n"
-"<P>You can also add commands to execute on the system after the "
-"installation\n"
+"<P>You can also add commands to execute on the system after the installation\n"
"is completed. These scripts are run outside the chroot environment.\n"
"</P>"
msgstr ""
@@ -2095,15 +2014,13 @@
"<P>For your postinstallation script to run inside the chroot\n"
"environment, choose the <i>chroot scripts</i> options. Those scripts are\n"
"run before the system reboots for the first time. By default, the chroot \n"
-"scripts are run in the installation system. To access files in the "
-"installed \n"
+"scripts are run in the installation system. To access files in the installed \n"
"system, always use the mount point \"/mnt\" in your scripts.\n"
"</P>\n"
msgstr ""
"\n"
"<H3>Chroot 脚本</H3>\n"
-"<P>为了让您的安装后脚本在 chroot 环境中运行,请选择 <i>chroot 脚本</i> 选"
-"项。\n"
+"<P>为了让您的安装后脚本在 chroot 环境中运行,请选择 <i>chroot 脚本</i> 选项。\n"
"这些脚本将在系统首次重启前运行。chroot 脚本默认是在安装系统中运行的。\n"
"要访问安装好的系统中的文件,请总是在您的脚本中使用 \"/mnt\" 挂载点。\n"
"</P>\n"
@@ -2113,14 +2030,12 @@
msgid ""
"\n"
"<p>It is possible to run chroot scripts in a later stage after\n"
-"the boot loader has been configured using the special boolean tag \"chrooted"
-"\".\n"
+"the boot loader has been configured using the special boolean tag \"chrooted\".\n"
"This runs the scripts in the installed system. \n"
"</p>\n"
msgstr ""
"\n"
-"<p>可以使用特殊布尔标签 \"chrooted\" 让 chroot 脚本在引导加载器已配置好的稍后"
-"阶段运行。\n"
+"<p>可以使用特殊布尔标签 \"chrooted\" 让 chroot 脚本在引导加载器已配置好的稍后阶段运行。\n"
"这将在安装好的系统中运行这些脚本。\n"
"</p>\n"
@@ -2148,15 +2063,13 @@
msgid ""
"\n"
"<H3>Interpreter:</H3>\n"
-"<P>Preinstallation scripts can only be shell scripts. Do not use <i>Perl</i> "
-"or \n"
+"<P>Preinstallation scripts can only be shell scripts. Do not use <i>Perl</i> or \n"
"<i>Python</i> for preinstallation scripts.\n"
"</P>\n"
msgstr ""
"\n"
"<H3>解释器:</H3>\n"
-"<P>安装前脚本只可以是壳层脚本。请不要对安装前脚本使用 <i>Perl</i> 或 "
-"<i>Python</i> 解释器。\n"
+"<P>安装前脚本只可以是壳层脚本。请不要对安装前脚本使用 <i>Perl</i> 或 <i>Python</i> 解释器。\n"
"因为它们在安装前的计算机中并不存在。</P>\n"
#: src/include/autoinstall/script_dialogs.rb:133
@@ -2165,19 +2078,15 @@
"<H3>Network Access:</H3>\n"
"<P>While executing postinstallation scripts, the network is disabled and\n"
"requires initialization in the scripts to make the network accessible. An\n"
-"alternative for postinstallation scripts with network is using init scripts, "
-"which\n"
-"guarantee a fully configured system when running the scripts. If you did an "
-"installation\n"
-"over a network, you can use the <b>Network</b> option for the postscript, "
-"too.\n"
+"alternative for postinstallation scripts with network is using init scripts, which\n"
+"guarantee a fully configured system when running the scripts. If you did an installation\n"
+"over a network, you can use the <b>Network</b> option for the postscript, too.\n"
"</P>\n"
msgstr ""
"\n"
"<H3>网络访问:</H3>\n"
"<P>执行安装后脚本时,网络是禁用的,需要在脚本中进行初始化以使网络可访问。\n"
-"带网络访问的安装后脚本的替代品就是启动脚本,其保证了脚本运行时系统已经完全配"
-"置好了。\n"
+"带网络访问的安装后脚本的替代品就是启动脚本,其保证了脚本运行时系统已经完全配置好了。\n"
"若您正在通过网络执行安装,您也可以为安装后脚本使用<b>网络</b>选项。\n"
" </P>\n"
@@ -2185,17 +2094,14 @@
msgid ""
"\n"
"<H3>Feedback and Debug:</H3>\n"
-"<P>All scripts except the init scripts can show STDOUT+STDERR in a pop-up "
-"box as feedback.\n"
-"If you turn on debugging, you get more output in the feedback dialog that "
-"might help\n"
+"<P>All scripts except the init scripts can show STDOUT+STDERR in a pop-up box as feedback.\n"
+"If you turn on debugging, you get more output in the feedback dialog that might help\n"
"you to debug your script.</P>\n"
msgstr ""
"\n"
"<H3>反馈和调试:</H3>\n"
"<P>除启动脚本外的全部脚本都能在弹出框中显示 STDOUT + STDERR 作为反馈。\n"
-"若您打开了调试,您会在反馈对话框中获得更多输出,这可能会对您调试脚本有所帮"
-"助。</P>\n"
+"若您打开了调试,您会在反馈对话框中获得更多输出,这可能会对您调试脚本有所帮助。</P>\n"
#: src/include/autoinstall/script_dialogs.rb:155
msgid "Script Editor"
@@ -2280,13 +2186,11 @@
#: src/include/autoinstall/script_dialogs.rb:474
msgid ""
"<p>\n"
-"By adding scripts to the autoinstallation process, customize the "
-"installation for\n"
+"By adding scripts to the autoinstallation process, customize the installation for\n"
"your needs and take control in different stages of the installation.</p>\n"
msgstr ""
"<p>\n"
-"通过将脚本添加到自动安装过程,您可根据您的需要自定义安装并在安装的不同阶段实"
-"施控制。</p>\n"
+"通过将脚本添加到自动安装过程,您可根据您的需要自定义安装并在安装的不同阶段实施控制。</p>\n"
#: src/include/autoinstall/script_dialogs.rb:480
msgid "User Script Management"
@@ -2312,14 +2216,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:909 src/modules/Profile.rb:744
-msgid ""
-"The XML parser reported an error while parsing the autoyast profile. The "
-"error message is:\n"
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
+msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "XML 解析器在解析 autoyast 方案时报告了一个错误。错误消息为:\n"
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
msgid ""
"\n"
"User-defined classes could not be retrieved. Make sure all classes \n"
@@ -2328,51 +2230,50 @@
"file without using classes.\n"
msgstr ""
"\n"
-"无法撷取用户定义的类。请确认全部类均定义正确并可通过网络或本地在此系统上使"
-"用。\n"
+"无法撷取用户定义的类。请确认全部类均定义正确并可通过网络或本地在此系统上使用。\n"
"无法使用不带类的原始控制文件安装系统。\n"
#. 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:279
msgid "Choose Profile"
msgstr "选择方案"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:329
+#: src/modules/AutoinstConfig.rb:335
msgid "Retrieving control file from floppy."
msgstr "正在软盘中撷取控制文件。"
-#: src/modules/AutoinstConfig.rb:332
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "正在从 TFTP 服务器中撷取控制文件(%1):%2。"
-#: src/modules/AutoinstConfig.rb:338
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "正在从 NFS 服务器中撷取控制文件(%1):%2。"
-#: src/modules/AutoinstConfig.rb:344
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "正在从 HTTP 服务器中撷取控制文件(%1):%2。"
-#: src/modules/AutoinstConfig.rb:350
+#: src/modules/AutoinstConfig.rb:356
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "正在从 FTP 服务器中撷取控制文件(%1):%2。"
-#: src/modules/AutoinstConfig.rb:356
+#: src/modules/AutoinstConfig.rb:362
msgid "Copying control file from file: %1."
msgstr "正在从文件中复制控制文件:%1。"
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:367
msgid "Copying control file from device: /dev/%1."
msgstr "正在从设备中复制控制文件:/dev/%1。"
-#: src/modules/AutoinstConfig.rb:365
+#: src/modules/AutoinstConfig.rb:371
msgid "Copying control file from default location."
msgstr "正在从默认位置复制控制文件。"
-#: src/modules/AutoinstConfig.rb:367
+#: src/modules/AutoinstConfig.rb:373
msgid "Source unknown."
msgstr "未知来源。"
@@ -2382,7 +2283,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:447
+#: src/modules/AutoinstConfig.rb:453
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2391,12 +2292,10 @@
"<h3>AutoYaST 配置管理系统</h3>\n"
"<p>使用配置管理系统几乎可以配置控制文件的全部资源。</p>\n"
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:458
msgid ""
-"<p>Most of the modules used to create the configuration are identical to "
-"those available\n"
-"through the YaST Control Center. Instead of configuring this system, the "
-"data\n"
+"<p>Most of the modules used to create the configuration are identical to those available\n"
+"through the YaST Control Center. Instead of configuring this system, the data\n"
"entered is collected and exported to the control file that can be used to\n"
"install another system using AutoYaST.\n"
"</p>\n"
@@ -2406,15 +2305,12 @@
"而该文件可通过 AutoYaST 用于安装另一个系统。\n"
"</p>\n"
-#: src/modules/AutoinstConfig.rb:459
+#: src/modules/AutoinstConfig.rb:465
msgid ""
"<p>In addition to the existing and familiar modules,\n"
-"new interfaces were created for special and complex configurations, "
-"including\n"
+"new interfaces were created for special and complex configurations, including\n"
"partitioning, general options, and software.</p>\n"
-msgstr ""
-"<p>除已有模块和大家都熟悉的模块外,我们还为特殊和复杂的配置创建了新的接口,这"
-"些接口包括分区、常规选项和软件。</p>\n"
+msgstr "<p>除已有模块和大家都熟悉的模块外,我们还为特殊和复杂的配置创建了新的接口,这些接口包括分区、常规选项和软件。</p>\n"
#. Construct node name for display in tree.
#.
@@ -2440,79 +2336,97 @@
#. string language_name = "";
#. string keyboard_name = "";
-#: src/modules/AutoinstGeneral.rb:85
+#: src/modules/AutoinstGeneral.rb:90
msgid "Confirm installation?"
msgstr "确认安装吗?"
-#: 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 "是"
-#: 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 "否"
-#: src/modules/AutoinstGeneral.rb:91
+#: src/modules/AutoinstGeneral.rb:96
msgid "Second Stage of AutoYaST"
msgstr "AutoYaST 第二阶段"
-#: src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:104
msgid "Halting the machine after stage one"
msgstr "第一阶段后挂起计算机"
-#: src/modules/AutoinstGeneral.rb:108
+#: src/modules/AutoinstGeneral.rb:113
msgid "Halting the machine after stage two"
msgstr "第二阶段后挂起计算机"
-#: src/modules/AutoinstGeneral.rb:115
+#: src/modules/AutoinstGeneral.rb:120
msgid "Reboot the machine after stage two"
msgstr "第二阶段后重启计算机"
-#: src/modules/AutoinstGeneral.rb:125
+#: src/modules/AutoinstGeneral.rb:130
msgid "Accepting unsigned files"
msgstr "接受未签名文件"
-#: src/modules/AutoinstGeneral.rb:126
+#: src/modules/AutoinstGeneral.rb:131
msgid "Not accepting unsigned files"
msgstr "不接受未签名文件"
-#: src/modules/AutoinstGeneral.rb:135
+#: src/modules/AutoinstGeneral.rb:140
msgid "Accepting files without a checksum"
msgstr "接受没有校验和的文件"
-#: src/modules/AutoinstGeneral.rb:136
+#: src/modules/AutoinstGeneral.rb:141
msgid "Not accepting files without a checksum"
msgstr "不接受没有校验和的文件"
-#: src/modules/AutoinstGeneral.rb:145
+#: src/modules/AutoinstGeneral.rb:150
msgid "Accepting failed verifications"
msgstr "接受失败的验证"
-#: src/modules/AutoinstGeneral.rb:146
+#: src/modules/AutoinstGeneral.rb:151
msgid "Not accepting failed verifications"
msgstr "不接受失败的验证"
-#: src/modules/AutoinstGeneral.rb:151
+#: src/modules/AutoinstGeneral.rb:156
msgid "Accepting unknown GPG keys"
msgstr "接受未知 GPG 密钥"
-#: src/modules/AutoinstGeneral.rb:152
+#: src/modules/AutoinstGeneral.rb:157
msgid "Not accepting unknown GPG Keys"
msgstr "不接受未知 GPG 密钥"
-#: src/modules/AutoinstGeneral.rb:157
+#: src/modules/AutoinstGeneral.rb:162
msgid "Importing new GPG keys"
msgstr "导入新 GPG 密钥"
-#: src/modules/AutoinstGeneral.rb:158
+#: src/modules/AutoinstGeneral.rb:163
msgid "Not importing new GPG Keys"
msgstr "不导入新 GPG 密钥"
+#. NTP syncing
+#: src/modules/AutoinstGeneral.rb:419
+msgid "Syncing time..."
+msgstr "正在同步时间..."
+
+#. TRANSLATORS: %s is the name of the ntp server
+#: src/modules/AutoinstGeneral.rb:421
+msgid "Syncing time with %s."
+msgstr "正与 %s 同步时间。"
+
+#: src/modules/AutoinstGeneral.rb:425
+msgid "Time syncing failed."
+msgstr "时间同步失败。"
+
+#: src/modules/AutoinstGeneral.rb:429
+msgid "Cannot update system time."
+msgstr "无法更新系统时间。"
+
#. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:111
+#: src/modules/AutoinstLVM.rb:113
msgid "Cannot reuse volume group %1. The volume group does not exist."
msgstr "无法复用卷组 %1。该卷组不存在。"
@@ -2528,71 +2442,71 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
msgid "Drives"
msgstr "驱动器"
#. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
msgid "%s drive in total"
msgid_plural "%s drives in total"
msgstr[0] "共 %s 个驱动器"
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
msgid "Not yet cloned."
msgstr "尚未克隆。"
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
msgid "Preinstallation Scripts"
msgstr "安装前脚本"
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
msgid "Postinstallation Scripts"
msgstr "安装后脚本"
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
msgid "Chroot Scripts"
msgstr "Chroot 脚本"
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
msgid "Init Scripts"
msgstr "启动脚本"
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
msgid "Postpartitioning Scripts"
msgstr "分区后脚本"
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
msgid "Pre"
msgstr "安装前"
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
msgid "Post"
msgstr "安装后"
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
msgid "Init"
msgstr "启动"
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
msgid "Chroot"
msgstr "Chroot"
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
msgid "Postpartitioning"
msgstr "分区后"
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
msgid "Unknown"
msgstr "未知"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:171
+#: src/modules/AutoinstSoftware.rb:174
msgid ""
"These packages could not be found in the software repositories:\n"
"%1"
@@ -2602,53 +2516,48 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
msgid "Adding repo %1 failed"
msgstr "添加软件源 %1 失败"
#. Install
-#: src/modules/AutoinstSoftware.rb:373
-msgid ""
-"Image creation failed while pattern installation. Please check /tmp/ay_image."
-"log"
+#: src/modules/AutoinstSoftware.rb:377
+msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr "映像创建失败于软件集安装环节。请检查 /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:381
+#: src/modules/AutoinstSoftware.rb:385
msgid "Creating Image - installing packages"
msgstr "正在创建映像 - 安装软件包"
-#: src/modules/AutoinstSoftware.rb:391
-msgid ""
-"Image creation failed while package installation. Please check /tmp/ay_image."
-"log"
+#: src/modules/AutoinstSoftware.rb:395
+msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
msgstr "映像创建失败于软件包安装环节。请检查 /tmp/ay_image.log"
#. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:402
+#: src/modules/AutoinstSoftware.rb:406
msgid "Store image to ..."
msgstr "存储映像到..."
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:431
+#: src/modules/AutoinstSoftware.rb:435
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."
+"If you press the ok-button, the image will be compressed and can't be changed anymore."
msgstr ""
"您现在可以在 %1/ 修改映像。\n"
"您若按下确认按钮,%1/ 将被压缩成映像,便再也不能修改了。"
-#: src/modules/AutoinstSoftware.rb:445
+#: src/modules/AutoinstSoftware.rb:449
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr "映像压缩失败于 '%1'。请检查 /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:452
+#: src/modules/AutoinstSoftware.rb:456
msgid "Image created successfully"
msgstr "已成功创建映像"
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:488
+#: src/modules/AutoinstSoftware.rb:492
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."
@@ -2657,33 +2566,32 @@
"若缺失了它,您可以通过 'ls -F > directory.yast' 命令创建该文件。"
#. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:522
+#: src/modules/AutoinstSoftware.rb:526
msgid "can not read '%1'. Try again?"
msgstr "无法读取 '%1'。重试吗?"
#. copy a file
-#: src/modules/AutoinstSoftware.rb:540
+#: src/modules/AutoinstSoftware.rb:544
msgid "can not read '%1'. ISO creation failed"
msgstr "无法读取 '%1'。创建 ISO 失败"
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:570
+#: src/modules/AutoinstSoftware.rb:574
msgid "Preparing ISO Filestructure ..."
msgstr "正在准备 ISO 文件结构..."
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:619
+#: src/modules/AutoinstSoftware.rb:623
msgid "boot config for the DVD"
msgstr "DVD 引导配置"
-#: src/modules/AutoinstSoftware.rb:623
+#: src/modules/AutoinstSoftware.rb:627
msgid "Ok"
msgstr "好呢"
-#: src/modules/AutoinstSoftware.rb:626
+#: src/modules/AutoinstSoftware.rb:630
msgid ""
-"You can do changes to the ISO now in %1, like adding a complete different "
-"AutoYaST XML file.\n"
+"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."
msgstr ""
"您现在可以在 %1 修改 ISO,比如添加一个完全不同的 AutoYaST XML 文件。\n"
@@ -2691,53 +2599,49 @@
#. 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:645
+#: src/modules/AutoinstSoftware.rb:649
msgid "Store ISO image to ..."
msgstr "存储 ISO 映像到..."
-#: src/modules/AutoinstSoftware.rb:646
+#: src/modules/AutoinstSoftware.rb:650
msgid "Creating ISO File ..."
msgstr "正在创建 ISO 文件..."
-#: src/modules/AutoinstSoftware.rb:667
+#: src/modules/AutoinstSoftware.rb:671
msgid "ISO successfully created at %1"
msgstr "ISO 成功创建于 %1"
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:743
+#: src/modules/AutoinstSoftware.rb:753
msgid "Selected Patterns"
msgstr "所选软件集"
-#: src/modules/AutoinstSoftware.rb:753
+#: src/modules/AutoinstSoftware.rb:763
msgid "Individually Selected Packages"
msgstr "单选的软件包"
-#: src/modules/AutoinstSoftware.rb:759
+#: src/modules/AutoinstSoftware.rb:769
msgid "Packages to Remove"
msgstr "待移除软件包"
-#: src/modules/AutoinstSoftware.rb:766
+#: src/modules/AutoinstSoftware.rb:776
msgid "Force Kernel Package"
msgstr "强制内核软件包"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:856
+#: src/modules/AutoinstSoftware.rb:871
msgid "Could not set patterns: %1."
msgstr "无法设置软件集:%1。"
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:917
-msgid ""
-"The package resolver run failed. Please check your software section in the "
-"autoyast profile."
+#: src/modules/AutoinstSoftware.rb:932
+msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr "软件包依赖关系解决器运行失败。请检查 autoyast 方案中的软件部分。"
#. 1 cyl buffer per partition
#: src/modules/AutoinstStorage.rb:494
-msgid ""
-"The partition plan configured in your XML profile does not fit on the hard "
-"disk. %1MB missing"
+msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"
msgstr "在您的 XML 方案中配置的分区计划并不适合该硬盘。缺少 %1MB"
#: src/modules/AutoinstStorage.rb:917
@@ -2774,14 +2678,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:357
+#: src/modules/Profile.rb:363
msgid "Collecting configuration data..."
msgstr "正在嵬集配置数据..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:460
+#: src/modules/Profile.rb:466
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr "加密的 AutoYaST 方案。请输入两次密码。"
@@ -2789,14 +2693,14 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:534
+#: src/modules/Profile.rb:540
msgid "Could not write section %1 to file %2."
msgstr "无法将部分 %1 写入到文件 %2。"
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr "加密的 AutoYaST 方案。请输入正确的密码。"
@@ -2814,24 +2718,39 @@
msgid "&OK"
msgstr "好呢(&O)"
-#~ msgid "Configure users and groups"
-#~ msgstr "配置用户和组"
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "无法通过 HTTP(S) 协议找到 URL '%1'。服务器返回了代码 %2。"
-#~ msgid "Importing users and groups configuration..."
-#~ msgstr "正在导入用户和组配置..."
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "无法通过 FTP 协议找到 URL '%1'。服务器返回了代码 %2。"
-#~ msgid "Syncing time..."
-#~ msgstr "正在同步时间..."
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "读取 %1/%2 上的文件失败。\n"
-#~ msgid "Syncing time with %s."
-#~ msgstr "正与 %s 同步时间。"
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "读取 %1 上的文件失败。\n"
-#~ msgid "Time syncing failed."
-#~ msgstr "时间同步失败。"
+#~ msgid "Mounting %1 failed."
+#~ msgstr "挂载 %1 失败。"
-#~ msgid "Cannot update system time."
-#~ msgstr "无法更新系统时间。"
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "读取 CD 上的文件失败。路径:%1/%2."
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "无法撷取远程文件 %1"
+
+#~ msgid "%1 is not mounted and mount failed"
+#~ msgstr "%1 未挂载,尝试挂载但失败了"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "未找到文件 %1"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "无法通过 TFTP 协议找到 URL '%1'。"
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "未知协议 %1。"
+
#~ msgid "Configure runlevel"
#~ msgstr "配置运行级别"
@@ -2853,25 +2772,18 @@
#~ msgid ""
#~ "\n"
#~ "<P>Enter the partition information according to your\n"
-#~ "needs. To reuse an existing partition, enter the partition number of the "
-#~ "existing partition to reuse (counting starts with partition number 1) and "
-#~ "no size.</P>\n"
+#~ "needs. To reuse an existing partition, enter the partition number of the existing partition to reuse (counting starts with partition number 1) and no size.</P>\n"
#~ "<p>\n"
-#~ "For partitions that are part of a volume group (not the logical "
-#~ "partitions inside a volume group), set the partition ID to 0x8e then "
-#~ "choose the volume group. The volume group must already be set up with "
-#~ "AutoYaST.\n"
+#~ "For partitions that are part of a volume group (not the logical partitions inside a volume group), set the partition ID to 0x8e then choose the volume group. The volume group must already be set up with AutoYaST.\n"
#~ "</p>\n"
#~ "<P>For more information, refer to the online documentation.\n"
#~ "</P>\n"
#~ msgstr ""
#~ "\n"
#~ "<P>根据需要输入分区信息。\n"
-#~ " 要重新使用现有分区,请输入要重新使用的现有分区的分区号(从分区号 1 开始计"
-#~ "数),但不输入大小。</P>\n"
+#~ " 要重新使用现有分区,请输入要重新使用的现有分区的分区号(从分区号 1 开始计数),但不输入大小。</P>\n"
#~ " <p>\n"
-#~ " 对于卷组中包含的分区(不是卷组中的逻辑分区),需要将分区 ID 设置为 0x8e,然"
-#~ "后选择卷组。卷组必须已用 AutoYaST 设置。\n"
+#~ " 对于卷组中包含的分区(不是卷组中的逻辑分区),需要将分区 ID 设置为 0x8e,然后选择卷组。卷组必须已用 AutoYaST 设置。\n"
#~ " </p>\n"
#~ " <P>有关更多信息,请参阅联机文档。\n"
#~ " </P>\n"
@@ -2930,15 +2842,12 @@
#~ msgid ""
#~ "\n"
#~ "<P>\n"
-#~ "Create and edit your volume groups here. After that, assign physical "
-#~ "partitions to this volume group in the partition dialog of a physical "
-#~ "hard disk. Set the partition ID to 0x8e for those partitions.\n"
+#~ "Create and edit your volume groups here. After that, assign physical partitions to this volume group in the partition dialog of a physical hard disk. Set the partition ID to 0x8e for those partitions.\n"
#~ "</P>\n"
#~ msgstr ""
#~ "\n"
#~ "<P>\n"
-#~ " 在此处创建和编辑卷组。此后,需要在物理硬盘的分区对话框中向此卷组指定物理"
-#~ "分区。将那些分区的分区 ID 设置为 0x8e。\n"
+#~ " 在此处创建和编辑卷组。此后,需要在物理硬盘的分区对话框中向此卷组指定物理分区。将那些分区的分区 ID 设置为 0x8e。\n"
#~ " </P>\n"
#~ msgid "&Volume Group"
@@ -2973,9 +2882,6 @@
#~ "有关更多信息,请参考文档。\n"
#~ "</P>\n"
-#~ msgid "Configure Drives"
-#~ msgstr "配置驱动器"
-
#~ msgid "&Drive"
#~ msgstr "驱动器(&D)"
Modified: trunk/yast/zh_CN/po/base.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/base.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/base.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: Base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2016-06-05 16:52+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -86,79 +86,79 @@
msgstr "此 YaST2 模块不支持命令行界面。"
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
msgid "Use 'help' for a complete list of available commands."
msgstr "请使用 'help' 来查看可用命令的完整列表。"
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
msgid "Use 'yast2 %1 help' for a complete list of available commands."
msgstr "请使用 'yast2 %1 help' 来查看可用命令的完整列表。"
#. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
msgid "Unknown Command: %1"
msgstr "未知命令:%1"
#. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
msgid "Option '%1' is missing value."
msgstr "选项 '%1' 缺少值。"
#. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
msgid "Unknown option for command '%1': %2"
msgstr "命令 '%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:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
msgid "Invalid value for option '%1': %2"
msgstr "选项 '%1' 的值无效:%2"
#. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
msgid "Invalid value for option '%1' -- expected '%2', received %3"
msgstr "选项 '%1' 的值无效 -- 预期为 '%2',收到了 %3"
#. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
msgid "Option '%1' cannot have a value. Given value: %2"
msgstr "选项 '%1' 无法赋值。给定值:%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:541
+#: library/commandline/src/modules/CommandLine.rb:533
msgid "Use '%1 %2 help' for a complete list of available options."
msgstr "请使用 '%1 %2 help' 来查看可用选项的完整列表。"
#. 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:551
+#: library/commandline/src/modules/CommandLine.rb:543
msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
msgstr "请使用 'yast2 %1 %2 help' 来查看可用选项的完整列表。"
#. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
msgid "YaST Configuration Module %1\n"
msgstr "YaST 配置模块 %1\n"
#. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
msgid "No help available"
msgstr "无帮助可用"
#. Process <command> "help"
#. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
msgid "Command '%1'"
msgstr "命令 '%1'"
#. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
msgid ""
"\n"
" Options:"
@@ -167,7 +167,7 @@
" 选项:"
#. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
msgid ""
"\n"
" Options of the [string] type must be written in the form 'option=value'."
@@ -176,7 +176,7 @@
" [string] 类型的选项必须以 '选项=值' 的格式书写。"
#. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
msgid ""
"\n"
" Example:"
@@ -185,141 +185,137 @@
" 示例:"
#. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
msgid "This is a YaST module."
msgstr "这是一个 YaST 模块。"
#. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
msgid "Basic Syntax:"
msgstr "基本语法:"
#. translators: module command line help, %1 is the module name
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
msgid " yast2 %1 <command> [verbose] [options]"
msgstr " yast2 %1 <命令> [详细命令] [选项]"
#. translators: module command line help, %1 is the module name
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
msgid " yast2 %1 <command> help"
msgstr " yast2 %1 <命令> help"
#. translators: module command line help
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
msgid " <command> [options]"
msgstr " <命令> [选项]"
#. translators: module command line help
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
msgid " <command> help"
msgstr " <命令> help"
#. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
msgid "Commands:"
msgstr "命令:"
#. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
msgid "No help available."
msgstr "无帮助可用。"
#. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
msgid "<Error: invalid help>"
msgstr "<错误:无效帮助>"
#. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
msgid "Run 'yast2 %1 <command> help' for a list of available options."
msgstr "请运行 'yast2 %1 <命令> help' 来查看可用选项的列表。"
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
-msgid ""
-"Target file name ('xmlfile' option) is missing. Use "
-"xmlfile=<target_XML_file> command line option."
+#: library/commandline/src/modules/CommandLine.rb:930
+msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option."
msgstr "缺少目标文件名 ('xmlfile' 选项)。请使用 xmlfile=<目标_XML_文件> 命令行选项。"
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
-msgid ""
-"Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> "
-"command line option."
+#: library/commandline/src/modules/CommandLine.rb:942
+msgid "Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> command line option."
msgstr "目标文件名 ('xmlfile' 选项) 为空。请使用 xmlfile=<目标_XML_文件> 命令行选项。"
#. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
msgid "unknown"
msgstr "未知"
#. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
msgid "or '%1'"
msgstr "或 '%1'"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
msgid "Specify the command '%1'."
msgstr "请指定命令 '%1'。"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
msgid "Specify one of the commands: %1."
msgstr "请仅指定以下命令之一:%1。"
#. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
msgid "Specify only one of the commands: %1."
msgstr "请仅指定以下命令之一:%1。"
#. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
msgid "There is no user interface available for this module."
msgstr "此模块没有可用的用户界面。"
#. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
msgid "Ready"
msgstr "就绪"
#. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
msgid "Initializing"
msgstr "正在初始化"
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
msgid "Finishing"
msgstr "正在完成"
#. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
msgid "Done"
msgstr "完毕"
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
msgid "Quitting (without changes)"
msgstr "退出(不修改)"
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
msgid "yes or no?"
msgstr "是或否?"
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
msgid "yes"
msgstr "是"
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
msgid "no"
msgstr "否"
@@ -400,7 +396,7 @@
#. 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:167
-#: library/control/src/modules/ProductControl.rb:1450
+#: library/control/src/modules/ProductControl.rb:1435
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr "http://en.opensuse.org/Bugs/YaST"
@@ -413,7 +409,7 @@
#. from YaST logs.
#.
#. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
msgid "Installation Error"
msgstr "安装出错"
@@ -436,7 +432,7 @@
msgstr "正在从内存中移除软件包 '%s'"
#. error report
-#: library/control/src/modules/ProductControl.rb:1259
+#: library/control/src/modules/ProductControl.rb:1244
msgid "No workflow defined for this installation mode."
msgstr "没有为此安装方式定义工作流程。"
@@ -495,7 +491,7 @@
#. make sure that every workflow is merged only once
#. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
msgid "An internal error occurred when integrating additional workflow."
msgstr "整合附加工作流程时发生内部错误。"
@@ -547,7 +543,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:255
#: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
msgid "During Boot"
msgstr "引导期间"
@@ -556,7 +552,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:257
#: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
msgid "Manually"
msgstr "手动"
@@ -566,22 +562,22 @@
msgstr "通过 xinetd"
#. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
msgid "Via &xinetd"
msgstr "通过 &xinetd"
#. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
msgid "Service Start"
msgstr "启动服务"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
msgid "Service is running"
msgstr "服务正在运行"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
msgid "Service is not running"
msgstr "服务未运行"
@@ -590,7 +586,7 @@
#. %1 is eg. "Start the Service Now"
#. %2 is eg. "Stop the Service Now"
#. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
msgid ""
"<p><b><big>Switch On or Off</big></b><br>\n"
"To start or stop the service immediately, use \n"
@@ -603,55 +599,55 @@
#. %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:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
msgid ""
"<p>To save all changes and restart the\n"
"service immediately, use <b>%3</b>.</p>\n"
msgstr "<p>要立即保存全部修改并重启服务,请使用 <b>%3</b>。</p>\n"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
msgid "Start the Service Now"
msgstr "立即启动服务"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
msgid "Stop the Service Now"
msgstr "立即停止服务"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
msgid "Save Changes and Restart Service Now"
msgstr "立即保存修改并重启服务"
#. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
msgid "&Start the Service Now"
msgstr "立即启动服务(&S)"
#. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
msgid "S&top the Service Now"
msgstr "立即停止服务(&T)"
#. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
msgid "S&ave Changes and Restart Service Now"
msgstr "立即保存修改并重启服务(&A)"
#. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
msgid "Switch On and Off"
msgstr "打开和关闭"
#. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
msgid "Current Status: "
msgstr "当前状态:"
#. help text for LDAP enablement widget
#. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
msgid ""
"<p><b><big>LDAP Support</big></b><br>\n"
"To store the settings in LDAP instead of native configuration files,\n"
@@ -661,12 +657,12 @@
"要将设置存放在 LDAP 而非原生配置文件中,请设定 <b>%1</b>。</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
msgid "LDAP Support Active"
msgstr "LDAP 支持处于活动状态"
#. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
msgid "&LDAP Support Active"
msgstr "&LDAP 支持处于活动状态"
@@ -678,7 +674,7 @@
#. push button
#. push button
#. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
#: library/cwm/src/modules/TablePopup.rb:940
#: library/general/src/modules/Label.rb:166
msgid "&Up"
@@ -686,7 +682,7 @@
#. push button
#. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
#: library/cwm/src/modules/TablePopup.rb:942
msgid "&Down"
msgstr "向下(&D)"
@@ -728,12 +724,12 @@
msgstr "指定文件已存在。覆盖它吗?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
msgid "The TSIG key ID was not specified."
msgstr "未指定事务数字签名 (TSIG) 密钥 ID。"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
msgid ""
"The key with the specified ID exists and is used.\n"
"Remove it?"
@@ -742,7 +738,7 @@
"移除它吗?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
msgid ""
"A key with the specified ID was found\n"
"on your disk. Remove it?"
@@ -751,27 +747,27 @@
"移除它吗?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
msgid "The key will be created now. Continue?"
msgstr "现在将创建密钥。继续吗?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
msgid "Creating the TSIG key failed."
msgstr "创建事务数字签名 (TSIG) 密钥失败。"
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
msgid "The specified file does not exist."
msgstr "指定文件不存在。"
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
msgid "The specified file does not contain any TSIG key."
msgstr "指定文件不包含任何事务数字签名 (TSIG) 密钥。"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
msgid ""
"The specified file contains a TSIG key with the same\n"
"identifier as some of already present keys.\n"
@@ -782,7 +778,7 @@
"旧密钥将被移除。继续吗?"
#. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
msgid ""
"<p><big><b>TSIG Key Management</b></big><br>\n"
"Use this dialog to manage the TSIG keys.</p>\n"
@@ -791,19 +787,18 @@
"使用此对话框管理事务数字签名密钥。</p>\n"
#. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
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"
"containing the key and click <b>Add</b>.</p>\n"
msgstr ""
"<p><big><b>添加已有的事务数字签名 (TSIG) 密钥</b></big><br>\n"
-"要添加一个已创建的事务数字签名 (TSIG) 密钥,请选择存有该密钥的文件的<b>文件名"
-"</b>,\n"
+"要添加一个已创建的事务数字签名 (TSIG) 密钥,请选择存有该密钥的文件的<b>文件名</b>,\n"
"并点击<b>添加</b>。</p>\n"
#. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
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"
@@ -811,12 +806,11 @@
"<b>Generate</b>.</p>\n"
msgstr ""
"<p><big><b>创建新的事务数字签名 (TSIG) 密钥</b></big><br>\n"
-"要创建一个新的事务数字签名密钥,请设定将在其中创建密钥的文件的<b>文件名</"
-"b>,\n"
+"要创建一个新的事务数字签名密钥,请设定将在其中创建密钥的文件的<b>文件名</b>,\n"
"以及用以识别密钥的<b>密钥 ID</b>,然后点击<b>生成</b>。</p>\n"
#. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
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"
@@ -832,27 +826,27 @@
"服务器必须先在配置中停止使用该密钥。</p>\n"
#. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
msgid "Add an Existing TSIG Key"
msgstr "添加已有的事务数字签名 (TSIG) 密钥"
#. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
msgid "Create a New TSIG Key"
msgstr "创建新的事务数字签名 (TSIG) 密钥"
#. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
msgid "&Key ID"
msgstr "密钥 ID(&K)"
#. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
msgid "&Generate"
msgstr "生成(&G)"
#. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
msgid "Current TSIG Keys"
msgstr "当前事务数字签名 (TSIG) 密钥"
@@ -860,7 +854,7 @@
#. table header - GPG key ID
#. table header - GPG key ID
#. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
#: library/gpg/src/modules/GPGWidgets.rb:192
#: library/gpg/src/modules/GPGWidgets.rb:224
#: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -868,22 +862,22 @@
msgstr "密钥 ID"
#. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
msgid "Filename"
msgstr "文件名"
#. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
msgid "&Selected Option"
msgstr "已选选项(&S)"
#. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
msgid "Current Option: "
msgstr "当前选项:"
#. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
msgid "The selected option is already present."
msgstr "所选选项已存在。"
@@ -921,9 +915,7 @@
msgid ""
"<p>To add a new option, click <b>Add</b>. To remove\n"
"an option, select it and click <b>Delete</b>.</p>"
-msgstr ""
-"<p>要添加新选项,请点击<b>添加</b>。要移除某选项,请选择该选项并点击<b>删除</"
-"b>。</p>"
+msgstr "<p>要添加新选项,请点击<b>添加</b>。要移除某选项,请选择该选项并点击<b>删除</b>。</p>"
#. help 3/4, optional
#: library/cwm/src/modules/TablePopup.rb:918
@@ -938,24 +930,22 @@
"<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"
"in the list.</p>"
-msgstr ""
-"<p>要重新排序选项,请选择一个选项并使用<b>向上</b>或<b>向下</b>来将其在列表中"
-"上下移动。</p>"
+msgstr "<p>要重新排序选项,请选择一个选项并使用<b>向上</b>或<b>向下</b>来将其在列表中上下移动。</p>"
#. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
msgid "&Other"
msgstr "其它(&O)"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
msgid "The device is not configured"
msgstr "设备未配置"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
msgid "Press <B>Edit</B> to configure"
msgstr "请按<B>编辑</B>进行配置"
@@ -1004,15 +994,8 @@
#. NCurses Control Center help 2/10
#: 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 ""
-"<p>树形导航也可以使用箭头键完成。要打开或关闭一个分支请使用 [空格]。对于在左"
-"侧显示树形配置项 (可能看起来像一个列表) 的模块可使用 [回车] 来在右侧获得相应"
-"的对话框。</p>"
+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 "<p>树形导航也可以使用箭头键完成。要打开或关闭一个分支请使用 [空格]。对于在左侧显示树形配置项 (可能看起来像一个列表) 的模块可使用 [回车] 来在右侧获得相应的对话框。</p>"
#. NCurses Control Center help 3/10
#: library/desktop/src/clients/menu.rb:338
@@ -1028,9 +1011,7 @@
msgid ""
"<p>Press [ESC] to close selection pop-ups (e.g., from\n"
"menu buttons) without choosing anything.</p>\n"
-msgstr ""
-"<p>按 [ESC] 键可关闭选区弹窗 (例如,菜单按钮的弹窗) 而无需选择任何东西。</"
-"p>\n"
+msgstr "<p>按 [ESC] 键可关闭选区弹窗 (例如,菜单按钮的弹窗) 而无需选择任何东西。</p>\n"
#. NCurses Control Center help 5/10
#: library/desktop/src/clients/menu.rb:346
@@ -1043,8 +1024,7 @@
msgstr ""
"<p>2) <i>按键替代</i><br>\n"
"<p>因为环境可以影响键盘的使用,所以有多于一种方法来在对话页面间导航。\n"
-"若 [TAB] 和 [SHIFT] (或 [ALT])+ [TAB] 无效,可用 [CTRL] + [F] 使焦点前移,用 "
-"[CTRL] + [B] 使焦点后移。</p>"
+"若 [TAB] 和 [SHIFT] (或 [ALT])+ [TAB] 无效,可用 [CTRL] + [F] 使焦点前移,用 [CTRL] + [B] 使焦点后移。</p>"
#. NCurses Control Center help 6/10
#: library/desktop/src/clients/menu.rb:354
@@ -1061,8 +1041,7 @@
#: library/desktop/src/clients/menu.rb:360
msgid ""
"<p>3) <i>Function Keys</i><br>\n"
-"F keys provide a quick access to main functions. The function key bindings "
-"for the current dialog are shown in the bottom line.</p>"
+"F keys provide a quick access to main functions. The function key bindings for the current dialog are shown in the bottom line.</p>"
msgstr ""
"<p>3) <i>功能键</i><br>\n"
"功能键提供了对主要功能的快速访问。\n"
@@ -1132,62 +1111,54 @@
msgid "Service Status"
msgstr "服务状态"
-#. rubocop:enable Style/TrivialAccessors
#. Content for the help
-#: library/general/src/lib/ui/service_status.rb:133
+#: library/general/src/lib/ui/service_status.rb:129
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"
+"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_label}</big></b><br>\n"
-"Only applicable if the service is currently running. Ensures the running "
-"service reloads the new configuration after saving it (either finishing the "
-"dialog or pressing the apply button).</p>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</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"
+"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 ""
"<p><b><big>当前状态</big></b><br>\n"
"显示服务当前状态。保存设置后状态仍不变,独立于 '引导期间启动服务' 的值。</p>\n"
"<p><b><big>%{reload_label}</big></b><br>\n"
-"仅在服务当前正在运行时应用。会确保运行中的服务在保存设置后重新加载新的配置 "
-"(通过 '好' 或 '保存' 按钮)。</p>\n"
+"仅在服务当前正在运行时应用。会确保运行中的服务在保存设置后重新加载新的配置 (通过 '好' 或 '保存' 按钮)。</p>\n"
"<p><b><big>系统引导期间启动</big></b><br>\n"
"勾选此框在系统引导时启用服务。反选禁用服务。这不会影响运行中系统上服务的当前状态。</p>\n"
#. Widget displaying the status and associated buttons
-#: library/general/src/lib/ui/service_status.rb:159
+#: library/general/src/lib/ui/service_status.rb:155
msgid "Current status:"
msgstr "当前状态:"
#. Widget to configure the status on boot
-#: library/general/src/lib/ui/service_status.rb:172
+#: library/general/src/lib/ui/service_status.rb:168
msgid "Start During System Boot"
msgstr "系统引导期间启动"
#. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:196
+#: library/general/src/lib/ui/service_status.rb:192
msgid "running"
msgstr "正在运行"
-#: library/general/src/lib/ui/service_status.rb:198
+#: library/general/src/lib/ui/service_status.rb:194
msgid "Stop now"
msgstr "立即停止"
#. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:203
+#: library/general/src/lib/ui/service_status.rb:199
msgid "stopped"
msgstr "已停止"
-#: library/general/src/lib/ui/service_status.rb:205
+#: library/general/src/lib/ui/service_status.rb:201
msgid "Start now"
msgstr "立即启动"
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
msgid ""
"Although the path %1 exists, it is not a directory.\n"
"Continue or cancel the operation?\n"
@@ -1197,7 +1168,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:306
+#: library/general/src/modules/FileUtils.rb:300
msgid ""
"The path %1 does not exist.\n"
"Create it now?\n"
@@ -1207,7 +1178,7 @@
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
msgid ""
"Failed to create the directory %1.\n"
"Continue or cancel the current operation?\n"
@@ -1408,7 +1379,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2231
+#: library/packages/src/modules/PackageCallbacks.rb:2221
msgid "&Password"
msgstr "密码(&P)"
@@ -1719,7 +1690,7 @@
#: 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/network/src/modules/NetworkPopup.rb:90
#: library/types/src/modules/String.rb:101
msgid "Yes"
msgstr "是"
@@ -1730,7 +1701,7 @@
#: 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/network/src/modules/NetworkPopup.rb:89
#: library/types/src/modules/String.rb:101
msgid "No"
msgstr "否"
@@ -1794,19 +1765,19 @@
msgstr "日志错误:%1"
#. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
msgid "Warning:"
msgstr "警告:"
#. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
msgid "Error:"
msgstr "错误:"
#. translators: message summary header
#. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
msgid "Message:"
msgstr "消息:"
@@ -1859,7 +1830,7 @@
msgstr "删除(&L)"
#. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
msgid "&Variable"
msgstr "变量(&V)"
@@ -1925,8 +1896,7 @@
#: 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"
+"<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more information.\n"
"Press Ctrl+C to cancel.\n"
"</p>"
msgstr ""
@@ -1956,7 +1926,7 @@
msgstr "输入密码"
#. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
msgid "Enter Passphrase to Unlock GPG Key %1: "
msgstr "输入密码以解锁 GPG 密钥 %1:"
@@ -2059,6 +2029,233 @@
msgid "Error occurred while reading the log."
msgstr "读取日志时出错。"
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "未知区域"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"接口 '%1' 未指派到任何防火墙区域。\n"
+"请运行 YaST2 防火墙并指派它。\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "外部区域"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "内部区域"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "隔离区域"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+msgid "TCP"
+msgstr "TCP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+msgid "UDP"
+msgstr "UDP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+msgid "RPC"
+msgstr "RPC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+msgid "IP"
+msgstr "IP"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"接口 '%1' 包含在多个防火墙区域中。\n"
+"继续配置可能产生错误。\n"
+"\n"
+"建议保留配置并\n"
+"在 '/etc/sysconfig/SuSEFirewall' 文件中手动修复它。"
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "初始化防火墙配置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "检查网络设备"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "读取当前配置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "检查可能冲突的服务"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "正在检查网络设备..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "正在读取当前配置..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "正在检查可能冲突的服务..."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "写入防火墙配置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "写入防火墙设置"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "调整防火墙服务"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "正在写入防火墙设置..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "正在调整防火墙服务..."
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "写入设置失败"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+msgid "Unknown protocol (%1)"
+msgstr "未知协议 (%1)"
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" => [ ],
+#. "rpc_ports" => [ "portmap", "ypbind" ],
+#. "ip_protocols" => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr "名为 '%{service_name}' 的服务不存在"
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+msgid "Service: %{filename}"
+msgstr "服务:%{filename}"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "GPG 公共密钥"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "未知服务 '%1'"
+
#. label
#: library/network/src/modules/CWMFirewallInterfaces.rb:109
msgid "Firewall cannot be adjusted during first stage installation."
@@ -2100,13 +2297,13 @@
msgstr "未将接口指派到任何区域"
#. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
msgid "&Network Interfaces with Open Port in Firewall"
msgstr "有打开的防火墙端口的网络接口(&N)"
#. Check the INT zone, it's not protected by default
#. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
msgid ""
"These network interfaces assigned to internal network cannot be deselected:\n"
"%1\n"
@@ -2115,7 +2312,7 @@
"%1\n"
#. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -2127,7 +2324,7 @@
"继续吗?"
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces will additionally be open:\n"
@@ -2142,8 +2339,8 @@
#. yes-no popup
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces cannot be opened:\n"
@@ -2157,22 +2354,22 @@
"继续吗?"
#. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
msgid "Network &Interfaces with Open Port in Firewall"
msgstr "有打开的防火墙端口的网络接口(&I)"
#. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
msgid "Select &All"
msgstr "全选(&A)"
#. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
msgid "Select &None"
msgstr "全不选(&N)"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
msgid ""
"Error checking service status:\n"
"%{details}"
@@ -2181,7 +2378,7 @@
"%{details}"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
msgid ""
"Error setting service status:\n"
"%{details}"
@@ -2191,7 +2388,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:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
"To open the firewall to allow access to the service from remote computers,\n"
@@ -2203,60 +2400,62 @@
#. 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:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
msgid ""
"To select interfaces on which to open the port,\n"
"click <b>%2</b>.<br>"
msgstr "要选择将在其上打开端口的接口,请点击 <b>%2</b>。<br>"
#. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
msgstr "此选项只有启用了防火墙时才可用。</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
msgid "Open Port in Firewall"
msgstr "打开防火墙中的端口"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
msgid "Firewall Details"
msgstr "防火墙细节"
#. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
msgid "Open Port in &Firewall"
msgstr "打开防火墙中的端口(&F)"
#. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
msgid "Firewall &Details..."
msgstr "防火墙细节(&D)..."
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
msgstr "防火墙设置"
#. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
msgid "Firewall is open"
msgstr "防火墙已打开"
#. pppN must be tried before pN, modem before netcard
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
#: library/system/src/include/hwinfo/classnames.rb:108
#: library/system/src/include/hwinfo/classnames.rb:198
msgid "Modem"
msgstr "调制解调器"
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
msgid "Network Card"
msgstr "网卡"
@@ -2264,27 +2463,27 @@
#. Device type label
#. Device type label
#. Device type label
-#: 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:425
#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN"
msgstr "综合业务数字网 (ISDN)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL"
msgstr "数字用户线路 (DSL, 电话拨号)"
-#: 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
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
msgid "Unknown"
msgstr "未知"
@@ -2294,389 +2493,389 @@
#. are represented as its sub-interfaces.
#. And also we frequently confuse "device" and "interface"
#. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
msgid "Additional Address"
msgstr "附加地址"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet"
msgstr "ARCnet"
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet Network Card"
msgstr "ARCnet 网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
msgid "ATM"
msgstr "ATM"
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
msgid "Asynchronous Transfer Mode (ATM)"
msgstr "异步传输模式 (ATM)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
msgid "Bluetooth"
msgstr "蓝牙"
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
msgid "Bluetooth Connection"
msgstr "蓝牙连接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond"
msgstr "绑定"
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond Network"
msgstr "绑定网络"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
msgid "CLAW"
msgstr "CLAW"
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
msgid "Common Link Access for Workstation (CLAW)"
msgstr "工作站通用链接访问 (CLAW)"
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
msgid "ISDN Card"
msgstr "ISDN 综合业务数字网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
#: library/system/src/include/hwinfo/classnames.rb:223
msgid "CTC"
msgstr "CTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
msgid "Channel to Channel Interface (CTC)"
msgstr "通道到通道接口 (CTC)"
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL Connection"
msgstr "DSL 电话拨号连接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy"
msgstr "虚设"
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy Network Device"
msgstr "虚设网络设备"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
#: library/system/src/include/hwinfo/classnames.rb:227
msgid "ESCON"
msgstr "ESCON"
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
msgid "Enterprise System Connector (ESCON)"
msgstr "企业系统连接器 (ESCON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
#: library/system/src/include/hwinfo/classnames.rb:220
msgid "Ethernet"
msgstr "有线网"
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
msgid "Ethernet Network Card"
msgstr "有线网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
#: library/system/src/include/hwinfo/classnames.rb:222
msgid "FDDI"
msgstr "FDDI"
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
msgid "FDDI Network Card"
msgstr "光纤分布式数据接口 (FDDI) 网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
msgid "FICON"
msgstr "FICON"
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
msgid "Fiberchannel System Connector (FICON)"
msgstr "光纤通道系统连接器 (FICON)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
msgid "HIPPI"
msgstr "HIPPI"
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
msgid "HIgh Performance Parallel Interface (HIPPI)"
msgstr "高性能并行接口 (HIPPI)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
msgid "Hipersockets"
msgstr "Hipersockets"
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
msgid "Hipersockets Interface (HSI)"
msgstr "超高速套接字接口 (HSI)"
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN Connection"
msgstr "ISDN 综合业务数字网连接"
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "IrDA"
msgstr "IrDA"
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
msgid "Infrared Network Device"
msgstr "红外网络设备"
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "Infrared Device"
msgstr "红外设备"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
#: library/system/src/include/hwinfo/classnames.rb:224
msgid "IUCV"
msgstr "IUCV"
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
msgid "Inter User Communication Vehicle (IUCV)"
msgstr "用户间通讯载体 (IUCV)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS"
msgstr "OSA LCS"
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS Network Card"
msgstr "OSA 本地通道站 (LCS) 网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
#: library/system/src/include/hwinfo/classnames.rb:219
msgid "Loopback"
msgstr "回路"
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
msgid "Loopback Device"
msgstr "回路设备"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
#: library/system/src/include/hwinfo/classnames.rb:228
msgid "Myrinet"
msgstr "Myrinet"
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
msgid "Myrinet Network Card"
msgstr "Myrinet 网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
msgid "Parallel Line"
msgstr "并行线路"
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
msgid "Parallel Line Connection"
msgstr "并行线路连接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
#: library/system/src/include/hwinfo/classnames.rb:226
msgid "QETH"
msgstr "QETH"
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
msgid "OSA-Express or QDIO Device (QETH)"
msgstr "OSA-Express 或 QDIO 设备 (QETH)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
msgid "IPv6-in-IPv4"
msgstr "IPv6-in-IPv4"
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
msgid "IPv6-in-IPv4 Encapsulation Device"
msgstr "IPv6-in-IPv4 封装设备"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
msgid "Serial Line"
msgstr "串行线路"
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
msgid "Serial Line Connection"
msgstr "串行线路连接"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
msgid "Token Ring"
msgstr "令牌环"
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
msgid "Token Ring Network Card"
msgstr "令牌环网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB"
msgstr "USB"
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB Network Device"
msgstr "USB 网络设备"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare"
msgstr "VMWare"
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare Network Device"
msgstr "VMWare 网络设备"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
msgid "Wireless"
msgstr "无线"
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
msgid "Wireless Network Card"
msgstr "无线网卡"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XPNET"
msgstr "XPNET"
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XP Network"
msgstr "XP 网络"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "VLAN"
msgstr "VLAN"
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "Virtual LAN"
msgstr "虚拟局域网"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#: library/system/src/include/hwinfo/classnames.rb:89
#: library/system/src/include/hwinfo/classnames.rb:101
msgid "Bridge"
msgstr "网桥"
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
msgid "Network Bridge"
msgstr "网桥"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "TUN"
msgstr "TUN"
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "Network TUNnel"
msgstr "网络隧道"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "TAP"
msgstr "TAP"
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
msgid "Network TAP"
msgstr "网络复写 (TAP)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#: library/system/src/include/hwinfo/classnames.rb:152
msgid "InfiniBand"
msgstr "InfiniBand"
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
msgid "InfiniBand Device"
msgstr "无限宽带 (InfiniBand) 设备"
#. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
msgid "Unknown device"
msgstr "未知设备"
#. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
msgid "DHCP address"
msgstr "DHCP 地址"
#. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
msgid "No IP address assigned"
msgstr "未指派 IP 地址"
#. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
msgid "Device Type"
msgstr "设备类型"
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
msgid "Device Name"
msgstr "设备名称"
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
msgid "IP Address"
msgstr "IP 地址"
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
msgid "Device ID"
msgstr "设备 ID"
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
msgid "Connected"
msgstr "已连接"
#. label message
#. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
msgid "Scanning for hosts on this LAN..."
msgstr "正在扫描此局域网中的主机..."
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
msgid "&NFS Servers"
msgstr "&NFS 服务器"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
msgid "Re&mote Hosts"
msgstr "远程主机(&M)"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
msgid "&Exported Directories"
msgstr "导出文件夹(&E)"
#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
msgid ""
"Your network interfaces are currently controlled by NetworkManager\n"
"but the service to configure might not work well with it.\n"
@@ -2691,7 +2890,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:348
+#: library/network/src/modules/NetworkService.rb:346
msgid ""
"No running network detected.\n"
"Restart installation and configure network in Linuxrc\n"
@@ -2701,7 +2900,7 @@
"请重启安装程序并在 Linuxrc 中配置网络\n"
"或无网络继续。"
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
msgid ""
"No running network detected.\n"
"Configure network with YaST or Network Manager plug-in\n"
@@ -2723,142 +2922,6 @@
"端口号可以是一个从 0 到 65535 的数字。\n"
"不允许使用空格。\n"
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:116
-msgid "External Zone"
-msgstr "外部区域"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:120
-msgid "Internal Zone"
-msgstr "内部区域"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:124
-msgid "Demilitarized Zone"
-msgstr "隔离区域"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:247
-msgid "TCP"
-msgstr "TCP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:249
-msgid "UDP"
-msgstr "UDP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:251
-msgid "RPC"
-msgstr "RPC"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:253
-msgid "IP"
-msgstr "IP"
-
-#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1159
-msgid "Unknown Zone"
-msgstr "未知区域"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1508
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"接口 '%1' 包含在多个防火墙区域中。\n"
-"继续配置可能产生错误。\n"
-"\n"
-"建议保留配置并\n"
-"在 '/etc/sysconfig/SuSEFirewall' 文件中手动修复它。"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1973
-#: library/network/src/modules/SuSEFirewall.rb:2049
-msgid ""
-"Interface '%1' is not assigned to any firewall zone.\n"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"接口 '%1' 未指派到任何防火墙区域。\n"
-"请运行 YaST2 防火墙并指派它。\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2480
-msgid "Initializing Firewall Configuration"
-msgstr "初始化防火墙配置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Check for network devices"
-msgstr "检查网络设备"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Read current configuration"
-msgstr "读取当前配置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2492
-msgid "Check possibly conflicting services"
-msgstr "检查可能冲突的服务"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Checking for network devices..."
-msgstr "正在检查网络设备..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Reading current configuration..."
-msgstr "正在读取当前配置..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2500
-msgid "Checking possibly conflicting services..."
-msgstr "正在检查可能冲突的服务..."
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2643
-msgid "Writing Firewall Configuration"
-msgstr "写入防火墙配置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2651
-msgid "Write firewall settings"
-msgstr "写入防火墙设置"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2653
-msgid "Adjust firewall service"
-msgstr "调整防火墙服务"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2657
-msgid "Writing firewall settings..."
-msgstr "正在写入防火墙设置..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2659
-msgid "Adjusting firewall service..."
-msgstr "正在调整防火墙服务..."
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2678
-msgid "Writing settings failed"
-msgstr "写入设置失败"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3471
-msgid "Unknown protocol (%1)"
-msgstr "未知协议 (%1)"
-
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
#: library/network/src/modules/SuSEFirewallProposal.rb:167
msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2877,39 +2940,32 @@
#. 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:565
-msgid ""
-"Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal"
-"\">disable</a>)"
+msgid "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
msgstr "防火墙已启用 (<a href=\"firewall--disable_firewall_in_proposal\">禁用</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:571
-msgid ""
-"Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal"
-"\">enable</a>)"
+msgid "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
msgstr "防火墙已禁用 (<a href=\"firewall--enable_firewall_in_proposal\">启用</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:606
-msgid ""
-"SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>)"
+msgid "SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>)"
msgstr "SSH 端口已打开(<a href=\"firewall--disable_ssh_in_proposal\">关闭</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:612
-msgid ""
-"SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
msgstr "SSH 端口已屏蔽 (<a href=\"firewall--enable_ssh_in_proposal\">打开</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:633
msgid ""
-"SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), "
-"but\n"
+"SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), but\n"
"there are no network interfaces configured"
msgstr ""
"SSH 端口已打开 (<a href=\"firewall--disable_ssh_in_proposal\">关闭</a>), \n"
@@ -2917,36 +2973,24 @@
#. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall
#: 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."
+msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall."
msgstr "您正在通过 SSH 安装系统,但您尚未打开防火墙上的 SSH 端口。"
#. 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:690
-msgid ""
-"Remote Administration (VNC) ports are open (<a href=\"firewall--"
-"disable_vnc_in_proposal\">close</a>)"
-msgstr ""
-"远程管理 (VNC) 端口已打开 (<a href=\"firewall--disable_vnc_in_proposal\">关闭"
-"</a>)"
+msgid "Remote Administration (VNC) ports are open (<a href=\"firewall--disable_vnc_in_proposal\">close</a>)"
+msgstr "远程管理 (VNC) 端口已打开 (<a href=\"firewall--disable_vnc_in_proposal\">关闭</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:696
-msgid ""
-"Remote Administration (VNC) ports are blocked (<a href=\"firewall--"
-"enable_vnc_in_proposal\">open</a>)"
-msgstr ""
-"远程管理 (VNC) 端口已屏蔽 (<a href=\"firewall--enable_vnc_in_proposal\">打开"
-"</a>)"
+msgid "Remote Administration (VNC) ports are blocked (<a href=\"firewall--enable_vnc_in_proposal\">open</a>)"
+msgstr "远程管理 (VNC) 端口已屏蔽 (<a href=\"firewall--enable_vnc_in_proposal\">打开</a>)"
#. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
#: 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."
+msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall."
msgstr "您正在通过远程管理 (VNC) 安装系统,但您尚未打开防火墙上的 VNC 端口。"
#. TRANSLATORS: Network proposal informative text
@@ -2961,67 +3005,17 @@
#. TRANSLATORS: This is a warning message. Installation to iSCSI without iSCSI allowed on firewall
#: library/network/src/modules/SuSEFirewallProposal.rb:737
-msgid ""
-"You are installing a system using iSCSI Target, but you have not opened the "
-"needed ports on the firewall."
+msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
msgstr "您正在通过 iSCSI 目标安装系统,但您尚未在防火墙上打开需要的端口。"
-#. Returns service definition.
-#. See @services for the format.
-#. If *silent* is `false` (the default), the method throws an exception
-#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
-#.
-#. @param [String] service name (including the "service:" prefix)
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. @api private
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param [Hash{String => Array<String>] store_definition of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService
-#. @see #ServiceDefinedByPackage
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. {
-#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
-#. "udp_ports" => [ ],
-#. "rpc_ports" => [ "portmap", "ypbind" ],
-#. "ip_protocols" => [ "esp" ],
-#. "broadcast_ports"=> [ ],
-#. }
-#. )
-#: library/network/src/modules/SuSEFirewallServices.rb:356
-#: library/network/src/modules/SuSEFirewallServices.rb:640
-msgid "Service with name '%{service_name}' does not exist"
-msgstr "名为 '%{service_name}' 的服务不存在"
-
-#. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:434
-msgid "Service: %{filename}"
-msgstr "服务:%{filename}"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:505
-msgid "Unknown service '%1'"
-msgstr "未知服务 '%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:106
#: library/packages/src/include/packages/common.rb:135
msgid "These packages need to be installed:"
msgstr "需要安装这些软件包:"
+#. the message is followed by list of required packages
#. Popup Text
#: library/packages/src/include/packages/common.rb:109
#: library/packages/src/include/packages/common.rb:137
@@ -3036,17 +3030,17 @@
msgstr "卸载(&U)"
#. TRANSLATORS: progress bar label
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
msgid "Checking file conflicts..."
msgstr "正在检查文件冲突..."
#. TRANSLATORS: help text for the file conflict detection progress
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:87
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
msgid "<p>Detecting the file conflicts is in progress.</p>"
msgstr "<p>正在检测文件冲突。</p>"
#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:132
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
msgid ""
"File conflicts detected, these conflicting files will be overwritten:\n"
"\n"
@@ -3057,7 +3051,7 @@
"%s"
#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:168
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
msgid ""
"File conflicts happen when two packages attempt to install\n"
"files with the same name but different contents. If you continue\n"
@@ -3067,7 +3061,7 @@
"若您选择继续将覆盖冲突的文件,以前的内容将会丢失。"
#. TRANSLATORS: Popup heading
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:173
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
msgid "A File Conflict Detected"
msgid_plural "File Conflicts Detected"
msgstr[0] "检测到文件冲突"
@@ -3118,7 +3112,7 @@
#. detail string is appended to the end
#: library/packages/src/modules/PackageCallbacks.rb:269
#: library/packages/src/modules/PackageCallbacks.rb:303
-#: library/packages/src/modules/PackageCallbacks.rb:2144
+#: library/packages/src/modules/PackageCallbacks.rb:2136
msgid "Error: %1:"
msgstr "错误:%1:"
@@ -3164,8 +3158,7 @@
#: library/packages/src/modules/PackageCallbacks.rb:507
msgid ""
"Ignoring a package failure may result in a broken system.\n"
-"The system should be later verified by running the Software Management "
-"module."
+"The system should be later verified by running the Software Management module."
msgstr ""
"忽略失败的软件包可能导致系统损坏。\n"
"稍后应运行软件管理模块校验系统。"
@@ -3174,10 +3167,8 @@
#: library/packages/src/modules/PackageCallbacks.rb:576
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
-"If the URL is correct, this indicates that the repository content has "
-"changed. To \n"
-"continue using this repository, start <b>Installation Repositories</b> "
-"from \n"
+"If the URL is correct, this indicates that the repository content has changed. To \n"
+"continue using this repository, start <b>Installation Repositories</b> from \n"
"the YaST control center and refresh the repository.</p>\n"
msgstr ""
"<p>指定 URL 上的软件源现在提供了一个不同的介质 ID。\n"
@@ -3245,7 +3236,7 @@
#. wrong media id, offer "Ignore"
#. push button label
#: library/packages/src/modules/PackageCallbacks.rb:660
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:1835
msgid "Skip Autorefresh"
msgstr "跳过自动刷新"
@@ -3331,7 +3322,7 @@
#: library/packages/src/modules/PackageCallbacks.rb:1099
#: library/packages/src/modules/PackageCallbacks.rb:1229
#: library/packages/src/modules/PackageCallbacks.rb:1333
-#: library/packages/src/modules/PackageCallbacks.rb:2098
+#: library/packages/src/modules/PackageCallbacks.rb:2090
msgid "Retry?"
msgstr "重试吗?"
@@ -3383,7 +3374,7 @@
#. popup heading
#: library/packages/src/modules/PackageCallbacks.rb:1428
-#: library/packages/src/modules/PackageCallbacks.rb:3082
+#: library/packages/src/modules/PackageCallbacks.rb:3070
msgid "Package: "
msgstr "软件包:"
@@ -3448,24 +3439,24 @@
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
#: library/packages/src/modules/PackageCallbacks.rb:1724
-#: library/packages/src/modules/PackageCallbacks.rb:1772
+#: library/packages/src/modules/PackageCallbacks.rb:1770
msgid "Downloading: %1"
msgstr "正在下载:%1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1876
-#: library/packages/src/modules/PackageCallbacks.rb:1942
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
msgid "Checking Package Database"
msgstr "正在检查软件包数据库"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1879
+#: library/packages/src/modules/PackageCallbacks.rb:1875
msgid "Rebuilding package database. This process can take some time."
msgstr "正在重建软件包数据库。此过程要花费一点时间。"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1912
+#: library/packages/src/modules/PackageCallbacks.rb:1908
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3474,16 +3465,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1945
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Converting package database. This process can take some time."
msgstr "正在转换软件包数据库。此过程要花费一点时间。"
-#: library/packages/src/modules/PackageCallbacks.rb:1958
+#: library/packages/src/modules/PackageCallbacks.rb:1954
msgid "Status"
msgstr "状态"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1982
+#: library/packages/src/modules/PackageCallbacks.rb:1978
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3492,12 +3483,12 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2018
+#: library/packages/src/modules/PackageCallbacks.rb:2014
msgid "Reading RPM database..."
msgstr "正在读取 RPM 数据库..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2028
+#: library/packages/src/modules/PackageCallbacks.rb:2023
msgid "Reading Installed Packages"
msgstr "正在读取已安装的软件包"
@@ -3508,27 +3499,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2034
-#: library/packages/src/modules/PackageCallbacks.rb:2050
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
msgid "Scanning RPM database..."
msgstr "正在扫描 RPM 数据库..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2087
+#: library/packages/src/modules/PackageCallbacks.rb:2079
msgid "Initialization of the target failed."
msgstr "目标初始化失败。"
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2179
+#: library/packages/src/modules/PackageCallbacks.rb:2171
msgid "RPM database read"
msgstr "已读取 RPM 数据库"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2213
+#: library/packages/src/modules/PackageCallbacks.rb:2203
msgid "User Authentication"
msgstr "用户认证"
-#: library/packages/src/modules/PackageCallbacks.rb:2219
+#: library/packages/src/modules/PackageCallbacks.rb:2209
msgid ""
"URL: %1\n"
"\n"
@@ -3539,20 +3530,20 @@
"%2"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2228
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid "&User Name"
msgstr "用户名(&U)"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3017
+#: library/packages/src/modules/PackageCallbacks.rb:3005
msgid "Show &details"
msgstr "显示细节(&D)"
-#: library/packages/src/modules/PackageCallbacks.rb:3083
+#: library/packages/src/modules/PackageCallbacks.rb:3071
msgid "Size: "
msgstr "大小:"
-#: library/packages/src/modules/PackageCallbacks.rb:3106
+#: library/packages/src/modules/PackageCallbacks.rb:3094
msgid "Remaining time to automatic retry: %1"
msgstr "自动重试前剩余时间:%1"
@@ -3600,9 +3591,7 @@
"Would you like to retry accessing the software manager,\n"
"continue without having access to the software management,\n"
"or abort?\n"
-msgstr ""
-"您愿意重试访问软件管理器,在无法访问软件管理的情况下继续,还是中止本程序"
-"呢?\n"
+msgstr "您愿意重试访问软件管理器,在无法访问软件管理的情况下继续,还是中止本程序呢?\n"
#. TRANSLATORS: an error message with question
#: library/packages/src/modules/PackageLock.rb:187
@@ -3624,12 +3613,12 @@
msgstr "有未解决的依赖关系,需要在软件管理器中手动解决。"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:417
+#: library/packages/src/modules/PackageSystem.rb:418
msgid "Installing required packages failed."
msgstr "安装必需的软件包失败。"
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:421
+#: library/packages/src/modules/PackageSystem.rb:422
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3669,8 +3658,7 @@
"<p><b><big>License Confirmation</big></b><br>\n"
"The package in the headline of the dialog requires an explicit confirmation\n"
"of acceptance of its license.\n"
-"If you reject the license of the package, the package will not be "
-"installed.\n"
+"If you reject the license of the package, the package will not be installed.\n"
"<br>\n"
"To accept the license of the package, click <b>I Agree</b>.\n"
"To reject the license of the package, click <b>I Disagree</b></p>."
@@ -3686,10 +3674,8 @@
#: library/packages/src/modules/PackagesUI.rb:347
msgid ""
"<p>\n"
-"\t\t This dialog allows you to define this system's tasks and what software "
-"to install.\n"
-"\t\t Available tasks and software for this system are shown by category in "
-"the left\n"
+"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
+"\t\t Available tasks and software for this system are shown by category in the left\n"
"\t\t column. To view a description for an item, select it in the list.\n"
"\t\t </p>"
msgstr ""
@@ -3728,8 +3714,7 @@
#: library/packages/src/modules/PackagesUI.rb:367
msgid ""
"<p>\n"
-"\t\t The disk usage display in the lower right corner shows the remaining "
-"disk space\n"
+"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
"\t\t after all requested changes will have been performed.\n"
"\t\t Hard disk partitions that are full or nearly full can degrade\n"
"\t\t system performance and in some cases even cause serious problems.\n"
@@ -3813,7 +3798,7 @@
#. display installation log
#: library/packages/src/modules/PackagesUI.rb:624
-#: library/packages/src/modules/PackagesUI.rb:712
+#: library/packages/src/modules/PackagesUI.rb:713
msgid "Installation log"
msgstr "安装日志"
@@ -3826,46 +3811,44 @@
msgid "After Installing Packages"
msgstr "在安装软件包后"
-#: library/packages/src/modules/PackagesUI.rb:680
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Show This Report"
msgstr "显示此报告"
-#: library/packages/src/modules/PackagesUI.rb:681
+#: library/packages/src/modules/PackagesUI.rb:682
msgid "Finish"
msgstr "已完成"
-#: library/packages/src/modules/PackagesUI.rb:682
+#: library/packages/src/modules/PackagesUI.rb:683
msgid "Continue in the Software Manager"
msgstr "在软件管理器中继续"
-#: library/packages/src/modules/PackagesUI.rb:687
-msgid ""
-"<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed "
-"or removed packages.</P>"
+#: library/packages/src/modules/PackagesUI.rb:688
+msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr "<P><BIG><B>安装报告</B><BIG></P><P>这里是一份已安装或已移除软件包的摘要。</P>"
-#: library/packages/src/modules/PackagesUI.rb:695
+#: library/packages/src/modules/PackagesUI.rb:696
msgid "Installation Report"
msgstr "安装报告"
-#: library/packages/src/modules/PackagesUI.rb:717
+#: library/packages/src/modules/PackagesUI.rb:718
msgid "Installed Packages"
msgstr "已安装的软件包"
-#: library/packages/src/modules/PackagesUI.rb:722
+#: library/packages/src/modules/PackagesUI.rb:723
msgid "Updated Packages"
msgstr "已更新的软件包"
-#: library/packages/src/modules/PackagesUI.rb:727
+#: library/packages/src/modules/PackagesUI.rb:728
msgid "Removed Packages"
msgstr "已移除的软件包"
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:733
msgid "Remaining Packages"
msgstr "其余软件包"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:753
+#: library/packages/src/modules/PackagesUI.rb:754
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -3883,7 +3866,7 @@
#. popup question, %1 stands for the package name
#. %2 is a repository name
#. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
msgid ""
"The package %1 from repository %2\n"
"%3\n"
@@ -3904,7 +3887,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:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
msgid ""
"The file %1 from repository %2\n"
"%3\n"
@@ -3923,16 +3906,16 @@
"无论如何都使用该文件吗?\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
msgid "Unsigned Package"
msgstr "未签名的软件包"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
msgid "Unsigned File"
msgstr "未签名的文件"
#. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
msgid ""
"No checksum for package %1 was found in the repository.\n"
"While the package is part of the signed repository, it is not contained \n"
@@ -3949,80 +3932,78 @@
"无论如何都安装该软件包吗?\n"
#. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
msgid ""
"No checksum for file %1 was found in the repository.\n"
"This means that the file is part of the signed repository,\n"
-"but the list of checksums in this repository does not mention this file. "
-"Using the file\n"
+"but the list of checksums in this repository does not mention this file. Using the file\n"
"may put the integrity of your system at risk.\n"
"\n"
"Use it anyway?"
msgstr ""
"未在源中找到文件 %1 的校验码。\n"
"这表明,虽然该文件属于一个已签名的软件源,\n"
-"但此源中的校验码列表并未提到该文件。使用该文件可能会使您的系统完整性面临风"
-"险。\n"
+"但此源中的校验码列表并未提到该文件。使用该文件可能会使您的系统完整性面临风险。\n"
"\n"
"无论如何都使用该文件吗?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
msgid "No Checksum Found"
msgstr "未找到校验码"
#. 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:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
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:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
msgid "Fingerprint: %1"
msgstr "指纹:%1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
msgid "Name: %1"
msgstr "名称:%1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
msgid "Created: %1"
msgstr "创建于:%1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
msgid "Expires: %1"
msgstr "失效于:%1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
msgid "ID: "
msgstr "ID:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
msgid "Name: "
msgstr "名称:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
msgid "Fingerprint: "
msgstr "指纹:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
msgid "Created: "
msgstr "创建于:"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
msgid "Expires: "
msgstr "失效于:"
#. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
msgid ""
"Package %1 from repository %2\n"
"%3\n"
@@ -4039,13 +4020,12 @@
"由以下 GnuPG 密钥签名,但完整性检查失败:%4\n"
"\n"
"这意味着在该软件源创建者签名该软件包之后,\n"
-"该软件包已被无意修改或已被攻击者修改。安装该软件包对于您的系统完整性和安全性"
-"是一个巨大的风险。\n"
+"该软件包已被无意修改或已被攻击者修改。安装该软件包对于您的系统完整性和安全性是一个巨大的风险。\n"
"\n"
"无论如何都安装该软件包吗?\n"
#. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
msgid ""
"File %1 from repository %2\n"
"%3\n"
@@ -4068,12 +4048,12 @@
"无论如何都使用该文件吗?\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
msgid "Validation Check Failed"
msgstr "校验检查失败"
#. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
msgid ""
"The package %1 is digitally signed\n"
"with the following unknown GnuPG key: %2.\n"
@@ -4092,7 +4072,7 @@
"无论如何都安装该软件包吗?"
#. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
msgid ""
"The file %1\n"
"is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -4112,12 +4092,12 @@
"无论如何都使用该文件吗?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
msgid "Unknown GnuPG Key"
msgstr "未知 GnuPG 密钥"
#. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
msgid ""
"The package %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4138,7 +4118,7 @@
"最保险的方法是跳过该软件包。\n"
#. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
msgid ""
"The file %1 is digitally signed\n"
"with key '%2 (%3)'.\n"
@@ -4159,17 +4139,17 @@
"最保险的方法是跳过该文件。\n"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
msgid "Signed with Untrusted Public Key"
msgstr "经未信任公共密钥签名"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
msgid "&Trust and Import the Key"
msgstr "信任并导入该密钥(&T)"
#. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
msgid ""
"<p>The owner of the key may distribute updates,\n"
"packages, and package repositories that your system will trust and offer\n"
@@ -4183,18 +4163,17 @@
"将允许该密钥的所有者拥有对您系统上的软件的一定量的控制权。</p>"
#. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
msgid ""
"<p>A warning dialog opens for every package that\n"
"is not signed by a trusted (imported) key. If you do not trust the key,\n"
-"the packages or repositories created by the owner of the key will not be "
-"used.</p>"
+"the packages or repositories created by the owner of the key will not be used.</p>"
msgstr ""
"<p>每个未经可信 (导入的) 密钥签名的软件包都会触发一个警告对话框。\n"
"若您不信任该密钥,将不会使用由该密钥的所有者创建的软件包或软件源。</p>"
#. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
msgid ""
"The following GnuPG key has been found in repository\n"
"%1\n"
@@ -4205,7 +4184,7 @@
"(%2):"
#. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
msgid ""
"You can choose to import it into your keyring of trusted\n"
"public keys, meaning that you trust the owner of the key.\n"
@@ -4216,23 +4195,23 @@
"导入前应确保您可以信任该所有者,并且该密钥确实属于该所有者。"
#. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
msgid "WARNING: The key has expired!"
msgstr "警告:该密钥已过期!"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
msgid "Import Untrusted GnuPG Key"
msgstr "导入未信任 GnuPG 密钥"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
msgid "&Trust"
msgstr "信任(&T)"
#. 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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
msgid ""
"The expected checksum of file %1\n"
"is %2,\n"
@@ -4255,20 +4234,19 @@
"无论如何都使用该文件吗?\n"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
msgid "Wrong Digest"
msgstr "错误摘要"
#. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
msgid ""
"The checksum of file %1\n"
"is %2,\n"
"but the expected checksum is not known.\n"
"\n"
"This means that the origin and integrity of the file\n"
-"cannot be verified. Using the file puts the integrity of your system at "
-"risk.\n"
+"cannot be verified. Using the file puts the integrity of your system at risk.\n"
"\n"
"Use it anyway?\n"
msgstr ""
@@ -4282,7 +4260,7 @@
"无论如何都使用该文件吗?\n"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
msgid "Unknown Digest"
msgstr "未知摘要"
@@ -4326,14 +4304,8 @@
msgstr "<p>正在安装软件包。</p>"
#: library/packages/src/modules/SlideShow.rb:635
-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 ""
-"<P><B>中止安装</B>可用<B>中止</B>按钮中止安装软件包。然而,之后系统可能处于不"
-"连贯或不稳定的状态,若未安装基础系统组件,它甚至可能无法引导。</P>"
+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 "<P><B>中止安装</B>可用<B>中止</B>按钮中止安装软件包。然而,之后系统可能处于不连贯或不稳定的状态,若未安装基础系统组件,它甚至可能无法引导。</P>"
#. Translators: Tab name, keep short, %s is product name, e.g. SLES
#: library/packages/src/modules/SlideShow.rb:653
@@ -4342,38 +4314,38 @@
#. tab
#: library/packages/src/modules/SlideShow.rb:665
-msgid "Slide Sho&w"
-msgstr "幻灯片演示(&W)"
-
-#. tab
-#: library/packages/src/modules/SlideShow.rb:667
msgid "&Details"
msgstr "细节(&D)"
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
+msgid "Slide Sho&w"
+msgstr "幻灯片演示(&W)"
+
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:706
+#: library/packages/src/modules/SlideShow.rb:708
msgid "Performing Upgrade"
msgstr "正在执行升级"
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:709
+#: library/packages/src/modules/SlideShow.rb:711
msgid "Performing Installation"
msgstr "正在执行安装"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:744
+#: library/packages/src/modules/SlideShow.rb:746
msgid "Package Installation"
msgstr "软件包安装"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:816
+#: library/packages/src/modules/SlideShow.rb:818
msgid ""
"Do you really want\n"
"to quit the installation?"
msgstr "您真的想要退出安装吗?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:828
+#: library/packages/src/modules/SlideShow.rb:830
msgid "Aborted"
msgstr "已中止"
@@ -4981,45 +4953,44 @@
"退出代码:%{exitcode}\n"
"错误输出:%{stderr}"
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Continue/Cancel question, %1 is a coma separated list of file names
+#: library/system/src/modules/FileChanges.rb:178
msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Files %1 have been changed manually.\n"
+"YaST might lose some of the changes"
msgstr ""
"文件 %1 已被手动修改。\n"
-"YaST 可能会丢失一些修改。\n"
+"YaST 可能会丢失一些修改"
-#. Continue/Cancel question, %1 is a coma separated list of file names
+#. Continue/Cancel question, %1 is a file name
#: library/system/src/modules/FileChanges.rb:180
msgid ""
-"Files %1 have been changed manually.\n"
-"YaST might lose some of the changes"
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
msgstr ""
"文件 %1 已被手动修改。\n"
-"YaST 可能会丢失一些修改"
+"YaST 可能会丢失一些修改。\n"
-#: library/system/src/modules/FileChanges.rb:193
+#: library/system/src/modules/FileChanges.rb:192
msgid "Do not show this message anymore"
msgstr "不再显示此消息"
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
+#, fuzzy
+#| msgid ""
+#| "File %s has been created manually.\n"
+#| "YaST might lose this file."
msgid ""
"File %s has been created manually.\n"
"YaST might lose this file."
-msgstr ""
-"文件 %s 已被手动创建。\n"
-"YaST 或许会丢失此文件。"
-
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-msgid ""
+msgid_plural ""
"Files %s have been created manually.\n"
"YaST might lose these files."
-msgstr ""
+msgstr[0] ""
"文件 %s 已被手动创建。\n"
-"YaST 或许会丢失这些文件。"
+"YaST 或许会丢失此文件。"
#. error report
#: library/system/src/modules/Initrd.rb:415
@@ -5027,7 +4998,7 @@
msgstr "initrd 创建过程中出错。"
#. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
msgid ""
"Reboot your system\n"
"to activate the new kernel.\n"
@@ -5147,13 +5118,13 @@
#. 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:738
+#: library/types/src/modules/String.rb:730
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
+#: library/types/src/modules/String.rb:846
msgid "%1/s"
msgstr "%1/秒"
@@ -5232,8 +5203,8 @@
#. fallback name for the dialog title
#. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
msgid "Module"
msgstr "模块"
@@ -5880,13 +5851,11 @@
"\n"
"A valid reverse IPv4 consists of four integers in the range 0-255\n"
"separated by a dot then followed by the string '.in-addr.arpa.'.\n"
-"For example, '1.32.168.192.in-addr.arpa.' for the IPv4 address "
-"'192.168.32.1'.\n"
+"For example, '1.32.168.192.in-addr.arpa.' for the IPv4 address '192.168.32.1'.\n"
msgstr ""
"反向 IPv4 地址 %1 无效。\n"
"\n"
-"有效的反向 IPv4 包含由英文句号分隔的 4 个范围在 0-255 之间的整数,后面再跟字"
-"符串 '.in-addr.arpa.'。\n"
+"有效的反向 IPv4 包含由英文句号分隔的 4 个范围在 0-255 之间的整数,后面再跟字符串 '.in-addr.arpa.'。\n"
"例如,IPv4 地址 '192.168.32.1' 的反向地址是 '1.32.168.192.in-addr.arpa.'。\n"
#. TRANSLATORS: Popup error message, user can't use hostname %1 because it doesn't make
@@ -6011,6 +5980,13 @@
"DNS 服务器管理的 %1 没有反向区域。\n"
"无法添加主机名 %2。"
+#~ msgid ""
+#~ "Files %s have been created manually.\n"
+#~ "YaST might lose these files."
+#~ msgstr ""
+#~ "文件 %s 已被手动创建。\n"
+#~ "YaST 或许会丢失这些文件。"
+
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "无法挂载正确的软件源介质。"
@@ -6044,9 +6020,7 @@
#~ "Yast has automatically added or removed some packages,\n"
#~ "check the changes scheduled to fix the system\n"
#~ "in the software manager."
-#~ msgstr ""
-#~ "YaST 自动添加或移除了一些软件包,请到软件管理器中检查计划的变更以修复系"
-#~ "统。"
+#~ msgstr "YaST 自动添加或移除了一些软件包,请到软件管理器中检查计划的变更以修复系统。"
#~ msgid ""
#~ "Start the software manager and fix the problems\n"
Modified: trunk/yast/zh_CN/po/bootloader.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/bootloader.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/bootloader.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2016-06-05 17:01+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -24,96 +24,56 @@
"X-Generator: Lokalize 2.0\n"
#. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
msgid "Boot loader configuration module"
msgstr "引导加载器配置模块"
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "引导加载器配置摘要"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "引导分区类型是 NFS。无法安装引导加载器。"
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
-msgid "Delete a global option or option of a section"
-msgstr "删除全局选项或某引导项的选项"
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "引导加载器设置"
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
-msgid "Set a global option or option of a section"
-msgstr "设置全局选项或某引导项的选项"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
+msgid "Device map must contain at least one device"
+msgstr "设备映射必须包含至少一个设备"
-#. command line help text for add action
-#: src/clients/bootloader.rb:72
-msgid "Add a new section - please use interactive mode"
-msgstr "添加新引导项 - 请使用交互模式"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
+msgid "Disk order settings"
+msgstr "磁盘顺序设置"
-#. command line help text for print action
-#: src/clients/bootloader.rb:82
-msgid "Print value of specified option"
-msgstr "打印指定选项的值"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "磁盘(&I)"
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The name of the section"
-msgstr "引导项名称"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "设备(&D)"
-#. command line help text for an option
-#: src/clients/bootloader.rb:97
-msgid "The key of the option"
-msgstr "选项的键"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+#, fuzzy
+#| msgid "Selected custom bootloader partition %s is not available any more."
+msgid "Selected bootloader partition %s is not available any more."
+msgstr "所选自定义引导分区 %s 不再可用。"
-#. command line help text for an option
-#: src/clients/bootloader.rb:104
-msgid "The value of the option"
-msgstr "选项的值"
-
-#. command line error report, %1 is section name
-#. command line error report, %1 is section name
-#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225
-msgid "Section %1 not found."
-msgstr "未找到引导项 %1。"
-
-#. command line error report
-#: src/clients/bootloader.rb:201
-msgid "Value was not specified."
-msgstr "未指定值。"
-
-#. Add a new bootloader section with specified name
-#. @param [Hash] options a list of parameters passed as args
-#. @return [Boolean] true on success
-#: src/clients/bootloader.rb:239
-msgid "Add option is available only in commandline interactive mode"
-msgstr "添加选项只在命令行交互模式中可用"
-
-#. command line error report
-#: src/clients/bootloader.rb:245
-msgid "Section name must be specified."
-msgstr "必须指定引导项名称。"
-
-#. command line error report
-#: src/clients/bootloader.rb:265
-msgid "Option was not specified."
-msgstr "未指定选项。"
-
-#. command line error report
-#: src/clients/bootloader.rb:284
-msgid "Specified option does not exist."
-msgstr "指定选项不存在。"
-
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:287
-msgid "Value: %1"
-msgstr "值:%1"
-
-#. progress step title
-#: src/clients/bootloader_finish.rb:52
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
msgid "Saving bootloader configuration..."
msgstr "正在保存引导加载器配置..."
#. TRANSLATORS: reboot message
#. %1 is replaced with additional message from reIPL
-#: src/clients/bootloader_finish.rb:133
+#: src/lib/bootloader/finish_client.rb:102
msgid ""
"\n"
"Your system will now shut down.%1\n"
@@ -128,2083 +88,1537 @@
#. 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
+#: src/lib/bootloader/finish_client.rb:115
msgid "The system will reboot now..."
msgstr "系统将立即重引导..."
-#. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:116
-msgid ""
-"No boot loader is selected for installation. Your system might not be "
-"bootable."
-msgstr "未选择安装任何引导加载器。您的系统可能无法引导。"
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "引导加载器(&B)"
-#. error in the proposal
-#: src/clients/bootloader_proposal.rb:126
-msgid ""
-"Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "出于分区原因,无法正确安装引导加载器"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
+msgstr ""
-#. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:225
-msgid "Booting"
-msgstr "引导"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
+msgstr ""
-#. menubutton entry
-#: src/clients/bootloader_proposal.rb:227
-msgid "&Booting"
-msgstr "引导(&B)"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
+msgstr ""
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:41
-#: src/include/bootloader/grub2/dialogs.rb:221
-msgid "Disk Order"
-msgstr "磁盘顺序"
+#: src/lib/bootloader/generic_widgets.rb:43
+#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr " (默认)"
-#: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:230
-msgid "Disk order settings"
-msgstr "磁盘顺序设置"
-
-#. Run dialog for loader installation details on i386
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:68
-msgid "Boot Menu"
-msgstr "引导菜单"
-
-#. `VSpacing(1),
-#. Window title
-#: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:143
-msgid "Boot Loader Options"
-msgstr "引导加载器选项"
-
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>引导菜单</b></big><br></p>"
-
-#: src/include/bootloader/grub/helps.rb:24
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR "
-"code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active "
-"even\n"
-"if the boot loader is installed in the MBR.</p>"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
msgstr ""
-"<b>在分区表中为引导分区设置活动旗标</b><br>\n"
-"激活包含引导加载器的分区。\n"
-"之后通用 MBR 代码将引导活动分区。\n"
-"较旧的 BIOS 要求有一个活动分区,\n"
-"即使引导加载器安装在主引导记录中也是如此。</p>"
+"\n"
+"您若不安装任何引导加载器,系统可能无法启动。\n"
+"\n"
+"继续咩?后果很严重哦\n"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
+#: src/lib/bootloader/generic_widgets.rb:75
msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is "
-"loaded.</p>\n"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
msgstr ""
-"<p><b>超时(以秒计)</b><br>\n"
-"指定在默认内核加载前引导加载器将等待的时间。</p>\n"
+"<p><b>引导加载器类型</b><br>\n"
+"要选择是否安装引导加载器以及安装哪个引导加载器,请使用<b>引导加载器</b>。</p>"
-#: src/include/bootloader/grub/helps.rb:33
-msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
-msgstr ""
-"<p>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
-"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系"
-"统。\n"
-"若超时前没有按下任何键,将引导默认内核或操作系统。\n"
-"引导加载器菜单中的引导项顺序可使用<b>向上</b>和<b>向下</b>按钮调整。</p>\n"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "引导加载器类型:%1"
-#: src/include/bootloader/grub/helps.rb:41
-msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of "
-"your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
-msgstr ""
-"<p><b>将通用引导代码写入主引导记录</b>将使用通用代码 (用于引导活动分区的独立"
-"于操作系统的代码) 替换您磁盘的主引导记录。</p>"
+#: src/lib/bootloader/grub2.rb:109
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Enable Trusted Boot: %1"
+msgstr "启用安全引导:%1"
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the "
-"other is\n"
-"<b>Boot from Root Partition</b>.</p>"
-msgstr "<p><b>从引导分区引导</b>是一个推荐选项,另一个是<b>从根分区引导</b>。</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+#, fuzzy
+#| msgid "Yes"
+msgid "yes"
+msgstr "是"
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option "
-"<i>Graphical Menu File</i> will be ignored.\n"
-"It is recommended to install grub to MBR</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
msgstr ""
-"<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将"
-"被忽略。\n"
-"推荐将 grub 安装到主引导记录。</p>"
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have "
-"another operating system\n"
-"installed on your computer</p>"
-msgstr ""
-"<p>若您计算机上还安装着另一个操作系统,则不推荐使用<b>从主引导记录引导</b>。"
-"</p>"
+#: src/lib/bootloader/grub2.rb:116
+msgid "Status Location: %1"
+msgstr "状态位置:%1"
-#: src/include/bootloader/grub/helps.rb:53
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there "
-"is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot "
-"Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is "
-"needed or configure your other boot manager\n"
-"to start this section.</p>"
-msgstr ""
-"<p>当有合适的分区时,<b>从根分区引导</b>是推荐选项。\n"
-"若需要更新主引导记录,可选择在<b>引导加载器选项</b>中<b>在分区表中为引导分区"
-"设置活动旗标</b>并<b>写入通用引导代码到主引导记录</b>。或者也可以配置您其它的"
-"引导管理器去启动此引导项。</p>"
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "硬盘顺序:%1"
-#: src/include/bootloader/grub/helps.rb:59
-msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root "
-"partition is on \n"
-"logical partition and the /boot partition is missing</p>"
-msgstr ""
-"若您的根分区位于逻辑分区上且没有 /boot 分区则应该选择<p><b>从扩展分区引导</"
-"b></p>"
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
+msgstr " (扩展分区)"
-#: src/include/bootloader/grub/helps.rb:62
-msgid ""
-"<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p><b>自定义引导分区</b>可让您选择要从之引导的分区。</p>"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
+msgstr " (主引导记录)"
-#: src/include/bootloader/grub/helps.rb:65
-msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
-msgstr ""
-"<p>多设备 (MD) 阵列由两个磁盘构建而成。激活<b>启用多设备阵列冗余</b>可将 "
-"GRUB 写入两个磁盘的主引导记录。</p>"
+#: src/lib/bootloader/grub2.rb:216
+msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
+msgstr "安装引导代码至 MBR(<a href=\"disable_boot_mbr\">不安装</a>)"
-#: src/include/bootloader/grub/helps.rb:68
-msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub</"
-"code>) for details.</p>"
-msgstr ""
-"<p><b>使用串行控制台</b>可让您定义用于串行控制台的参数。\n"
-"细节请参考 grub 文档 (<code>info grub</code>)。</p>"
+#: src/lib/bootloader/grub2.rb:220
+msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
+msgstr "不安装引导代码至 MBR(<a href=\"enable_boot_mbr\">安装</a>)"
-#: src/include/bootloader/grub/helps.rb:71
-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>"
-msgstr ""
-"<p><b>定义终端</b></p><br>\n"
-"定义您想要使用的终端类型。 \n"
-"对于串行终端 (如串行控制台),您必须指定 <code>serial</code>。\n"
-"您也可以向命令传递 <code>console</code> 参数,如 <code>serial console</code>。\n"
-"在这种情况下,将把您在其中按下了任何键的终端选择为 GRUB 终端。</p>"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
+msgstr "安装引导代码至 /boot 分区(<a href=\"disable_boot_boot\">不安装</a>)"
-#: src/include/bootloader/grub/helps.rb:78
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section "
-"numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
-msgstr ""
-"<p><b>默认项失败时的备用引导项</b>包含了一个引导项编号列表,\n"
-"当默认引导项无法引导时,可使用该列表来引导。</p>"
+#: src/lib/bootloader/grub2.rb:235
+msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
+msgstr "不安装引导代码至 /boot 分区(<a href=\"enable_boot_boot\">安装</a>)"
-#: src/include/bootloader/grub/helps.rb:81
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>选择<b>引导时隐藏菜单</b>后将隐藏引导菜单。</p>"
+#: src/lib/bootloader/grub2.rb:241
+msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
+msgstr "安装引导代码至 \"/\" 分区(<a href=\"disable_boot_root\">不安装</a>)"
-#: src/include/bootloader/grub/helps.rb:84
-msgid ""
-"<p><b>Graphical Menu File</b> defines the file to use for the graphical boot "
-"menu.</p>"
-msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>"
+#: src/lib/bootloader/grub2.rb:246
+msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
+msgstr "不安装引导代码至 \"/\" 分区(<a href=\"enable_boot_root\">安装</a>)"
-#: src/include/bootloader/grub/helps.rb:87
-msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr "警告:没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面的位置。"
-#: src/include/bootloader/grub/helps.rb:90
-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>"
-msgstr ""
-"<p><b>使用密码保护引导加载器</b><br>\n"
-"定义用于访问引导菜单的密码。\n"
-"若您在 <b>重输密码</b> 中重复了它,YaST 将只接受该密码。</p>"
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
+msgid "Change Location: %s"
+msgstr "变动位置:%s"
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:97
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
+msgid "&Timeout in Seconds"
+msgstr "超时 (以秒计)(&T)"
+
+#: src/lib/bootloader/grub2_widgets.rb:57
msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"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.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
msgstr ""
-"<p><big><b>磁盘顺序</b></big><br>\n"
-"要根据 BIOS 中的顺序指定磁盘顺序,请使用\n"
-"<b>向上</b>和<b>向下</b>按钮来重新排列磁盘。\n"
-"要添加磁盘,请按<b>添加</b>。\n"
-"要移除磁盘,请按<b>移除</b>。</p>"
+"<p><b>超时(以秒计)</b><br>\n"
+"指定在默认内核加载前引导加载器将等待的时间。</p>\n"
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Boot Loader Locations"
-msgstr "引导加载器位置"
-
-#: src/include/bootloader/grub/helps.rb:109
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr "在分区表中为引导分区设置活动旗标(&A)"
-#: src/include/bootloader/grub/helps.rb:112
-#: src/include/bootloader/routines/common_helps.rb:29
-msgid "&Timeout in Seconds"
-msgstr "超时 (以秒计)(&T)"
+#: src/lib/bootloader/grub2_widgets.rb:93
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
+msgstr ""
+"<b>在分区表中为引导分区设置活动旗标</b><br>\n"
+"激活包含引导加载器的分区。\n"
+"之后通用 MBR 代码将引导活动分区。\n"
+"较旧的 BIOS 要求有一个活动分区,\n"
+"即使引导加载器安装在主引导记录中也是如此。</p>"
-#: src/include/bootloader/grub/helps.rb:113
-msgid "&Default Boot Section"
-msgstr "默认引导项(&D)"
-
-#: src/include/bootloader/grub/helps.rb:114
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
msgid "Write &generic Boot Code to MBR"
msgstr "将通用引导代码写入主引导记录(&G)"
-#: src/include/bootloader/grub/helps.rb:115
-msgid "Use &Trusted Grub"
-msgstr "使用信任的 Grub(&T)"
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
+msgstr "<p><b>将通用引导代码写入主引导记录</b>将使用通用代码 (用于引导活动分区的独立于操作系统的代码) 替换您磁盘的主引导记录。</p>"
-#: src/include/bootloader/grub/helps.rb:116
-msgid "Custom Boot Partition"
-msgstr "自定义引导分区"
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
+msgid "&Hide Menu on Boot"
+msgstr "引导时隐藏菜单(&H)"
-#: src/include/bootloader/grub/helps.rb:117
-msgid "Boot from Master Boot Record"
-msgstr "从主引导记录引导"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>选择<b>引导时隐藏菜单</b>后将隐藏引导菜单。</p>"
-#: src/include/bootloader/grub/helps.rb:118
-msgid "Boot from Root Partition"
-msgstr "从根分区引导"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+#, fuzzy
+#| msgid "Probe Foreign OS"
+msgid "Pro&be Foreign OS"
+msgstr "探测外来操作系统"
-#: src/include/bootloader/grub/helps.rb:119
-msgid "Boot from Boot Partition"
-msgstr "从引导分区引导"
+#: src/lib/bootloader/grub2_widgets.rb:176
+msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+msgstr "<p>可通过 os-prober <b>探测外来操作系统</b>以与其它外来操作系统多重引导</p>"
-#: src/include/bootloader/grub/helps.rb:120
-msgid "Boot from Extended Partition"
-msgstr "从扩展分区引导"
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
+msgid "O&ptional Kernel Command Line Parameter"
+msgstr "可选内核命令行参数(&P)"
-#: src/include/bootloader/grub/helps.rb:121
-msgid "Serial Connection &Parameters"
-msgstr "串行连接参数(&P)"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr "<p><b>可选内核命令行参数</b>可让您定义要传递给内核的额外参数。</p>"
-#: src/include/bootloader/grub/helps.rb:122
-msgid "Fallback Sections if Default fails"
-msgstr "默认引导项失败时的备用引导项"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+#, fuzzy
+#| msgid "Protective MBR flag"
+msgid "&Protective MBR flag"
+msgstr "保护性 MBR 旗标"
-#: src/include/bootloader/grub/helps.rb:123
-msgid "&Hide Menu on Boot"
-msgstr "引导时隐藏菜单(&H)"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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 "<p><b>保护性 MBR 旗标</b>是一个专家设置,仅在一些诡异的硬件上需要。细节请参考 GPT 磁盘中的保护性 MBR。若您不确定则请不要碰它。</p>"
-#: src/include/bootloader/grub/helps.rb:124
-msgid "Graphical &Menu File"
-msgstr "图形菜单文件(&M)"
+#. TRANSLATORS: set flag on disk
+#: src/lib/bootloader/grub2_widgets.rb:246
+msgid "set"
+msgstr "设置"
-#: src/include/bootloader/grub/helps.rb:125
-msgid "Pa&ssword for the Menu Interface"
-msgstr "菜单界面密码(&S)"
+#. TRANSLATORS: remove flag from disk
+#: src/lib/bootloader/grub2_widgets.rb:248
+msgid "remove"
+msgstr "移除"
-#: src/include/bootloader/grub/helps.rb:126
-msgid "Debugg&ing Flag"
-msgstr "调试旗标(&I)"
+#. TRANSLATORS: do not change flag on disk
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
+msgid "do not change"
+msgstr "不变动"
-#. encoding: utf-8
-#. File:
-#. modules/BootGRUB.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Module containing specific functions for GRUB configuration
-#. and installation
-#.
-#. Authors:
-#. Jiri Srain <jsrain(a)suse.cz>
-#. Joachim Plack <jplack(a)suse.de>
-#. Olaf Dabrunz <od(a)suse.de>
-#. Philipp Thomas <pth(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/options.rb:68
-msgid "Choose new graphical menu file"
-msgstr "选择新图形菜单文件"
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
+msgid "Enable &Secure Boot Support"
+msgstr "启用安全引导支持 (Secure Boot)"
-#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
-#: src/include/bootloader/grub/options.rb:129
-msgid "Enable Acoustic &Signals"
-msgstr "启用声音信号(&S)"
+#: src/lib/bootloader/grub2_widgets.rb:272
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "启用安全引导:%1"
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:254
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
+#, fuzzy
+#| msgid "Enable &Secure Boot Support"
+msgid "Enable &Trusted Boot Support"
+msgstr "启用安全引导支持 (Secure Boot)"
+
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
+msgstr ""
+
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
msgid "Prot&ect Boot Loader with Password"
msgstr "使用密码保护引导加载器(&E)"
-#. text entry
-#: src/include/bootloader/grub/options.rb:259
-msgid "&Password"
-msgstr "密码(&P)"
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
+msgid "P&rotect Entry Modification Only"
+msgstr "仅保护启动项不受修改(&r)"
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
+msgstr ""
+
#. text entry
-#: src/include/bootloader/grub/options.rb:262
+#: src/lib/bootloader/grub2_widgets.rb:339
msgid "Re&type Password"
msgstr "再次键入密码(&T)"
-#. Common widget of a console
-#. @return [Hash{String => Object}] CWS widget
-#: src/include/bootloader/grub/options.rb:359
-#: src/include/bootloader/grub2/options.rb:295
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "密码不能为空。"
+
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
+msgstr "'密码' 和 '再次键入密码' 中的内容不匹配。请再次键入密码。"
+
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"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>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
+msgstr ""
+
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
+msgid "Choose new graphical theme file"
+msgstr "选择新图形主题文件"
+
+#: src/lib/bootloader/grub2_widgets.rb:498
+msgid "Use &graphical console"
+msgstr "使用图形控制台(&G)"
+
+#: src/lib/bootloader/grub2_widgets.rb:503
+msgid "&Console resolution"
+msgstr "控制台分辨率(&C)"
+
+#: src/lib/bootloader/grub2_widgets.rb:508
+msgid "&Console theme"
+msgstr "控制台主题(&C)"
+
+#: src/lib/bootloader/grub2_widgets.rb:539
+msgid "Autodetect by grub2"
+msgstr "由 grub2 自动检测"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
msgid "Use &serial console"
msgstr "使用串行控制台(&S)"
-#: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:302
+#: src/lib/bootloader/grub2_widgets.rb:554
msgid "&Console arguments"
msgstr "控制台参数(&C)"
-#. textentry header
-#: src/include/bootloader/grub/options.rb:455
-msgid "&Device"
-msgstr "设备(&D)"
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+msgid "&Default Boot Section"
+msgstr "默认引导项(&D)"
-#. disabling & enabling up/down, do it after change
-#: src/include/bootloader/grub/options.rb:534
-msgid "Device map must contain at least one device"
-msgstr "设备映射必须包含至少一个设备"
+#: src/lib/bootloader/grub2_widgets.rb:575
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
+msgstr ""
+"<p>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
+"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系统。\n"
+"若超时前没有按下任何键,将引导默认内核或操作系统。\n"
+"引导加载器菜单中的引导项顺序可使用<b>向上</b>和<b>向下</b>按钮调整。</p>\n"
-#: src/include/bootloader/grub/options.rb:543
-msgid "D&isks"
-msgstr "磁盘(&I)"
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "引导加载器位置"
-#: src/include/bootloader/grub/options.rb:555
-msgid "&Up"
-msgstr "向上(&U)"
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
-#: src/include/bootloader/grub/options.rb:556
-msgid "&Down"
-msgstr "向下(&D)"
-
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:730
-msgid "Boot from &Root Partition"
-msgstr "从根分区引导(&R)"
-
-#: src/include/bootloader/grub/options.rb:731
+#: src/lib/bootloader/grub2_widgets.rb:692
msgid "Boo&t from Boot Partition"
msgstr "从引导分区引导(&T)"
-#: src/include/bootloader/grub/options.rb:739
-#: src/include/bootloader/grub/options.rb:766
-#: src/include/bootloader/grub/options.rb:801
-msgid "Boot Loader Location"
-msgstr "引导加载器位置"
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "从根分区引导"
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:772
-#: src/include/bootloader/grub/options.rb:807
+#: src/lib/bootloader/grub2_widgets.rb:694
msgid "Boot from &Master Boot Record"
msgstr "从主引导记录引导(&M)"
-#: src/include/bootloader/grub/options.rb:752
+#: src/lib/bootloader/grub2_widgets.rb:695
msgid "Boot from &Extended Partition"
msgstr "从扩展分区引导(&E)"
-#: src/include/bootloader/grub/options.rb:778
-#: src/include/bootloader/grub/options.rb:819
+#: src/lib/bootloader/grub2_widgets.rb:706
msgid "C&ustom Boot Partition"
msgstr "自定义引导分区(&U)"
-#: src/include/bootloader/grub/options.rb:812
-msgid "Enable Red&undancy for MD Array"
-msgstr "启用多设备 (MD) 阵列冗余(&U)"
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "磁盘顺序"
-#. push button
-#. push button
-#: src/include/bootloader/grub/options.rb:871
-#: src/include/bootloader/routines/global_widgets.rb:831
-msgid "Boot Loader Installation &Details"
-msgstr "引导加载器安装细节(&D)"
+#: src/lib/bootloader/grub2_widgets.rb:725
+msgid ""
+"<p><big><b>Disks Order</b></big><br>\n"
+"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.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
+msgstr ""
+"<p><big><b>磁盘顺序</b></big><br>\n"
+"要根据 BIOS 中的顺序指定磁盘顺序,请使用\n"
+"<b>向上</b>和<b>向下</b>按钮来重新排列磁盘。\n"
+"要添加磁盘,请按<b>添加</b>。\n"
+"要移除磁盘,请按<b>移除</b>。</p>"
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
-msgid "Boot Code Options"
-msgstr "引导代码选项"
-
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:82
-msgid "Kernel Parameters"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+#| msgid "Kernel Parameters"
+msgid "&Kernel Parameters"
msgstr "内核参数"
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:102
-msgid "Bootloader Options"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+#| msgid "Boot Code Options"
+msgid "Boot Co&de Options"
+msgstr "引导代码选项"
+
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+#| msgid "Bootloader Options"
+msgid "Boot&loader Options"
msgstr "引导加载器选项"
-#: src/include/bootloader/grub2/dialogs.rb:183
-msgid "Secure Boot"
-msgstr "安全引导 (Secure Boot)"
+#: src/lib/bootloader/grub2efi.rb:81
+msgid "Enable Secure Boot: %1"
+msgstr "启用安全引导:%1"
-#: src/include/bootloader/grub2/dialogs.rb:189
-msgid "Enable &Secure Boot Support"
-msgstr "启用安全引导支持 (Secure Boot)"
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "出于分区原因,无法正确安装引导加载器。"
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:262
-msgid "Boot &Loader Location"
-msgstr "引导加载器位置(&L)"
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "不安装任何引导加载器"
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:281
-msgid "Choose partition where is boot sequence installed."
-msgstr "请选择将安装引导程序的分区。"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "引导"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-#: src/include/bootloader/routines/section_helps.rb:33
-msgid ""
-"<p><b>Optional Kernel Command Line Parameter</b> lets you define additional "
-"parameters to pass to the kernel.</p>"
-msgstr "<p><b>可选内核命令行参数</b>可让您定义要传递给内核的额外参数。</p>"
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "引导(&B)"
-#: src/include/bootloader/grub2/helps.rb:26
-#: src/include/bootloader/routines/section_helps.rb:30
-msgid ""
-"<p><b>Vga Mode</b> defines the VGA mode the kernel should set the "
-"<i>console</i> to when booting.</p>"
-msgstr "<p><b>VGA 模式</b>定义了引导时内核应设置的<i>控制台</i> VGA 模式。</p>"
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "未选择安装任何引导加载器。您的系统可能无法引导。"
-#: src/include/bootloader/grub2/helps.rb:29
-msgid ""
-"<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe "
-"parameters to pass to the kernel.</p>"
-msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>"
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "出于分区原因,无法正确安装引导加载器"
-#: src/include/bootloader/grub2/helps.rb:32
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
msgid ""
-"<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other "
-"foreign distribution </p>"
-msgstr "<p>可通过 os-prober <b>探测外来操作系统</b>以与其它外来操作系统多重引导</p>"
+"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+"Reading current configuration...</P>"
+msgstr ""
+"<P><BIG><B>引导加载器配置工具</B></BIG><BR>\n"
+"修改您引导加载器的设置。</P>"
-#: src/include/bootloader/grub2/helps.rb:35
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
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>"
+"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
+"Please wait...<br></p>"
msgstr ""
-"<p><b>保护性 MBR 旗标</b>是一个专家设置,仅在一些诡异的硬件上需要。细节请参"
-"考 GPT 磁盘中的保护性 MBR。若您不确定则请不要碰它。</p>"
+"<P><B><BIG>正在保存引导加载器配置</BIG></B><BR>\n"
+"请稍候...<br></p>"
-#: src/include/bootloader/grub2/helps.rb:38
-msgid ""
-"<p><b>Distributor</b> specifies name of distributor of kernel used to create "
-"boot entry name. </p>"
-msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
+msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合"
-#: src/include/bootloader/grub2/helps.rb:44
-#: src/include/bootloader/routines/section_helps.rb:99
-msgid "O&ptional Kernel Command Line Parameter"
-msgstr "可选内核命令行参数(&P)"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+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 "从 MBR 引导不能与 btrfs 文件系统和没有 bios_grub 分区的 GPT 磁盘标签一起使用。要修复此问题,可创建 bios_grub 分区或使用任意 ext 文件系统作为引导分区,或不要把 stage 1 安装到 MBR。"
-#: src/include/bootloader/grub2/helps.rb:45
-msgid "D&istributor"
-msgstr "发行方(&I)"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。"
-#: src/include/bootloader/grub2/helps.rb:46
-#: src/include/bootloader/routines/section_helps.rb:98
-msgid "&Vga Mode"
-msgstr "&VGA 模式"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
+msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置,例如,主引导记录"
-#: src/include/bootloader/grub2/helps.rb:47
-msgid "&Failsafe Kernel Command Line Parameter"
-msgstr "安全模式内核命令行参数(&F)"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
+msgstr "缺失用于引导的 ext 分区。无法安装引导代码。"
-#: src/include/bootloader/grub2/helps.rb:48
-msgid "Probe Foreign OS"
-msgstr "探测外来操作系统"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
+msgstr "安装器未设置激活旗标。若根本未设置该旗标,某些 BIOS 可能会拒绝引导。"
-#: src/include/bootloader/grub2/helps.rb:49
-msgid "Protective MBR flag"
-msgstr "保护性 MBR 旗标"
+#: src/modules/BootSupportCheck.rb:207
+#, fuzzy
+#| msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
+msgstr "安装器将不会修改磁盘 MBR。除非它已包含了引导代码,否则 BIOS 将无法引导磁盘。"
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-#: src/include/bootloader/routines/section_widgets.rb:523
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2,%3 位 (模式 %4)"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "检查引导加载器"
-#: src/include/bootloader/grub2/options.rb:68
-#: src/include/bootloader/routines/section_widgets.rb:537
-msgid "Standard 8-pixel font mode."
-msgstr "标准 8 像素字体模式。"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "读取分区"
-#. item of a combo box
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-#: src/include/bootloader/routines/section_widgets.rb:540
-msgid "Text Mode"
-msgstr "文本模式"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "加载引导加载器设置"
-#: src/include/bootloader/grub2/options.rb:72
-#: src/include/bootloader/routines/section_widgets.rb:541
-msgid "Unspecified"
-msgstr "未指定"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "正在检查引导加载器..."
-#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
-msgid "set"
-msgstr "设置"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "正在读取分区..."
-#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
-msgid "remove"
-msgstr "移除"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "正在加载引导加载器设置..."
-#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
-msgid "do not change"
-msgstr "不变动"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "正在初始化引导加载器配置"
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:174
-msgid "Autodetect by grub2"
-msgstr "由 grub2 自动检测"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "创建 initrd"
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:249
-msgid "Choose new graphical theme file"
-msgstr "选择新图形主题文件"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
+#, fuzzy
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "保存引导加载器配置文件"
-#: src/include/bootloader/grub2/options.rb:261
-msgid "Use &graphical console"
-msgstr "使用图形控制台(&G)"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "正在创建 initrd..."
-#: src/include/bootloader/grub2/options.rb:268
-msgid "&Console resolution"
-msgstr "控制台分辨率(&C)"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
+#, fuzzy
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "正在保存引导加载器配置..."
-#: src/include/bootloader/grub2/options.rb:276
-msgid "&Console theme"
-msgstr "控制台主题(&C)"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "正在保存引导加载器配置"
-#. 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:169
-msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
-msgstr "不支持的引导加载器 '%s'。请调整您的 AutoYaST 方案。"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "引导加载器配置摘要"
-#. file open popup caption
-#. file open popup caption
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:102
-#: src/include/bootloader/routines/section_widgets.rb:265
-#: src/include/bootloader/routines/section_widgets.rb:279
-msgid "Select File"
-msgstr "选择文件"
+#~ msgid "Delete a global option or option of a section"
+#~ msgstr "删除全局选项或某引导项的选项"
-#. 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:90 src/modules/Bootloader.rb:270
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "引导分区类型是 NFS。无法安装引导加载器。"
+#~ msgid "Set a global option or option of a section"
+#~ msgstr "设置全局选项或某引导项的选项"
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:131
-msgid "Boot Loader Settings"
-msgstr "引导加载器设置"
+#~ msgid "Add a new section - please use interactive mode"
+#~ msgstr "添加新引导项 - 请使用交互模式"
-#. message
-#: src/include/bootloader/routines/dialogs.rb:159
-msgid "There are no options to set for the current boot loader."
-msgstr "没有要为当前引导加载器设置的选项。"
+#~ msgid "Print value of specified option"
+#~ msgstr "打印指定选项的值"
-#. heading
-#. heading
-#. heading
-#: src/include/bootloader/routines/dialogs.rb:177
-#: src/include/bootloader/routines/dialogs.rb:255
-#: src/include/bootloader/routines/dialogs.rb:325
-msgid "Kernel Section"
-msgstr "内核项"
+#~ msgid "The name of the section"
+#~ msgstr "引导项名称"
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#: src/include/bootloader/routines/dialogs.rb:183
-#: src/include/bootloader/routines/dialogs.rb:261
-#: src/include/bootloader/routines/dialogs.rb:331
-#: src/include/bootloader/routines/dialogs.rb:399
-#: src/include/bootloader/routines/dialogs.rb:474
-#: src/include/bootloader/routines/dialogs.rb:522
-#: src/include/bootloader/routines/dialogs.rb:581
-#: src/include/bootloader/routines/dialogs.rb:636
-msgid "Section Settings"
-msgstr "引导项设置"
+#~ msgid "The key of the option"
+#~ msgstr "选项的键"
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:231
-#: src/include/bootloader/routines/dialogs.rb:302
-#: src/include/bootloader/routines/dialogs.rb:370
-#: src/include/bootloader/routines/dialogs.rb:445
-#: src/include/bootloader/routines/dialogs.rb:494
-#: src/include/bootloader/routines/dialogs.rb:542
-#: src/include/bootloader/routines/dialogs.rb:605
-#: src/include/bootloader/routines/dialogs.rb:683
-#: src/include/bootloader/routines/dialogs.rb:721
-msgid "Boot Loader Settings: Section Management"
-msgstr "引导加载器设置:引导项管理"
+#~ msgid "The value of the option"
+#~ msgstr "选项的值"
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:393
-#: src/include/bootloader/routines/section_helps.rb:108
-#: src/include/bootloader/routines/section_widgets.rb:585
-msgid "Xen Section"
-msgstr "Xen 项"
+#~ msgid "Section %1 not found."
+#~ msgstr "未找到引导项 %1。"
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:468
-#: src/include/bootloader/routines/section_helps.rb:111
-#: src/include/bootloader/routines/section_helps.rb:121
-#: src/include/bootloader/routines/section_widgets.rb:591
-msgid "Menu Section"
-msgstr "菜单项"
+#~ msgid "Value was not specified."
+#~ msgstr "未指定值。"
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:516
-#: src/include/bootloader/routines/section_widgets.rb:593
-msgid "Dump Section"
-msgstr "转储项"
+#~ msgid "Add option is available only in commandline interactive mode"
+#~ msgstr "添加选项只在命令行交互模式中可用"
-#. label
-#. label
-#: src/include/bootloader/routines/dialogs.rb:573
-#: src/include/bootloader/routines/dialogs.rb:628
-msgid "Other System Section"
-msgstr "其它系统项"
+#~ msgid "Section name must be specified."
+#~ msgstr "必须指定引导项名称。"
-#. combobox label
-#: src/include/bootloader/routines/dialogs.rb:803
-msgid "&Filename"
-msgstr "文件名(&F)"
+#~ msgid "Option was not specified."
+#~ msgstr "未指定选项。"
-#. label. %1 is name of file (eg. /etc/lilo.conf
-#: src/include/bootloader/routines/dialogs.rb:811
-msgid "Filename: %1"
-msgstr "文件名:%1"
+#~ msgid "Specified option does not exist."
+#~ msgstr "指定选项不存在。"
-#. multiline edit header
-#: src/include/bootloader/routines/dialogs.rb:828
-msgid "Fi&le Contents"
-msgstr "文件内容(&L)"
+#~ msgid "Value: %1"
+#~ msgstr "值:%1"
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:836
-msgid "Expert Manual Configuration"
-msgstr "专家手动配置"
+#~ msgid "Boot Menu"
+#~ msgstr "引导菜单"
-#. sections list widget
-#. Refresh and redraw widget wits sections
-#. @param [Array<Hash{String => Object>}] sects list of current sections
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:114
-#: src/include/bootloader/routines/global_widgets.rb:641
-msgid "Other"
-msgstr "其它"
+#~ msgid "Boot Loader Options"
+#~ msgstr "引导加载器选项"
-#: src/include/bootloader/routines/global_widgets.rb:116
-msgid "Image"
-msgstr "映像"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>引导菜单</b></big><br></p>"
-#: src/include/bootloader/routines/global_widgets.rb:134
-msgid "Xen"
-msgstr "Xen"
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr "<p><b>从引导分区引导</b>是一个推荐选项,另一个是<b>从根分区引导</b>。</p>"
-#: src/include/bootloader/routines/global_widgets.rb:152
-msgid "Floppy"
-msgstr "软盘"
+#~ msgid ""
+#~ "<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
+#~ "It is recommended to install grub to MBR</p>"
+#~ msgstr ""
+#~ "<p><b>使用信任的 Grub</b>是指安装并使用信任的 grub。选项<i>图形菜单文件</i>将被忽略。\n"
+#~ "推荐将 grub 安装到主引导记录。</p>"
-#: src/include/bootloader/routines/global_widgets.rb:154
-msgid "Menu"
-msgstr "菜单"
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr "<p>若您计算机上还安装着另一个操作系统,则不推荐使用<b>从主引导记录引导</b>。</p>"
-#: src/include/bootloader/routines/global_widgets.rb:161
-msgid "Dump"
-msgstr "转储"
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "<p>当有合适的分区时,<b>从根分区引导</b>是推荐选项。\n"
+#~ "若需要更新主引导记录,可选择在<b>引导加载器选项</b>中<b>在分区表中为引导分区设置活动旗标</b>并<b>写入通用引导代码到主引导记录</b>。或者也可以配置您其它的引导管理器去启动此引导项。</p>"
-#. table header, Def stands for default
-#: src/include/bootloader/routines/global_widgets.rb:255
-msgid "Def."
-msgstr "默认"
+#~ msgid ""
+#~ "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
+#~ "logical partition and the /boot partition is missing</p>"
+#~ msgstr "若您的根分区位于逻辑分区上且没有 /boot 分区则应该选择<p><b>从扩展分区引导</b></p>"
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Label"
-msgstr "标签"
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p><b>自定义引导分区</b>可让您选择要从之引导的分区。</p>"
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:259
-#: src/include/bootloader/routines/global_widgets.rb:746
-msgid "Type"
-msgstr "类型"
+#~ msgid ""
+#~ "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
+#~ "enable to write GRUB to MBR of both disks.</p>"
+#~ msgstr "<p>多设备 (MD) 阵列由两个磁盘构建而成。激活<b>启用多设备阵列冗余</b>可将 GRUB 写入两个磁盘的主引导记录。</p>"
-#. table header; header for section details, either
-#. the specification of the kernel image to load,
-#. or the specification of device to boot from
-#: src/include/bootloader/routines/global_widgets.rb:263
-msgid "Image / Device"
-msgstr "映像 / 设备"
+#~ msgid ""
+#~ "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~ "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p><b>使用串行控制台</b>可让您定义用于串行控制台的参数。\n"
+#~ "细节请参考 grub 文档 (<code>info grub</code>)。</p>"
-#: src/include/bootloader/routines/global_widgets.rb:271
-msgid "Set as De&fault"
-msgstr "设置为默认(&F)"
+#~ 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>"
+#~ msgstr ""
+#~ "<p><b>定义终端</b></p><br>\n"
+#~ "定义您想要使用的终端类型。 \n"
+#~ "对于串行终端 (如串行控制台),您必须指定 <code>serial</code>。\n"
+#~ "您也可以向命令传递 <code>console</code> 参数,如 <code>serial console</code>。\n"
+#~ "在这种情况下,将把您在其中按下了任何键的终端选择为 GRUB 终端。</p>"
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:312
-msgid "&Boot Loader"
-msgstr "引导加载器(&B)"
+#~ msgid ""
+#~ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
+#~ "that will be used for booting in case the default section is unbootable.</p>"
+#~ msgstr ""
+#~ "<p><b>默认项失败时的备用引导项</b>包含了一个引导项编号列表,\n"
+#~ "当默认引导项无法引导时,可使用该列表来引导。</p>"
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:343
-msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
-msgstr ""
-"\n"
-"您若不安装任何引导加载器,系统可能无法启动。\n"
-"\n"
-"继续咩?后果很严重哦\n"
+#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
+#~ msgstr "<p><b>图形菜单文件</b>定义了要用于图形引导菜单的文件。</p>"
-#. warning - popup, followed by radio buttons
-#: src/include/bootloader/routines/global_widgets.rb:377
-msgid ""
-"\n"
-"You chose to change your boot loader. When converting \n"
-"the configuration, some settings might be lost.\n"
-"\n"
-"The current configuration will be saved and you can\n"
-"restore it if you return to the current boot loader.\n"
-"\n"
-"Select a course of action:\n"
-msgstr ""
-"\n"
-"您选择了修改您的引导加载器。\n"
-"当转换配置时,可能丢失一些设置。\n"
-"\n"
-"当前配置将被保存,若您后面再使用现在这个引导加载器时可以恢复当前配置。\n"
-"\n"
-"请选择一个动作:\n"
+#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
+#~ msgstr "<p><b>启用声音信号</b>开启/关闭声音信号。</p>"
-#. radiobutton
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:399
-#: src/include/bootloader/routines/global_widgets.rb:593
-msgid "&Propose New Configuration"
-msgstr "建议新配置(&P)"
+#~ 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>"
+#~ msgstr ""
+#~ "<p><b>使用密码保护引导加载器</b><br>\n"
+#~ "定义用于访问引导菜单的密码。\n"
+#~ "若您在 <b>重输密码</b> 中重复了它,YaST 将只接受该密码。</p>"
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:406
-msgid "Co&nvert Current Configuration"
-msgstr "转换当前配置(&N)"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "引导加载器位置"
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:415
-msgid "&Start New Configuration from Scratch"
-msgstr "从零开始新配置(&S)"
+#~ msgid "Use &Trusted Grub"
+#~ msgstr "使用信任的 Grub(&T)"
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:423
-msgid "&Read Configuration Saved on Disk"
-msgstr "读取保存在磁盘上的配置(&R)"
+#~ msgid "Custom Boot Partition"
+#~ msgstr "自定义引导分区"
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:433
-msgid "Res&tore Configuration Saved before Conversion"
-msgstr "恢复转换前保存的配置(&T)"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "从主引导记录引导"
-#. popup message
-#: src/include/bootloader/routines/global_widgets.rb:514
-msgid "Select the boot loader before editing sections."
-msgstr "在编辑各项前请选择引导加载器。"
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "从引导分区引导"
-#. pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:563
-#: src/include/bootloader/routines/global_widgets.rb:586
-msgid "E&dit Configuration Files"
-msgstr "编辑配置文件(&D)"
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "从扩展分区引导"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:600
-msgid "&Start from Scratch"
-msgstr "从零开始(&S)"
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "串行连接参数(&P)"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:608
-msgid "&Reread Configuration from Disk"
-msgstr "从磁盘重新读取配置(&R)"
+#~ msgid "Fallback Sections if Default fails"
+#~ msgstr "默认引导项失败时的备用引导项"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:625
-msgid "Restore MBR of Hard Disk"
-msgstr "恢复硬盘的主引导记录"
+#~ msgid "Graphical &Menu File"
+#~ msgstr "图形菜单文件(&M)"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:633
-msgid "Write bootloader boot code to disk"
-msgstr "将引导加载器引导代码写入磁盘"
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "菜单界面密码(&S)"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:665
-msgid "MBR restored successfully."
-msgstr "已成功恢复主引导记录。"
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "调试旗标(&I)"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:668
-msgid "Failed to restore MBR."
-msgstr "恢复主引导记录失败。"
+#~ msgid "Choose new graphical menu file"
+#~ msgstr "选择新图形菜单文件"
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:691
-msgid "Writing bootloader settings failed."
-msgstr "写入引导加载器设置失败。"
+#~ msgid "Enable Acoustic &Signals"
+#~ msgstr "启用声音信号(&S)"
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:730
-msgid "&Section Management"
-msgstr "引导项管理(&S)"
+#~ msgid "&Password"
+#~ msgstr "密码(&P)"
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:740
-msgid "Boot Loader &Installation"
-msgstr "引导加载器安装(&I)"
+#~ msgid "&Up"
+#~ msgstr "向上(&U)"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:818
-msgid "Boot &Loader Options"
-msgstr "引导加载器选项(&L)"
+#~ msgid "&Down"
+#~ msgstr "向下(&D)"
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
-msgid ""
-"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
-msgstr ""
-"<P><BIG><B>引导加载器配置工具</B></BIG><BR>\n"
-"修改您引导加载器的设置。</P>"
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "从根分区引导(&R)"
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
-msgid ""
-"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
-"Please wait...<br></p>"
-msgstr ""
-"<P><B><BIG>正在保存引导加载器配置</BIG></B><BR>\n"
-"请稍候...<br></p>"
+#~ msgid "Enable Red&undancy for MD Array"
+#~ msgstr "启用多设备 (MD) 阵列冗余(&U)"
-#. help text, optional part of following
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"If you have multiple Linux systems installed,\n"
-"YaST can try to find them and merge their menus."
-msgstr "若您安装了多个 Linux 系统,YaST 可以尝试查找它们并合并它们的菜单。"
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "引导加载器安装细节(&D)"
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:58
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the "
-"current \n"
-"configuration and propose a new configuration, start from scratch, or "
-"reread\n"
-"the configuration saved on your disk. %1</P>"
-msgstr ""
-"<P>从<B>其它</B>中,您可以手动编辑引导加载器配置文件,清除当前配置并提出一个"
-"新方案,从零开始新配置,或重新读取保存在您磁盘上的配置。%1</P>"
+#~ msgid "Secure Boot"
+#~ msgstr "安全引导 (Secure Boot)"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:73
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
-msgstr "<P>要手动编辑引导加载器配置文件,请点击<B>编辑配置文件</B>。</P>"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "引导加载器位置(&L)"
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:83
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr "<P>表格中的每项均代表了引导菜单中的一个引导项。</P>"
+#~ msgid "Choose partition where is boot sequence installed."
+#~ msgstr "请选择将安装引导程序的分区。"
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:87
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
-msgstr "<P>按<B>编辑</B>可显示所选引导项的属性。</P>"
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>VGA 模式</b>定义了引导时内核应设置的<i>控制台</i> VGA 模式。</p>"
-#. help 3/4
-#: src/include/bootloader/routines/helps.rb:91
-msgid ""
-"<P> By pressing <b>Set as Default</b>, mark the selected \n"
-"section as default. When booting, the boot loader will provide \n"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
-msgstr ""
-"<P>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
-"当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系"
-"统。\n"
-"若超时前没有按下任何键,将引导默认内核或操作系统。\n"
-"引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>"
+#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
+#~ msgstr "<p><b>安全模式内核命令行参数</b>可让您定义要传递给内核的安全模式参数。</p>"
-#. help 4/4
-#: src/include/bootloader/routines/helps.rb:100
-msgid ""
-"<P>Press <B>Add</B> to create a new boot loader section\n"
-"or <B>Delete</B> to delete the selected section.</P>"
-msgstr ""
-"<P>按<B>添加</B>可创建一个新引导加载器引导项,\n"
-"按<B>删除</B>可删除所选引导项。</P>"
+#~ msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
+#~ msgstr "<p><b>发行方</b>指定了用于创建引导项名称的内核发行方名称。</p>"
-#. 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:115
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
-msgstr ""
-"<p><big><b>引导加载器位置</b></big><br>\n"
-"引导管理器 (%1) 可以以下方式安装:</p>"
+#~ msgid "D&istributor"
+#~ msgstr "发行方(&I)"
-#. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:124
-msgid ""
-"<p>- In the <b>Master Boot Record</b> (MBR).\n"
-"This is not recommended if there is another operating system installed\n"
-"on the computer.</p>"
-msgstr ""
-"<p>- 在<b>主引导记录</b> (MBR) 中。\n"
-"若计算机上安装了其它操作系统则不推荐此方法。</p>"
+#~ msgid "&Vga Mode"
+#~ msgstr "&VGA 模式"
-#. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:134
-msgid ""
-"<p>\n"
-"- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
-"partition. This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</"
-"b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- 在 <tt>/boot</tt> 或 <tt>/</tt>(根) 分区的<b>引导扇区</b>中。\n"
-"这是当有合适的分区存在时的推荐选项。\n"
-"若需要更新主引导记录,可以在<b>引导加载器安装细节</b>中设置<b>激活引导加载器"
-"分区</b>\n"
-"和<b>使用通用代码替换主引导记录</b>。\n"
-"或者也可以配置您其它的引导管理器去启动 &product;。</p>"
+#~ msgid "&Failsafe Kernel Command Line Parameter"
+#~ msgstr "安全模式内核命令行参数(&F)"
-#. custom bootloader help text, 4 of 7
-#. this part will only be shown if a floppy drive is attached.
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>\n"
-"- On a <b>Floppy Disk</b>.\n"
-"Use this to avoid the risk of interfering with an already existing\n"
-"boot mechanism. Enable booting from floppy disk in\n"
-"the BIOS of your machine to use this option.</p>"
-msgstr ""
-"<p>\n"
-"- 在<b>软盘</b>上。\n"
-"可使用此选项规避干扰已存在的引导机制的风险。\n"
-"请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>"
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2,%3 位 (模式 %4)"
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:164
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- 在某些<b>其它</b>分区中。\n"
-"当选择此选项时请考虑到您系统的限制。</p>"
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "标准 8 像素字体模式。"
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:174
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>例如,多数 PC 均有 BIOS 限制只能引导硬盘柱面小于 1024 的分区。\n"
-"取决于所用的引导管理器,您可能能够也可能不能从一个逻辑分区引导。</p>"
+#~ msgid "Text Mode"
+#~ msgstr "文本模式"
-#. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:186
-msgid ""
-"<p>\n"
-"Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"请在输入字段中输入分区的设备名 (例如,<tt>/dev/hda3</tt> 或 <tt>/dev/sdb</"
-"tt>)。</p>"
+#~ msgid "Unspecified"
+#~ msgstr "未指定"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:199
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><b>引导加载器安装细节</b><br>\n"
-"要调整高级引导加载器安装选项 (诸如设备映射),\n"
-"请点击<b>引导加载器安装细节</b>。</p>"
+#~ msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
+#~ msgstr "不支持的引导加载器 '%s'。请调整您的 AutoYaST 方案。"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:210
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><b>引导加载器类型</b><br>\n"
-"要选择是否安装引导加载器以及安装哪个引导加载器,请使用<b>引导加载器</b>。</p>"
+#~ msgid "Select File"
+#~ msgstr "选择文件"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:222
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><b>引导加载器选项</b><br>\n"
-"要调整引导加载器的选项,诸如超时,请点击<b>引导加载器选项</b>。</p>"
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "没有要为当前引导加载器设置的选项。"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:233
-msgid ""
-"<P><B>Expert Manual Configuration</B><BR>\n"
-"Here, manually edit the boot loader configuration.</P>\n"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>专家手动配置</B><BR>\n"
-"在此处手动编辑引导加载器配置。</P>\n"
-"<P>注意:最终配置文件中的缩进可能有所不同。</P>"
+#~ msgid "Kernel Section"
+#~ msgstr "内核项"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:244
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The "
-"section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b>引导项名称</b><br>\n"
-"请使用<b>引导项名称</b>来指定引导加载器引导项的名称。\n"
-"引导项必须是唯一。</p>"
+#~ msgid "Section Settings"
+#~ msgstr "引导项设置"
-#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:255
-msgid ""
-"<p><big><b>Type of the New Section</b></big><br>\n"
-"Select the type of the new section to create.</p>"
-msgstr ""
-"<p><big><b>新引导项类型</b></big><br>\n"
-"选择要创建的新引导项类型。</p>"
+#~ msgid "Boot Loader Settings: Section Management"
+#~ msgstr "引导加载器设置:引导项管理"
-#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:259
-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"
-"selected section.</p>"
-msgstr ""
-"<p>可选择<b>克隆所选引导项</b>克隆当前所选引导项目。\n"
-"然后再修改应与所选引导项不同的选项。</p>"
+#~ msgid "Xen Section"
+#~ msgstr "Xen 项"
-#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:265
-msgid ""
-"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
-"to load and start.</p>"
-msgstr "<p>选择<b>映像项</b>可添加一个新的 Linux 内核或其它要加载并启动的映像。</p>"
+#~ msgid "Menu Section"
+#~ msgstr "菜单项"
-#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:269
-msgid ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像,但需要在 XEN 环境中启"
-"动它。</p>"
+#~ msgid "Dump Section"
+#~ msgstr "转储项"
-#. help text 5/5
-#: src/include/bootloader/routines/helps.rb:273
-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"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区"
-"的项。\n"
-"这用于引导其它操作系统。</p>"
+#~ msgid "Other System Section"
+#~ msgstr "其它系统项"
-#: src/include/bootloader/routines/helps.rb:278
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the "
-"disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>选择<b>菜单项</b>可添加一个从磁盘某分区加载配置文件 (引导项列表)的项。\n"
-"这用于引导其它操作系统。</p>"
+#~ msgid "&Filename"
+#~ msgstr "文件名(&F)"
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:697
-msgid "Order of Hard Disks: %1"
-msgstr "硬盘顺序:%1"
+#~ msgid "Filename: %1"
+#~ msgstr "文件名:%1"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:48
-msgid "Do not install any boot loader"
-msgstr "不安装任何引导加载器"
+#~ msgid "Fi&le Contents"
+#~ msgstr "文件内容(&L)"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:50
-msgid "Do Not Install Any Boot Loader"
-msgstr "不安装任何引导加载器"
+#~ msgid "Expert Manual Configuration"
+#~ msgstr "专家手动配置"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:55
-msgid "Install the default boot loader"
-msgstr "安装默认引导加载器"
+#~ msgid "Other"
+#~ msgstr "其它"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:57
-msgid "Install Default Boot Loader"
-msgstr "安装默认引导加载器"
+#~ msgid "Image"
+#~ msgstr "映像"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:61
-msgid "Boot loader"
-msgstr "引导加载器"
+#~ msgid "Xen"
+#~ msgstr "Xen"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Boot Loader"
-msgstr "引导加载器"
+#~ msgid "Floppy"
+#~ msgstr "软盘"
-#. popup, %1 is bootloader name
-#: src/include/bootloader/routines/misc.rb:101
-msgid "The %1 boot sector has been written to the floppy disk."
-msgstr "已将 %1 引导扇区写入软盘。"
+#~ msgid "Menu"
+#~ msgstr "菜单"
-#. popup - continuing
-#: src/include/bootloader/routines/misc.rb:113
-msgid "Leave the floppy disk in the drive."
-msgstr "请将软盘留在驱动器中。"
+#~ msgid "Dump"
+#~ msgstr "转储"
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr "若未指定引导加载器则此功能不可用。"
+#~ msgid "Def."
+#~ msgstr "默认"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"真的不保存就离开引导加载器配置界面吗?\n"
-"全部修改均将不复存在。\n"
+#~ msgid "Label"
+#~ msgstr "标签"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:59
-msgid "Really delete section %1?"
-msgstr "真的删除引导项 %1 吗?"
+#~ msgid "Type"
+#~ msgstr "类型"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:65
-msgid "The password must not be empty."
-msgstr "密码不能为空。"
+#~ msgid "Image / Device"
+#~ msgstr "映像 / 设备"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:74
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr "'密码' 和 '再次键入密码' 中的内容不匹配。请再次键入密码。"
+#~ msgid "Set as De&fault"
+#~ msgstr "设置为默认(&F)"
-#. message popup, %1 is sectino label
-#: src/include/bootloader/routines/popups.rb:88
-msgid ""
-"The disk settings have changed.\n"
-"Check section %1 settings.\n"
-msgstr ""
-"磁盘设置已修改。\n"
-"请检查引导项 %1 的设置。\n"
+#~ msgid ""
+#~ "\n"
+#~ "You chose to change your boot loader. When converting \n"
+#~ "the configuration, some settings might be lost.\n"
+#~ "\n"
+#~ "The current configuration will be saved and you can\n"
+#~ "restore it if you return to the current boot loader.\n"
+#~ "\n"
+#~ "Select a course of action:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "您选择了修改您的引导加载器。\n"
+#~ "当转换配置时,可能丢失一些设置。\n"
+#~ "\n"
+#~ "当前配置将被保存,若您后面再使用现在这个引导加载器时可以恢复当前配置。\n"
+#~ "\n"
+#~ "请选择一个动作:\n"
-#. message popup
-#: src/include/bootloader/routines/popups.rb:100
-msgid ""
-"The disk settings have changed and you edited boot loader\n"
-"configuration files manually. Check the boot loader settings.\n"
-msgstr ""
-"磁盘设置已修改并且您手动编辑了引导加载器配置文件。\n"
-"请检查引导加载器设置。\n"
+#~ msgid "&Propose New Configuration"
+#~ msgstr "建议新配置(&P)"
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:116
-msgid "%1Set default boot loader location?\n"
-msgstr "%1 设置默认引导装载器位置吗?\n"
+#~ msgid "Co&nvert Current Configuration"
+#~ msgstr "转换当前配置(&N)"
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:128
-msgid "Do Not Create a File System"
-msgstr "不创建文件系统"
+#~ msgid "&Start New Configuration from Scratch"
+#~ msgstr "从零开始新配置(&S)"
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:130
-msgid "Create an ext2 File System"
-msgstr "创建 ext2 文件系统"
+#~ msgid "&Read Configuration Saved on Disk"
+#~ msgstr "读取保存在磁盘上的配置(&R)"
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:136
-msgid "Create a FAT File System"
-msgstr "创建 FAT 文件系统"
+#~ msgid "Res&tore Configuration Saved before Conversion"
+#~ msgstr "恢复转换前保存的配置(&T)"
-#. label
-#: src/include/bootloader/routines/popups.rb:142
-msgid ""
-"The boot loader boot sector will be written\n"
-"to a floppy disk. Insert a floppy disk\n"
-"and confirm with OK.\n"
-msgstr ""
-"引导加载器引导扇区将被写入到一张软盘。\n"
-"请插入软盘并按「好呢」确认。\n"
+#~ msgid "Select the boot loader before editing sections."
+#~ msgstr "在编辑各项前请选择引导加载器。"
-#. checkbox
-#: src/include/bootloader/routines/popups.rb:150
-msgid "&Low Level Format"
-msgstr "低级格式化(&L)"
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "编辑配置文件(&D)"
-#. combobox
-#: src/include/bootloader/routines/popups.rb:153
-msgid "&Create File System"
-msgstr "创建文件系统(&C)"
+#~ msgid "&Start from Scratch"
+#~ msgstr "从零开始(&S)"
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:182
-msgid "Low level format failed. Try again?"
-msgstr "低级格式化失败。重试吗?"
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "从磁盘重新读取配置(&R)"
-#. error report
-#. error report
-#: src/include/bootloader/routines/popups.rb:195
-#: src/include/bootloader/routines/popups.rb:207
-msgid "Creating file system failed."
-msgstr "创建文件系统失败。"
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "恢复硬盘的主引导记录"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:218
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"所选名称已在使用。\n"
-"请使用其它名称。\n"
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "将引导加载器引导代码写入磁盘"
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:229
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"引导加载器安装期间出错。\n"
-"重试引导加载器配置吗?\n"
+#~ msgid "MBR restored successfully."
+#~ msgstr "已成功恢复主引导记录。"
-#. FIXME too generic, but was already translated
-#: src/include/bootloader/routines/popups.rb:241
-msgid "Unable to install the boot loader."
-msgstr "无法安装引导加载器。"
+#~ msgid "Failed to restore MBR."
+#~ msgstr "恢复主引导记录失败。"
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:283
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"警告!\n"
-"\n"
-"目前 %1 主引导记录将被保存在 %2 的主引导记录覆盖。\n"
-"\n"
-"只有主引导记录中的引导代码会被覆盖。\n"
-"分区表仍将保持不变。\n"
-"\n"
-"继续吗?\n"
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "写入引导加载器设置失败。"
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:305
-msgid "&Yes, Rewrite"
-msgstr "是,覆盖(&Y)"
+#~ msgid "&Section Management"
+#~ msgstr "引导项管理(&S)"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/routines/section_helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader section widgets
-#.
-#. Authors:
-#. Josef Reidinger <jreidinger(a)suse.cz>
-#.
-#. $Id$
-#: src/include/bootloader/routines/section_helps.rb:23
-msgid "<p><b>Image Section</b></p>"
-msgstr "<p><b>映像项</b></p>"
+#~ msgid "Boot Loader &Installation"
+#~ msgstr "引导加载器安装(&I)"
-#: src/include/bootloader/routines/section_helps.rb:24
-msgid ""
-"<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name "
-"directly or choose via <b>Browse</b>.</p>"
-msgstr ""
-"<p><b>内核映像</b>定义了要引导的内核。可直接输入名称,或通过<b>浏览</b>选择。"
-"</p>"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "引导加载器选项(&L)"
-#: src/include/bootloader/routines/section_helps.rb:27
-msgid ""
-"<p><b>Root Device</b> sets the device to pass to the kernel as root device.</"
-"p>"
-msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>"
+#~ msgid ""
+#~ "If you have multiple Linux systems installed,\n"
+#~ "YaST can try to find them and merge their menus."
+#~ msgstr "若您安装了多个 Linux 系统,YaST 可以尝试查找它们并合并它们的菜单。"
-#: src/include/bootloader/routines/section_helps.rb:36
-msgid ""
-"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to "
-"use. Either enter the path and file name\n"
-"directly or choose by using <b>Browse</b>.</p>\n"
-msgstr ""
-"<p><b>初始内存磁盘</b>,若非空则定义了要使用的初始 ramdisk。\n"
-"可直接输入路径和文件名或通过<b>浏览</b>选择。</p>\n"
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr "<P>从<B>其它</B>中,您可以手动编辑引导加载器配置文件,清除当前配置并提出一个新方案,从零开始新配置,或重新读取保存在您磁盘上的配置。%1</P>"
-#: src/include/bootloader/routines/section_helps.rb:39
-msgid ""
-"<p>Select <b>Chainloader Section</b> if you want to define a section for "
-"booting an OS other than Linux.</p>"
-msgstr ""
-"<p>若您想要定义一个引导非 Linux 操作系统的引导项,请选择<b>链式加载器项</b>。"
-"</p>"
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr "<P>要手动编辑引导加载器配置文件,请点击<B>编辑配置文件</B>。</P>"
-#: src/include/bootloader/routines/section_helps.rb:42
-msgid ""
-"<p>Setting <b>Use Password Protection</p> will require a password to select "
-"this section.</p>"
-msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>"
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr "<P>表格中的每项均代表了引导菜单中的一个引导项。</P>"
-#: src/include/bootloader/routines/section_helps.rb:45
-msgid ""
-"<p><b>Other System</b> lets you choose among the non-Linux operating systems "
-"found on your computer.</p>"
-msgstr "<p><b>其它系统</b>可让您从您计算机上发现的非 Linux 操作系统中选择。</p>"
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr "<P>按<B>编辑</B>可显示所选引导项的属性。</P>"
-#: src/include/bootloader/routines/section_helps.rb:48
-msgid ""
-"<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS "
-"needs this flag set in order to boot it</p>"
-msgstr ""
-"<p>若您 BIOS 需要设置此旗标才能引导之,请选择<b>当选为引导分区时激活此分区</"
-"b></p>"
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P>按<b>设置为默认</b>您可以将所选引导项标记为默认引导项。\n"
+#~ "当引导时,引导加载器将提供一个引导菜单并等待用户选择一个要引导的内核或操作系统。\n"
+#~ "若超时前没有按下任何键,将引导默认内核或操作系统。\n"
+#~ "引导加载器菜单中的引导项顺序客使用<b>向上</b>和<b>向下</b>按钮调整。</P>"
-#: src/include/bootloader/routines/section_helps.rb:51
-msgid ""
-"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks "
-"to boot. In most cases you want\n"
-"to specify <code>+1</code> here. For specifics on blocklist notation see the "
-"grub documentation.</p>\n"
-msgstr ""
-"<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n"
-"在多数情况下您需要在此指定 <code>+1</code>。 \n"
-"有关块列表的规范请参考 grub 文档。</p>\n"
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>按<B>添加</B>可创建一个新引导加载器引导项,\n"
+#~ "按<B>删除</B>可删除所选引导项。</P>"
-#: src/include/bootloader/routines/section_helps.rb:54
-msgid ""
-"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other "
-"image \n"
-"and start it in a Xen environment.</p>\n"
-msgstr ""
-"<p>若您想要添加一个新 Linux 内核或其它映像并在 Xen 环境中启动之,请选择 "
-"<b>Xen 项</b>。</p>\n"
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>引导加载器位置</b></big><br>\n"
+#~ "引导管理器 (%1) 可以以下方式安装:</p>"
-#: src/include/bootloader/routines/section_helps.rb:57
-msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>"
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- 在<b>主引导记录</b> (MBR) 中。\n"
+#~ "若计算机上安装了其它操作系统则不推荐此方法。</p>"
-#: src/include/bootloader/routines/section_helps.rb:60
-msgid ""
-"<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional "
-"parameters to pass to the xen hypervisor.</p>"
-msgstr "<p><b>Xen 管理程序额外参数</b>可让您定义要传递给 xen 管理程序的额外参数。</p>"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition. This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 在 <tt>/boot</tt> 或 <tt>/</tt>(根) 分区的<b>引导扇区</b>中。\n"
+#~ "这是当有合适的分区存在时的推荐选项。\n"
+#~ "若需要更新主引导记录,可以在<b>引导加载器安装细节</b>中设置<b>激活引导加载器分区</b>\n"
+#~ "和<b>使用通用代码替换主引导记录</b>。\n"
+#~ "或者也可以配置您其它的引导管理器去启动 &product;。</p>"
-#: src/include/bootloader/routines/section_helps.rb:63
-msgid "<p><b>Menu Section</b></p>"
-msgstr "<p><b>菜单项</b></p>"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- On a <b>Floppy Disk</b>.\n"
+#~ "Use this to avoid the risk of interfering with an already existing\n"
+#~ "boot mechanism. Enable booting from floppy disk in\n"
+#~ "the BIOS of your machine to use this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 在<b>软盘</b>上。\n"
+#~ "可使用此选项规避干扰已存在的引导机制的风险。\n"
+#~ "请先在您计算机的 BIOS 中启用从软盘引导再使用此选项。</p>"
-#: src/include/bootloader/routines/section_helps.rb:64
-msgid "<p><b>Partition of Menu File</b></p>"
-msgstr "<p><b>菜单文件的分区</b></p>"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- 在某些<b>其它</b>分区中。\n"
+#~ "当选择此选项时请考虑到您系统的限制。</p>"
-#: src/include/bootloader/routines/section_helps.rb:65
-msgid ""
-"<p><b>Menu Description File</b> specifies path on root device from which is "
-"loaded menu file.</p>"
-msgstr "<p><b>菜单描述文件</b>指定了从其加载菜单文件的根设备路径。</p>"
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>例如,多数 PC 均有 BIOS 限制只能引导硬盘柱面小于 1024 的分区。\n"
+#~ "取决于所用的引导管理器,您可能能够也可能不能从一个逻辑分区引导。</p>"
-#: src/include/bootloader/routines/section_helps.rb:68
-msgid ""
-"<p><b>Map Section to the First Disk from Device Map</b> Windows usually need "
-"to be on the first disk.</p>"
-msgstr ""
-"<p><b>映射引导项到设备映射中的第一个磁盘</b> Windows 通常需要在第一个磁盘上。"
-"</p>l"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "请在输入字段中输入分区的设备名 (例如,<tt>/dev/hda3</tt> 或 <tt>/dev/sdb</tt>)。</p>"
-#: src/include/bootloader/routines/section_helps.rb:71
-msgid ""
-"<p><b>Measures</b> includes measured files with PCR. Change table is "
-"possible via buttons: <b>Add</b> , \n"
-"<b>Edit</b> and <b>Delete</b></p>"
-msgstr ""
-"<p><b>测量</b> 包含了用于 PCR 的测量文件。\n"
-"可通过 <b>添加</b>,<b>编辑</b>和<b>删除</b>修改表格。</p>"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>引导加载器安装细节</b><br>\n"
+#~ "要调整高级引导加载器安装选项 (诸如设备映射),\n"
+#~ "请点击<b>引导加载器安装细节</b>。</p>"
-#: src/include/bootloader/routines/section_helps.rb:74
-msgid ""
-"<p><b>Allow attempt to relocate</b>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>允许尝试重新定位</b>\n"
-"通常在全局项中指定</p>"
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>引导加载器选项</b><br>\n"
+#~ "要调整引导加载器的选项,诸如超时,请点击<b>引导加载器选项</b>。</p>"
-#: src/include/bootloader/routines/section_helps.rb:77
-msgid ""
-"<p><b>Force root filesystem to be mounted read-only</b><br>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>强制只读挂载根文件系统</b><br>\n"
-"通常在全局项中指定</p>"
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>专家手动配置</B><BR>\n"
+#~ "在此处手动编辑引导加载器配置。</P>\n"
+#~ "<P>注意:最终配置文件中的缩进可能有所不同。</P>"
-#: src/include/bootloader/routines/section_helps.rb:80
-msgid ""
-"<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
-"create a system dump either on a DASD disk partition or tape device or to a\n"
-"file on a SCSI disk partition.</p>"
-msgstr ""
-"<p>选择<b>转储项</b>来添加一个指定了如何\n"
-"在 DASD 磁盘分区、磁带设备或者 SCSI 磁盘分区的文件中创建系统转储的项。</p>"
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b>引导项名称</b><br>\n"
+#~ "请使用<b>引导项名称</b>来指定引导加载器引导项的名称。\n"
+#~ "引导项必须是唯一。</p>"
-#: src/include/bootloader/routines/section_helps.rb:85
-msgid ""
-"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
-"Menu sections represent a list of tasks which are grouped together.</p>\n"
-msgstr ""
-"<p>选择<b>菜单项</b>来添加一个新菜单到配置。\n"
-"菜单项代表了一系列组合在一起的任务。</p>\n"
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><big><b>新引导项类型</b></big><br>\n"
+#~ "选择要创建的新引导项类型。</p>"
-#: src/include/bootloader/routines/section_helps.rb:88
-msgid ""
-"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to "
-"enable the SELinux security framework. \n"
-"Please note that this will also disable AppArmor.</p>"
-msgstr ""
-"<p>选择<b>启用 SELinux</b> 来添加必要的内核引导参数来启用 SELinux 安全框"
-"架。\n"
-"请注意这也将禁用 AppArmor。</p>"
+#~ 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"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>可选择<b>克隆所选引导项</b>克隆当前所选引导项目。\n"
+#~ "然后再修改应与所选引导项不同的选项。</p>"
-#. radio button
-#: src/include/bootloader/routines/section_helps.rb:95
-#: src/include/bootloader/routines/section_widgets.rb:583
-msgid "Image Section"
-msgstr "映像项"
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr "<p>选择<b>映像项</b>可添加一个新的 Linux 内核或其它要加载并启动的映像。</p>"
-#: src/include/bootloader/routines/section_helps.rb:96
-msgid "&Kernel Image"
-msgstr "内核映像(&K)"
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr "<p>选择 <b>Xen 项</b>也可添加新的 Linux 内核或其它映像,但需要在 XEN 环境中启动它。</p>"
-#: src/include/bootloader/routines/section_helps.rb:97
-msgid "&Root Device"
-msgstr "根设备(&R)"
+#~ 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"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>其它系统 (链式加载器) </b>可添加一个加载并启动磁盘某分区的引导扇区的项。\n"
+#~ "这用于引导其它操作系统。</p>"
-#: src/include/bootloader/routines/section_helps.rb:100
-msgid "&Initial RAM Disk"
-msgstr "初始内存磁盘(&I)"
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>菜单项</b>可添加一个从磁盘某分区加载配置文件 (引导项列表)的项。\n"
+#~ "这用于引导其它操作系统。</p>"
-#: src/include/bootloader/routines/section_helps.rb:101
-msgid "Chainloader Section"
-msgstr "链式加载器项"
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "不安装任何引导加载器"
-#: src/include/bootloader/routines/section_helps.rb:102
-msgid "Use Password Protection"
-msgstr "使用密码保护"
+#~ msgid "Install the default boot loader"
+#~ msgstr "安装默认引导加载器"
-#: src/include/bootloader/routines/section_helps.rb:103
-msgid "&Other System"
-msgstr "其它系统(&O)"
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "安装默认引导加载器"
-#: src/include/bootloader/routines/section_helps.rb:104
-msgid "Do not &verify Filesystem before Booting"
-msgstr "引导前不校验文件系统(&V)"
+#~ msgid "Boot loader"
+#~ msgstr "引导加载器"
-#: src/include/bootloader/routines/section_helps.rb:105
-msgid "&Activate this Partition when selected for Boot"
-msgstr "当选为引导分区时激活此分区(&A)"
+#~ msgid "Boot Loader"
+#~ msgstr "引导加载器"
-#: src/include/bootloader/routines/section_helps.rb:106
-msgid "B&lock Offset for Chainloading"
-msgstr "阻止链式加载的偏移(&L)"
+#~ msgid "The %1 boot sector has been written to the floppy disk."
+#~ msgstr "已将 %1 引导扇区写入软盘。"
-#: src/include/bootloader/routines/section_helps.rb:107
-msgid "&Map Section to the First Disk in Device Map"
-msgstr "映射引导项到设备映射中的第一个磁盘(&M)"
+#~ msgid "Leave the floppy disk in the drive."
+#~ msgstr "请将软盘留在驱动器中。"
-#: src/include/bootloader/routines/section_helps.rb:109
-msgid "&Hypervisor"
-msgstr "管理程序(&H)"
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr "若未指定引导加载器则此功能不可用。"
-#: src/include/bootloader/routines/section_helps.rb:110
-msgid "&Additional Xen Hypervisor Parameters"
-msgstr "Xen 管理程序额外参数(&A)"
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "真的不保存就离开引导加载器配置界面吗?\n"
+#~ "全部修改均将不复存在。\n"
-#: src/include/bootloader/routines/section_helps.rb:112
-msgid "&Partition of Menu File"
-msgstr "菜单文件的分区(&P)"
+#~ msgid "Really delete section %1?"
+#~ msgstr "真的删除引导项 %1 吗?"
-#: src/include/bootloader/routines/section_helps.rb:113
-msgid "&Menu Description File"
-msgstr "菜单描述文件(&M)"
+#~ msgid ""
+#~ "The disk settings have changed.\n"
+#~ "Check section %1 settings.\n"
+#~ msgstr ""
+#~ "磁盘设置已修改。\n"
+#~ "请检查引导项 %1 的设置。\n"
-#: src/include/bootloader/routines/section_helps.rb:114
-msgid "&Force root filesystem to be mounted read-only"
-msgstr "强制只读挂载根文件系统(&F)"
+#~ msgid ""
+#~ "The disk settings have changed and you edited boot loader\n"
+#~ "configuration files manually. Check the boot loader settings.\n"
+#~ msgstr ""
+#~ "磁盘设置已修改并且您手动编辑了引导加载器配置文件。\n"
+#~ "请检查引导加载器设置。\n"
-#: src/include/bootloader/routines/section_helps.rb:115
-msgid "Allow attempt to &relocate"
-msgstr "允许尝试重新定位(&R)"
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "%1 设置默认引导装载器位置吗?\n"
-#: src/include/bootloader/routines/section_helps.rb:116
-msgid "Tar&get Directory for Section"
-msgstr "引导项目标文件夹(&G)"
+#~ msgid "Do Not Create a File System"
+#~ msgstr "不创建文件系统"
-#: src/include/bootloader/routines/section_helps.rb:117
-msgid "Op&tional Parameter File"
-msgstr "可选参数文件(&T)"
+#~ msgid "Create an ext2 File System"
+#~ msgstr "创建 ext2 文件系统"
-#: src/include/bootloader/routines/section_helps.rb:118
-msgid "Dump Section (obsolete)"
-msgstr "转储项目(淘汰)"
+#~ msgid "Create a FAT File System"
+#~ msgstr "创建 FAT 文件系统"
-#: src/include/bootloader/routines/section_helps.rb:119
-msgid "&Dump Device"
-msgstr "转储设备(&D)"
+#~ msgid ""
+#~ "The boot loader boot sector will be written\n"
+#~ "to a floppy disk. Insert a floppy disk\n"
+#~ "and confirm with OK.\n"
+#~ msgstr ""
+#~ "引导加载器引导扇区将被写入到一张软盘。\n"
+#~ "请插入软盘并按「好呢」确认。\n"
-#: src/include/bootloader/routines/section_helps.rb:120
-msgid "&SCSI Dump Device"
-msgstr "&SCSI 转储设备"
+#~ msgid "&Low Level Format"
+#~ msgstr "低级格式化(&L)"
-#: src/include/bootloader/routines/section_helps.rb:122
-msgid "&List of Menu Entries"
-msgstr "菜单项列表(&L)"
+#~ msgid "&Create File System"
+#~ msgstr "创建文件系统(&C)"
-#: src/include/bootloader/routines/section_helps.rb:123
-msgid "&Number of Default Entry"
-msgstr "默认项数量(&N)"
+#~ msgid "Low level format failed. Try again?"
+#~ msgstr "低级格式化失败。重试吗?"
-#: src/include/bootloader/routines/section_helps.rb:124
-msgid "&Timeout in seconds"
-msgstr "超时(以秒计)(&S)"
+#~ msgid "Creating file system failed."
+#~ msgstr "创建文件系统失败。"
-#: src/include/bootloader/routines/section_helps.rb:125
-msgid "&Show boot menu"
-msgstr "显示引导菜单(&S)"
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "所选名称已在使用。\n"
+#~ "请使用其它名称。\n"
-#: src/include/bootloader/routines/section_helps.rb:126
-msgid "C&opy Image to Boot Partition"
-msgstr "复制映像到引导分区(&C)"
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "引导加载器安装期间出错。\n"
+#~ "重试引导加载器配置吗?\n"
-#: src/include/bootloader/routines/section_helps.rb:127
-msgid "&Skip Section gracefully on Errors"
-msgstr "出错时优雅地跳过该项(&S)"
+#~ msgid "Unable to install the boot loader."
+#~ msgstr "无法安装引导加载器。"
-#: src/include/bootloader/routines/section_helps.rb:128
-msgid "Boot &Partition of Other System"
-msgstr "其它系统的引导分区(&P)"
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "警告!\n"
+#~ "\n"
+#~ "目前 %1 主引导记录将被保存在 %2 的主引导记录覆盖。\n"
+#~ "\n"
+#~ "只有主引导记录中的引导代码会被覆盖。\n"
+#~ "分区表仍将保持不变。\n"
+#~ "\n"
+#~ "继续吗?\n"
-#. Cache for CommonSectionWidgets
-#: src/include/bootloader/routines/section_widgets.rb:58
-msgid "Image section must have specified kernel image"
-msgstr "映像项必须指定内核映像"
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "是,覆盖(&Y)"
-#: src/include/bootloader/routines/section_widgets.rb:65
-msgid "Image file doesn't exist now. Do you really want use it?"
-msgstr "映像文件目前不存在。您真的想要使用它吗?"
+#~ msgid "<p><b>Image Section</b></p>"
+#~ msgstr "<p><b>映像项</b></p>"
-#: src/include/bootloader/routines/section_widgets.rb:82
-msgid "Initrd file doesn't exist now. Do you really want use it?"
-msgstr "Initrd 文件目前不存在。您真的想要使用它吗?"
+#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
+#~ msgstr "<p><b>内核映像</b>定义了要引导的内核。可直接输入名称,或通过<b>浏览</b>选择。</p>"
-#. string append = BootCommon::current_section["append"]:"";
-#: src/include/bootloader/routines/section_widgets.rb:227
-msgid "Enable &SELinux"
-msgstr "启用 &SELinux"
+#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+#~ msgstr "<p><b>根设备</b>设置了要传递给内核作为根设备的设备。</p>"
-#. bnc#456362 filter out special chars like diacritics china chars etc.
-#: src/include/bootloader/routines/section_widgets.rb:401
-msgid "The name includes unallowable char(s)"
-msgstr "名称包含了不允许的字符"
+#~ msgid ""
+#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
+#~ "directly or choose by using <b>Browse</b>.</p>\n"
+#~ msgstr ""
+#~ "<p><b>初始内存磁盘</b>,若非空则定义了要使用的初始 ramdisk。\n"
+#~ "可直接输入路径和文件名或通过<b>浏览</b>选择。</p>\n"
-#: src/include/bootloader/routines/section_widgets.rb:533
-msgid "Ask for resolution during boot."
-msgstr "引导期间询问分辨率。"
+#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+#~ msgstr "<p>若您想要定义一个引导非 Linux 操作系统的引导项,请选择<b>链式加载器项</b>。</p>"
-#. radio button
-#: src/include/bootloader/routines/section_widgets.rb:573
-msgid "Clone Selected Section"
-msgstr "克隆所选引导项"
+#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
+#~ msgstr "<p>设置<b>使用密码保护</p>将会在选择此项时询问密码。</p>"
-#. radio button (don't translate 'chainloader')
-#: src/include/bootloader/routines/section_widgets.rb:587
-msgid "Other System (Chainloader)"
-msgstr "其它系统 (链式加载器)"
+#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+#~ msgstr "<p><b>其它系统</b>可让您从您计算机上发现的非 Linux 操作系统中选择。</p>"
-#. frame
-#: src/include/bootloader/routines/section_widgets.rb:609
-msgid "Section Type"
-msgstr "引导项类型"
+#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
+#~ msgstr "<p>若您 BIOS 需要设置此旗标才能引导之,请选择<b>当选为引导分区时激活此分区</b></p>"
-#. text entry
-#: src/include/bootloader/routines/section_widgets.rb:668
-msgid "Section &Name"
-msgstr "引导项名称(&N)"
+#~ msgid ""
+#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
+#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
+#~ msgstr ""
+#~ "<p><b>阻止链式加载偏移</b>可让您指定要引导的块列表。 \n"
+#~ "在多数情况下您需要在此指定 <code>+1</code>。 \n"
+#~ "有关块列表的规范请参考 grub 文档。</p>\n"
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid ""
-"Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "出于分区原因,无法正确安装引导加载器。"
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
+#~ "and start it in a Xen environment.</p>\n"
+#~ msgstr "<p>若您想要添加一个新 Linux 内核或其它映像并在 Xen 环境中启动之,请选择 <b>Xen 项</b>。</p>\n"
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#.
-#. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
-msgid ""
-"Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
-msgstr "安装引导代码至 MBR(<a href=\"disable_boot_mbr\">不安装</a>)"
+#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+#~ msgstr "<p><b>管理程序</b>指定了要使用的管理程序。</p>"
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
-msgid ""
-"Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
-msgstr "不安装引导代码至 MBR(<a href=\"enable_boot_mbr\">安装</a>)"
+#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
+#~ msgstr "<p><b>Xen 管理程序额外参数</b>可让您定义要传递给 xen 管理程序的额外参数。</p>"
-#. check for separated boot partition, use root otherwise
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
-msgid ""
-"Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not "
-"install</a>)"
-msgstr "安装引导代码至 /boot 分区(<a href=\"disable_boot_boot\">不安装</a>)"
+#~ msgid "<p><b>Menu Section</b></p>"
+#~ msgstr "<p><b>菜单项</b></p>"
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
-msgid ""
-"Do not install bootcode into /boot partition (<a href=\"enable_boot_boot"
-"\">install</a>)"
-msgstr "不安装引导代码至 /boot 分区(<a href=\"enable_boot_boot\">安装</a>)"
+#~ msgid "<p><b>Partition of Menu File</b></p>"
+#~ msgstr "<p><b>菜单文件的分区</b></p>"
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
-msgid ""
-"Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not "
-"install</a>)"
-msgstr "安装引导代码至 \"/\" 分区(<a href=\"disable_boot_root\">不安装</a>)"
+#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
+#~ msgstr "<p><b>菜单描述文件</b>指定了从其加载菜单文件的根设备路径。</p>"
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
-msgid ""
-"Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root"
-"\">install</a>)"
-msgstr "不安装引导代码至 \"/\" 分区(<a href=\"enable_boot_root\">安装</a>)"
+#~ msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
+#~ msgstr "<p><b>映射引导项到设备映射中的第一个磁盘</b> Windows 通常需要在第一个磁盘上。</p>l"
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
-msgid "Change Location: %s"
-msgstr "变动位置:%s"
+#~ msgid ""
+#~ "<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
+#~ "<b>Edit</b> and <b>Delete</b></p>"
+#~ msgstr ""
+#~ "<p><b>测量</b> 包含了用于 PCR 的测量文件。\n"
+#~ "可通过 <b>添加</b>,<b>编辑</b>和<b>删除</b>修改表格。</p>"
-#. summary text, %1 is bootloader name (eg. LILO)
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
-#: src/modules/BootGRUB2EFI.rb:96
-msgid "Boot Loader Type: %1"
-msgstr "引导加载器类型:%1"
+#~ msgid ""
+#~ "<p><b>Allow attempt to relocate</b>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>允许尝试重新定位</b>\n"
+#~ "通常在全局项中指定</p>"
-#. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718
-msgid " (\"/boot\")"
-msgstr " (\"/boot\")"
+#~ msgid ""
+#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>强制只读挂载根文件系统</b><br>\n"
+#~ "通常在全局项中指定</p>"
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
-msgid " (extended)"
-msgstr " (扩展分区)"
+#~ msgid ""
+#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
+#~ "create a system dump either on a DASD disk partition or tape device or to a\n"
+#~ "file on a SCSI disk partition.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>转储项</b>来添加一个指定了如何\n"
+#~ "在 DASD 磁盘分区、磁带设备或者 SCSI 磁盘分区的文件中创建系统转储的项。</p>"
-#: src/modules/BootGRUB.rb:730
-msgid " (\"/\")"
-msgstr " (根分区)"
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
+#~ "Menu sections represent a list of tasks which are grouped together.</p>\n"
+#~ msgstr ""
+#~ "<p>选择<b>菜单项</b>来添加一个新菜单到配置。\n"
+#~ "菜单项代表了一系列组合在一起的任务。</p>\n"
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
-msgid " (MBR)"
-msgstr " (主引导记录)"
+#~ msgid ""
+#~ "<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
+#~ "Please note that this will also disable AppArmor.</p>"
+#~ msgstr ""
+#~ "<p>选择<b>启用 SELinux</b> 来添加必要的内核引导参数来启用 SELinux 安全框架。\n"
+#~ "请注意这也将禁用 AppArmor。</p>"
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
-msgid "Status Location: %1"
-msgstr "状态位置:%1"
+#~ msgid "Image Section"
+#~ msgstr "映像项"
-#. section name "suffix" for default section
-#: src/modules/BootGRUB.rb:768
-msgid " (default)"
-msgstr " (默认)"
+#~ msgid "&Kernel Image"
+#~ msgstr "内核映像(&K)"
-#: src/modules/BootGRUB.rb:779
-msgid "Sections:<br>%1"
-msgstr "项:<br>%1"
+#~ msgid "&Root Device"
+#~ msgstr "根设备(&R)"
-#. summary text
-#: src/modules/BootGRUB.rb:788
-msgid "Do not install boot loader; just create configuration files"
-msgstr "不安装引导加载器;仅创建配置文件"
+#~ msgid "&Initial RAM Disk"
+#~ msgstr "初始内存磁盘(&I)"
-#. menubutton item, keep as short as possible
-#: src/modules/BootGRUB.rb:919
-msgid "Propose and &Merge with Existing GRUB Menus"
-msgstr "建议并与已有 GRUB 菜单合并(&M)"
+#~ msgid "Chainloader Section"
+#~ msgstr "链式加载器项"
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:230
-msgid ""
-"Warning: No location for bootloader stage1 selected.Unless you know what you "
-"are doing please select above location."
-msgstr ""
-"警告:没有为引导加载器 stage1 选择位置。除非您知道您正在做什么否则请选择上面"
-"的位置。"
+#~ msgid "Use Password Protection"
+#~ msgstr "使用密码保护"
-#: src/modules/BootGRUB2EFI.rb:104
-msgid "Enable Secure Boot: %1"
-msgstr "启用安全引导:%1"
+#~ msgid "&Other System"
+#~ msgstr "其它系统(&O)"
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:70
-msgid "Unknown bootloader: %1"
-msgstr "未知引导加载器:%1"
+#~ msgid "Do not &verify Filesystem before Booting"
+#~ msgstr "引导前不校验文件系统(&V)"
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:101
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr "不支持硬件平台 %1 和引导加载器 %2 的组合"
+#~ msgid "&Activate this Partition when selected for Boot"
+#~ msgstr "当选为引导分区时激活此分区(&A)"
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:140
-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 ""
-"从 MBR 引导不能与 btrfs 文件系统和没有 bios_grub 分区的 GPT 磁盘标签一起使"
-"用。要修复此问题,可创建 bios_grub 分区或使用任意 ext 文件系统作为引导分区,"
-"或不要把 stage 1 安装到 MBR。"
+#~ msgid "B&lock Offset for Chainloading"
+#~ msgstr "阻止链式加载的偏移(&L)"
-#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:168
-msgid "The boot device is on raid type: %1. System will not boot."
-msgstr "引导设备在 RAID 类型 %1 上。系统将无法引导。"
+#~ msgid "&Map Section to the First Disk in Device Map"
+#~ msgstr "映射引导项到设备映射中的第一个磁盘(&M)"
-#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:188
-msgid ""
-"The boot device is on software RAID1. Select other bootloader location, e.g. "
-"Master Boot Record"
-msgstr "引导设备在软件 RAID1 上。请选择其他的引导加载器位置,例如,主引导记录"
+#~ msgid "&Hypervisor"
+#~ msgstr "管理程序(&H)"
-#. s390 do not have bios boot order (bnc#874106)
-#: src/modules/BootSupportCheck.rb:243
-msgid ""
-"YaST could not determine the exact boot order of disks needed for the device "
-"map. Review and possibly adjust the boot order of disks in \"Boot Loader "
-"Installation Details\""
-msgstr ""
-"YaST 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复"
-"核并调整磁盘的引导顺序"
+#~ msgid "&Additional Xen Hypervisor Parameters"
+#~ msgstr "Xen 管理程序额外参数(&A)"
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:263
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr "缺失用于引导的 ext 分区。无法安装引导代码。"
+#~ msgid "&Partition of Menu File"
+#~ msgstr "菜单文件的分区(&P)"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:170
-msgid "Check boot loader"
-msgstr "检查引导加载器"
+#~ msgid "&Menu Description File"
+#~ msgstr "菜单描述文件(&M)"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:172
-msgid "Read partitioning"
-msgstr "读取分区"
+#~ msgid "&Force root filesystem to be mounted read-only"
+#~ msgstr "强制只读挂载根文件系统(&F)"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:174
-msgid "Load boot loader settings"
-msgstr "加载引导加载器设置"
+#~ msgid "Allow attempt to &relocate"
+#~ msgstr "允许尝试重新定位(&R)"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:178
-msgid "Checking boot loader..."
-msgstr "正在检查引导加载器..."
+#~ msgid "Tar&get Directory for Section"
+#~ msgstr "引导项目标文件夹(&G)"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:180
-msgid "Reading partitioning..."
-msgstr "正在读取分区..."
+#~ msgid "Op&tional Parameter File"
+#~ msgstr "可选参数文件(&T)"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:182
-msgid "Loading boot loader settings..."
-msgstr "正在加载引导加载器设置..."
+#~ msgid "Dump Section (obsolete)"
+#~ msgstr "转储项目(淘汰)"
-#. dialog header
-#: src/modules/Bootloader.rb:186
-msgid "Initializing Boot Loader Configuration"
-msgstr "正在初始化引导加载器配置"
+#~ msgid "&Dump Device"
+#~ msgstr "转储设备(&D)"
-#. part of summary, %1 is a part of kernel command line
-#: src/modules/Bootloader.rb:307
-msgid "Added Kernel Parameters: %1"
-msgstr "添加的内核参数:%1"
+#~ msgid "&SCSI Dump Device"
+#~ msgstr "&SCSI 转储设备"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:367
-msgid "Create initrd"
-msgstr "创建 initrd"
+#~ msgid "&List of Menu Entries"
+#~ msgstr "菜单项列表(&L)"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:369
-msgid "Save boot loader configuration files"
-msgstr "保存引导加载器配置文件"
+#~ msgid "&Number of Default Entry"
+#~ msgstr "默认项数量(&N)"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:371
-msgid "Install boot loader"
-msgstr "安装引导加载器"
+#~ msgid "&Timeout in seconds"
+#~ msgstr "超时(以秒计)(&S)"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:375
-msgid "Creating initrd..."
-msgstr "正在创建 initrd..."
+#~ msgid "&Show boot menu"
+#~ msgstr "显示引导菜单(&S)"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:377
-msgid "Saving boot loader configuration files..."
-msgstr "正在保存引导加载器配置文件..."
+#~ msgid "C&opy Image to Boot Partition"
+#~ msgstr "复制映像到引导分区(&C)"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:379
-msgid "Installing boot loader..."
-msgstr "正在安装引导加载器..."
+#~ msgid "&Skip Section gracefully on Errors"
+#~ msgstr "出错时优雅地跳过该项(&S)"
-#. progress line
-#: src/modules/Bootloader.rb:385
-msgid "Saving Boot Loader Configuration"
-msgstr "正在保存引导加载器配置"
+#~ msgid "Boot &Partition of Other System"
+#~ msgstr "其它系统的引导分区(&P)"
+#~ msgid "Image section must have specified kernel image"
+#~ msgstr "映像项必须指定内核映像"
+
+#~ msgid "Image file doesn't exist now. Do you really want use it?"
+#~ msgstr "映像文件目前不存在。您真的想要使用它吗?"
+
+#~ msgid "Initrd file doesn't exist now. Do you really want use it?"
+#~ msgstr "Initrd 文件目前不存在。您真的想要使用它吗?"
+
+#~ msgid "Enable &SELinux"
+#~ msgstr "启用 &SELinux"
+
+#~ msgid "The name includes unallowable char(s)"
+#~ msgstr "名称包含了不允许的字符"
+
+#~ msgid "Ask for resolution during boot."
+#~ msgstr "引导期间询问分辨率。"
+
+#~ msgid "Clone Selected Section"
+#~ msgstr "克隆所选引导项"
+
+#~ msgid "Other System (Chainloader)"
+#~ msgstr "其它系统 (链式加载器)"
+
+#~ msgid "Section Type"
+#~ msgstr "引导项类型"
+
+#~ msgid "Section &Name"
+#~ msgstr "引导项名称(&N)"
+
+#~ msgid " (\"/boot\")"
+#~ msgstr " (\"/boot\")"
+
+#~ msgid " (\"/\")"
+#~ msgstr " (根分区)"
+
+#~ msgid "Sections:<br>%1"
+#~ msgstr "项:<br>%1"
+
+#~ msgid "Do not install boot loader; just create configuration files"
+#~ msgstr "不安装引导加载器;仅创建配置文件"
+
+#~ msgid "Propose and &Merge with Existing GRUB Menus"
+#~ msgstr "建议并与已有 GRUB 菜单合并(&M)"
+
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "未知引导加载器:%1"
+
+#~ msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
+#~ msgstr "YaST 无法确定设备映射所需的精确磁盘引导顺序。请在 \"引导加载器安装细节\" 中复核并调整磁盘的引导顺序"
+
+#~ msgid "Added Kernel Parameters: %1"
+#~ msgstr "添加的内核参数:%1"
+
+#~ msgid "Install boot loader"
+#~ msgstr "安装引导加载器"
+
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "正在保存引导加载器配置文件..."
+
+#~ msgid "Installing boot loader..."
+#~ msgstr "正在安装引导加载器..."
+
#~ msgid "Delete a global option"
#~ msgstr "删除一个全局选项"
#~ msgid "Set a global option"
#~ msgstr "设置全局选项"
-#~ msgid "P&rotect Entry Modification Only"
-#~ msgstr "仅保护启动项不受修改(&r)"
-
-#~ msgid "Selected custom bootloader partition %s is not available any more."
-#~ msgstr "所选自定义引导分区 %s 不再可用。"
-
#~ msgid "Selected bootloader location %{path} is not on %{device} any more."
#~ msgstr "所选引导加载器位置 %{path} 不再在 %{device} 上。"
-#~ msgid ""
-#~ "Activate flag is not set by installer. If it is not set at all, some "
-#~ "BIOSes could refuse to boot."
-#~ msgstr ""
-#~ "安装器未设置激活旗标。若根本未设置该旗标,某些 BIOS 可能会拒绝引导。"
-
-#~ msgid ""
-#~ "The installer will not modify the MBR of the disk. Unless it already "
-#~ "contains boot code, the BIOS won't be able to boot disk."
-#~ msgstr ""
-#~ "安装器将不会修改磁盘 MBR。除非它已包含了引导代码,否则 BIOS 将无法引导磁"
-#~ "盘。"
-
-#~ msgid ""
-#~ "Partition number > 3 is being used for booting with GPT partition table"
+#~ msgid "Partition number > 3 is being used for booting with GPT partition table"
#~ msgstr ">3 的分区号正用于引导 GPT 分区表"
-#~ msgid ""
-#~ "The bootloader is installed on a partition that does not lie entirely "
-#~ "below %1 GB. The system might not boot if BIOS support only lba24 (result "
-#~ "is error 18 during install grub MBR)."
-#~ msgstr ""
-#~ "引导加载器安装在一个不完全小于 %1 GB 的分区上。若 BIOS 只支持 lba24 (安装 "
-#~ "grub 主引导记录时出现 error 18 即为表象),则系统可能无法引导。"
+#~ msgid "The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot if BIOS support only lba24 (result is error 18 during install grub MBR)."
+#~ msgstr "引导加载器安装在一个不完全小于 %1 GB 的分区上。若 BIOS 只支持 lba24 (安装 grub 主引导记录时出现 error 18 即为表象),则系统可能无法引导。"
#~ msgid ""
#~ "Configure a valid boot loader location before continuing.<br/>\n"
-#~ "The device map includes more than 8 devices and the boot device is out of "
-#~ "range.\n"
-#~ "The range is limited by BIOS to the first 8 devices. Adjust BIOS boot "
-#~ "order ( or if it already set, then correct order in bootloader "
-#~ "configuration)"
+#~ "The device map includes more than 8 devices and the boot device is out of range.\n"
+#~ "The range is limited by BIOS to the first 8 devices. Adjust BIOS boot order ( or if it already set, then correct order in bootloader configuration)"
#~ msgstr ""
#~ "继续前请配置一个有效的引导加载器位置。<br>\n"
#~ "该设备映射包含了多于 8 个设备,引导设备落在了范围以外。\n"
@@ -2214,23 +1628,19 @@
#~ msgid "The LILO is not supported now."
#~ msgstr "目前不支持 LILO。"
-#~ msgid ""
-#~ "The selected boot path will not be activated for your installation. Your "
-#~ "system may not be bootable."
+#~ msgid "The selected boot path will not be activated for your installation. Your system may not be bootable."
#~ msgstr "所选引导路径在您的安装过程中不会被激活。您的系统可能无法引导。"
#~ msgid ""
#~ "Configure a valid boot loader location before continuing.<br>\n"
-#~ "In case that no selection can be made it may be necessary to create a "
-#~ "small primary Apple HFS partition."
+#~ "In case that no selection can be made it may be necessary to create a small primary Apple HFS partition."
#~ msgstr ""
#~ "继续前请配置一个有效的引导加载器位置。<br>\n"
#~ "若无法选择,可能有必要创建一个小的 Apple HFS 主分区。"
#~ msgid ""
#~ "Configure a valid boot loader location before continuing.<br>\n"
-#~ "In case that no selection can be made it may be necessary to create a "
-#~ "PReP Boot partition."
+#~ "In case that no selection can be made it may be necessary to create a PReP Boot partition."
#~ msgstr ""
#~ "继续前请配置一个有效的引导加载器位置。<br>\n"
#~ "若无法选择,可能有必要创建一个 PReP 引导分区。"
@@ -2241,9 +1651,7 @@
#~ msgid "Convert Settings and Install &GRUB"
#~ msgstr "转换设置并安装 &GRUB"
-#~ msgid ""
-#~ "LILO is not supported. The recommended option is select convert LILO to "
-#~ "GRUB"
+#~ msgid "LILO is not supported. The recommended option is select convert LILO to GRUB"
#~ msgstr "不支持 LILO。推荐选项是将 LILO 转换为 GRUB"
#~ msgid "&ELILO Global Options"
@@ -2276,15 +1684,11 @@
#~ msgid ""
#~ "<p><b>Set level of verbosity [0-5]</b><br> Increase verbosity of ELILO\n"
#~ "in case of boot problems.</p>"
-#~ msgstr ""
-#~ "<p><b>设置调试级别 [0-5]</b><br>若遇到引导问题可增加 ELILO 的调试级别。</"
-#~ "p>"
+#~ msgstr "<p><b>设置调试级别 [0-5]</b><br>若遇到引导问题可增加 ELILO 的调试级别。</p>"
#~ msgid ""
-#~ "<p><b>Append string for.global options to pass to kernel command line</"
-#~ "b><br>\n"
-#~ "Lets you define additional global parameters to pass to the kernel. These "
-#~ "are\n"
+#~ "<p><b>Append string for.global options to pass to kernel command line</b><br>\n"
+#~ "Lets you define additional global parameters to pass to the kernel. These are\n"
#~ "used if no 'append' appears in a given section.</p>\n"
#~ msgstr ""
#~ "<p><b>要传递给内核命令行的全局选项追加字符串</b><br>\n"
@@ -2292,10 +1696,8 @@
#~ "要是给定项中未出现 'append' 那就会使用它们。</p>\n"
#~ msgid ""
-#~ "<p><b>Name of the default initrd file</b>, if not empty, defines the "
-#~ "initial\n"
-#~ "ramdisk to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "<p><b>Name of the default initrd file</b>, if not empty, defines the initial\n"
+#~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
#~ "<b>Browse</b></p>\n"
#~ msgstr ""
#~ "<p><b>默认 initrd 文件名称</b>,若非空,则定义了要使用的初始 ramdisk。\n"
@@ -2303,8 +1705,7 @@
#~ msgid ""
#~ "<p><b>Name of default image file</b>, if not empty, defines the image\n"
-#~ "file to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "file to use. Either enter the path and file name directly or choose by using\n"
#~ "<b>Browse</b></p>"
#~ msgstr ""
#~ "<p><b>默认映像文件名称</b>,若非空,则定义了要使用的映像文件。\n"
@@ -2319,8 +1720,7 @@
#~ msgid ""
#~ "<p><b>Prevent EDD30 mode</b><br>\n"
-#~ "By default, if EDD30 is off, ELILO will try and set the variable to "
-#~ "TRUE.\n"
+#~ "By default, if EDD30 is off, ELILO will try and set the variable to TRUE.\n"
#~ "However, some controllers do not support EDD30 and forcing the variable\n"
#~ "may cause problems. Therefore, as of elilo-3.2, there is an option to \n"
#~ "avoid forcing the variable.</p>\n"
@@ -2338,8 +1738,7 @@
#~ "</p>"
#~ msgstr ""
#~ "<p><b>允许尝试重新定位</b><br>\n"
-#~ "若在内核的初始加载点遇到了内存分配错误,则允许尝试重新定位 (假设此内核可重"
-#~ "新定位)。\n"
+#~ "若在内核的初始加载点遇到了内存分配错误,则允许尝试重新定位 (假设此内核可重新定位)。\n"
#~ "</p>"
#~ msgid ""
@@ -2371,8 +1770,7 @@
#~ "function keys F1 to F12</p>"
#~ msgstr ""
#~ "<p><b>通过功能键显示文件内容</b>\n"
-#~ "一些选择器可能利用此选项来在某特定功能键按下时显示文件内容。功能键为 F1 "
-#~ "到 F12。</p>"
+#~ "一些选择器可能利用此选项来在某特定功能键按下时显示文件内容。功能键为 F1 到 F12。</p>"
#~ msgid ""
#~ "<p><b>Specify the Filename for a Specific FPSWA to Load</b>\n"
@@ -2402,9 +1800,7 @@
#~ msgid "Boot Image Location"
#~ msgstr "引导映像位置"
-#~ msgid ""
-#~ "Delay to wait before auto booting in seconds (used if not in interactive "
-#~ "mode)"
+#~ msgid "Delay to wait before auto booting in seconds (used if not in interactive mode)"
#~ msgstr "自动引导前等待延迟(以秒计)(仅在非交互模式使用)"
#~ msgid "Force interactive mode"
@@ -2470,9 +1866,7 @@
#~ msgid "&Set the User Interface for ELILO (\"simple\" or \"textmenu\")"
#~ msgstr "指定 ELILO 用户界面('简单' 或 '文本菜单')(&S)"
-#~ msgid ""
-#~ "&Delay to Wait before Auto Booting in Seconds (Used if not in Interactive "
-#~ "Mode)"
+#~ msgid "&Delay to Wait before Auto Booting in Seconds (Used if not in Interactive Mode)"
#~ msgstr "自动引导前等待延迟(以秒计)(仅在非交互模式使用)(&D)"
#~ msgid "Display the Content of a File by Function &Keys"
@@ -2514,10 +1908,8 @@
#~ msgstr ""
#~ "<p><b>引导位置</b>\n"
#~ "这是您引导分区的分区编号。\n"
-#~ "在 PowerMac 上它必须是 HFS 格式因为我们使用 hfsutils 来向那个分区复制文"
-#~ "件。\n"
-#~ "在 CHRP (通用硬件参考平台) 上您需要一个 41 PReP (PowerPC 参考平台) 引导分"
-#~ "区,quik 软件包的 /boot/second 将存放到那儿。</p>"
+#~ "在 PowerMac 上它必须是 HFS 格式因为我们使用 hfsutils 来向那个分区复制文件。\n"
+#~ "在 CHRP (通用硬件参考平台) 上您需要一个 41 PReP (PowerPC 参考平台) 引导分区,quik 软件包的 /boot/second 将存放到那儿。</p>"
#~ msgid ""
#~ "<p><b>Boot Folder Path</b>\n"
@@ -2525,14 +1917,11 @@
#~ "folder will be blessed to mark it bootable.</p>"
#~ msgstr ""
#~ "<p><b>引导文件夹路径</b>\n"
-#~ "只用于 PowerMac。包含您的引导文件的文件夹,这个文件夹将被宇宙神秘力量赐福"
-#~ "使其可引导。</p>"
+#~ "只用于 PowerMac。包含您的引导文件的文件夹,这个文件夹将被宇宙神秘力量赐福使其可引导。</p>"
#~ msgid ""
-#~ "<p><b>Append String for Global Options to Pass to Kernel Command Line</"
-#~ "b><br>\n"
-#~ "Lets you define additional global parameters to pass to the kernel. These "
-#~ "are\n"
+#~ "<p><b>Append String for Global Options to Pass to Kernel Command Line</b><br>\n"
+#~ "Lets you define additional global parameters to pass to the kernel. These are\n"
#~ "used if no 'append' appears in a given section.</p>\n"
#~ msgstr ""
#~ "<p><b>要传递给内核命令行的全局选项追加字符串</b><br>\n"
@@ -2540,10 +1929,8 @@
#~ "要是给定项里未出现 'append' 那就会使用它们。</p>\n"
#~ msgid ""
-#~ "<p><b>Name of the Default Initrd File</b>, if not empty, defines the "
-#~ "initial\n"
-#~ "ramdisk to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "<p><b>Name of the Default Initrd File</b>, if not empty, defines the initial\n"
+#~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
#~ "<b>Browse</b></p>\n"
#~ msgstr ""
#~ "<p><b>默认 initrd 文件名称</b>,若非空,则定义了要使用的初始 ramdisk。\n"
@@ -2551,12 +1938,9 @@
#~ msgid ""
#~ "<p><b>Name of Default Image File</b>, if not empty, defines the image\n"
-#~ "file to use. Either enter the path and file name directly or choose by "
-#~ "using\n"
+#~ "file to use. Either enter the path and file name directly or choose by using\n"
#~ "<b>Browse</b></p>"
-#~ msgstr ""
-#~ "<p><b>默认映像文件名称</b>,若非空,则定义了要使用的映像文件。 可直接输入"
-#~ "路径和文件名或通过<b>浏览</b>选择。</p>"
+#~ msgstr "<p><b>默认映像文件名称</b>,若非空,则定义了要使用的映像文件。 可直接输入路径和文件名或通过<b>浏览</b>选择。</p>"
#~ msgid ""
#~ "<p><b>Set Default Root Filesystem</b>\n"
@@ -2569,8 +1953,7 @@
#~ "<p><b>Partition for Boot Loader Duplication</b>\n"
#~ "specifies other Linux device nodes where the bootinfo should be stored.\n"
#~ "If this option is given, the boot partition will be converted to FAT. \n"
-#~ "The intend of this option is to write the boot files to all members of a "
-#~ "RAID1 or RAID5 system.</p>"
+#~ "The intend of this option is to write the boot files to all members of a RAID1 or RAID5 system.</p>"
#~ msgstr ""
#~ "<p><b>引导加载器副本所在分区</b>\n"
#~ "指定应存储引导信息的其它 Linux 设备节点。\n"
@@ -2580,62 +1963,49 @@
#~ msgid ""
#~ "<p><b>Change Boot Device in NV-RAM</b>\n"
#~ "this option will tell lilo to update the OpenFirmware \"boot-device\" \n"
-#~ "variable with the full OpenFirmware path pointing to the device specified "
-#~ "in\n"
+#~ "variable with the full OpenFirmware path pointing to the device specified in\n"
#~ "\"boot=\". If this option is missing, the system may not boot.</p>"
#~ msgstr ""
#~ "<p><b>修改 NV-RAM 中的引导设备</b>\n"
-#~ "此选项将通知 lilo 更新开源固件的 \"boot-device\" 变量为指向 \"boot=\" 中指"
-#~ "定的设备的完整开源固件路径。\n"
+#~ "此选项将通知 lilo 更新开源固件的 \"boot-device\" 变量为指向 \"boot=\" 中指定的设备的完整开源固件路径。\n"
#~ "若缺失此选项,系统可能无法引导。</p>"
#~ msgid ""
#~ "<p><b>Do not Use OS-chooser</b>\n"
-#~ " will tell lilo to use yaboot as boot file instead of a Forth script "
-#~ "named \"os-chooser\". \n"
-#~ "The OpenFirmware driver in the nVidia graphics card as shipped with Apple "
-#~ "G5 systems \n"
+#~ " will tell lilo to use yaboot as boot file instead of a Forth script named \"os-chooser\". \n"
+#~ "The OpenFirmware driver in the nVidia graphics card as shipped with Apple G5 systems \n"
#~ "will crash if there is no monitor attached.</p>"
#~ msgstr ""
#~ "<p><b>不使用 OS-chooser</b>\n"
-#~ "将通知 lilo 使用 yaboot 作为引导文件而不是名为 \"os-chooser\" 的 Forth 脚"
-#~ "本。\n"
-#~ "苹果 G5 系统携带的英伟达图形卡的开源固件驱动在未连接显示器的情况下会崩溃。"
-#~ "</p>"
+#~ "将通知 lilo 使用 yaboot 作为引导文件而不是名为 \"os-chooser\" 的 Forth 脚本。\n"
+#~ "苹果 G5 系统携带的英伟达图形卡的开源固件驱动在未连接显示器的情况下会崩溃。</p>"
#~ msgid ""
#~ "<p><b>Timeout in Seconds for MacOS/Linux</b>\n"
-#~ "It contains the timeout between MacOS/Linux in seconds until Linux boots "
-#~ "automatically \n"
+#~ "It contains the timeout between MacOS/Linux in seconds until Linux boots automatically \n"
#~ "if no key is pressed to boot MacOS</p>"
#~ msgstr ""
#~ "<p><b>MacOS/Linux 超时</b>\n"
-#~ "这包含了若未按任何键以引导 MacOS 时直到 Linux 成功引导前以秒计的 MacOS/"
-#~ "Linux 间超时。(要不设置该选项的话,Mac OS X 会启动自己...)</p>"
+#~ "这包含了若未按任何键以引导 MacOS 时直到 Linux 成功引导前以秒计的 MacOS/Linux 间超时。(要不设置该选项的话,Mac OS X 会启动自己...)</p>"
#~ msgid ""
#~ "<p><b>Always Boot from FAT Partition</b>\n"
-#~ "Normally the lilo script would automatically select the boot partition "
-#~ "format\n"
-#~ "to either be a PReP boot partition or a FAT formatted file system for "
-#~ "more\n"
+#~ "Normally the lilo script would automatically select the boot partition format\n"
+#~ "to either be a PReP boot partition or a FAT formatted file system for more\n"
#~ "complex setups. This option forces the lilo script to use\n"
#~ "the FAT formatted file system</p>"
#~ msgstr ""
#~ "<p><b>始终从 FAT 分区引导</b>\n"
-#~ "通常 lilo 脚本会为更复杂的设置自动选择引导分区格式为 PReP 引导分区或经 "
-#~ "FAT 格式化的文件系统。\n"
+#~ "通常 lilo 脚本会为更复杂的设置自动选择引导分区格式为 PReP 引导分区或经 FAT 格式化的文件系统。\n"
#~ "这个选项强制 lilo 脚本使用经 FAT 格式化的文件系统。</p>"
#~ msgid ""
#~ "<p><b>Install Boot Loader Even on Errors</b>\n"
#~ "Install the bootloader even if it is unsure whether your firmware is\n"
-#~ "buggy so that next boot will fail. This results in an unsupported setup.</"
-#~ "p>"
+#~ "buggy so that next boot will fail. This results in an unsupported setup.</p>"
#~ msgstr ""
#~ "<p><b>即使有错误仍安装引导加载器</b>\n"
-#~ "即使不能确定您的固件是否故障重重是否会造成下次引导失败,仍然安装引导加载"
-#~ "器。\n"
+#~ "即使不能确定您的固件是否故障重重是否会造成下次引导失败,仍然安装引导加载器。\n"
#~ "这可能导致配置出引导程序支持不了的设置。</p>"
#~ msgid "PPC Boot Loader Location"
@@ -2821,8 +2191,7 @@
#~ msgid ""
#~ "System was not booted via EFI firmware. To boot your\n"
#~ "computer, you need to load ELILO via the EFI shell."
-#~ msgstr ""
-#~ "系统未通过 EFI 固件引导。为引导您的计算机,您需要通过 EFI 壳层加载 ELILO。"
+#~ msgstr "系统未通过 EFI 固件引导。为引导您的计算机,您需要通过 EFI 壳层加载 ELILO。"
#~ msgid "LILO bootloader is not supported"
#~ msgstr "不支持 LILO 引导加载器。"
@@ -2936,8 +2305,7 @@
#~ msgid ""
#~ "You chose to install the boot loader to the hard disk.\n"
-#~ "The menu of the boot loader contains an entry to boot from the hard "
-#~ "disk.\n"
+#~ "The menu of the boot loader contains an entry to boot from the hard disk.\n"
#~ "Replace it with an entry to boot from the floppy?"
#~ msgstr ""
#~ "您已选择将 Boot Loader 安装到硬盘。\n"
@@ -2967,9 +2335,6 @@
#~ msgid "image"
#~ msgstr "映象"
-#~ msgid "Yes"
-#~ msgstr "是"
-
#~ msgid "No"
#~ msgstr "否"
@@ -3006,9 +2371,7 @@
#~ "但需要在 XEN 环境中启动它。</p>"
#, fuzzy
-#~ msgid ""
-#~ "The /boot directory is on an ext4 filesystem. Create separate /boot "
-#~ "partition with ext2 filesytem"
+#~ msgid "The /boot directory is on an ext4 filesystem. Create separate /boot partition with ext2 filesytem"
#~ msgstr "/boot 目录在 XFS 文件系统上。系统将不会启动。"
#~ msgid ""
@@ -3108,19 +2471,15 @@
#~ msgid "Section Editor"
#~ msgstr "部分编辑器"
-#~ msgid ""
-#~ "<p>Selecting <b>Do not verify Filesystem before Booting</b> will skip all "
-#~ "file system checks.</p>"
+#~ msgid "<p>Selecting <b>Do not verify Filesystem before Booting</b> will skip all file system checks.</p>"
#~ msgstr "<p>选择<b>引导前不校验文件系统</b>将跳过所有文件系统检查。</p>"
#, fuzzy
#~ msgid ""
-#~ "<p><b>Initial RAM Disk</b>,if not empty, defines the initial ramdisk to "
-#~ "use. Either enter the path and file name\n"
+#~ "<p><b>Initial RAM Disk</b>,if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
#~ "directly or choose by using <b>Browse</b>.</p>\n"
#~ msgstr ""
-#~ "<p><b>默认 RAM 磁盘</b>,如果非空,定义要使用的初始 ramdisk。 直接输入路径"
-#~ "和文件名或通过使用\n"
+#~ "<p><b>默认 RAM 磁盘</b>,如果非空,定义要使用的初始 ramdisk。 直接输入路径和文件名或通过使用\n"
#~ "<b>浏览</b>选择</p>"
#~ msgid "Former default Image Flavor"
@@ -3203,19 +2562,16 @@
#~ msgid ""
#~ "<p><big><b>Initial RAM Disk</b></big><br>\n"
-#~ "Use <b>Initial RAM Disk</b> to specify the initial RAM disk (initrd) to "
-#~ "load. If it is\n"
+#~ "Use <b>Initial RAM Disk</b> to specify the initial RAM disk (initrd) to load. If it is\n"
#~ "left empty, no initial RAM disk is loaded during boot.</p>"
#~ msgstr ""
#~ "<p><big><b>初始 RAM 磁盘</b></big><br>\n"
-#~ "请使用<b>初始 RAM 磁盘</b>来指定要装载的初始 RAM 磁盘 (initrd)。如果这是空"
-#~ "的,\n"
+#~ "请使用<b>初始 RAM 磁盘</b>来指定要装载的初始 RAM 磁盘 (initrd)。如果这是空的,\n"
#~ "在引导期间将不装载任何初始 RAM 磁盘。</p>"
#~ msgid ""
#~ "<p><big><b>Root Device<b></big><br>\n"
-#~ "Use <b>Root Device</b> to specify the root file system to mount after the "
-#~ "kernel is\n"
+#~ "Use <b>Root Device</b> to specify the root file system to mount after the kernel is\n"
#~ "loaded.</p>\n"
#~ msgstr ""
#~ "<p><big><b>根设备<b></big><br>\n"
@@ -3224,8 +2580,7 @@
#~ msgid ""
#~ "<p><big><b>VGA Mode</b></big><br>\n"
-#~ "Use <b>VGA Mode</b> to specify the resolution and color depth to set "
-#~ "after\n"
+#~ "Use <b>VGA Mode</b> to specify the resolution and color depth to set after\n"
#~ "the kernel has booted.</p>"
#~ msgstr ""
#~ "<p><big><b>VGA 方式</b></big><br>\n"
@@ -3243,8 +2598,7 @@
#~ msgid ""
#~ "<p><big><b>Device</b></big><br>\n"
-#~ "Use <b>Device</b> to set the device from which to load the operating "
-#~ "system.\n"
+#~ "Use <b>Device</b> to set the device from which to load the operating system.\n"
#~ "In most cases, it is the disk partition in which \n"
#~ "the other system is installed.</p>"
#~ msgstr ""
@@ -3256,12 +2610,10 @@
#, fuzzy
#~ msgid ""
#~ "<p><b>Trusted GRUB Details</b><br>\n"
-#~ "allows to add aditional measured files and also to define own PCR for "
-#~ "kernel, initrd or chainloader</p>"
+#~ "allows to add aditional measured files and also to define own PCR for kernel, initrd or chainloader</p>"
#~ msgstr ""
#~ "<p><b>信任的 GRUB 细节</b><br>\n"
-#~ "allows to add aditional measured files and also to define own PCR for "
-#~ "kernel, initrd or chainloader</p>"
+#~ "allows to add aditional measured files and also to define own PCR for kernel, initrd or chainloader</p>"
#~ msgid ""
#~ "<p>To add a disk, push <b>Add</b>.\n"
@@ -3276,8 +2628,7 @@
#~ "boots the active partition), set <b>Replace MBR with Generic Code</b>.</p>"
#~ msgstr ""
#~ "<p><big><b>使用通用代码替换 MBR</b></big><br>\n"
-#~ "要使用通用代码(引导活动分区)替换磁盘的主引导记录,请设置<b>使用通用代码替"
-#~ "换 MBR</b>。</p>"
+#~ "要使用通用代码(引导活动分区)替换磁盘的主引导记录,请设置<b>使用通用代码替换 MBR</b>。</p>"
#~ msgid ""
#~ "<p><big><b>Activating Bootloader Partition</b></big><br>\n"
@@ -3289,8 +2640,7 @@
#~ "<p><big><b>激活引导程序分区</b></big><br>\n"
#~ "要激活含引导程序的分区,请设置\n"
#~ "<b>激活引导程序分区</b>。通用 MBR 代码\n"
-#~ "引导活动分区。较旧的 BIOS 要求有一个分区是活动的,即使引导程序安装在 MBR "
-#~ "中也是如此。"
+#~ "引导活动分区。较旧的 BIOS 要求有一个分区是活动的,即使引导程序安装在 MBR 中也是如此。"
#~ msgid ""
#~ "<p><big><b>Dedicated Boot Loader Area</b></big><br>\n"
Modified: trunk/yast/zh_CN/po/ca-management.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/ca-management.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/ca-management.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-06-08 10:25+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -138,8 +138,7 @@
#: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
#: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
#: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
msgid "&Password:"
msgstr "密码(&P):"
@@ -211,8 +210,7 @@
#: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
#: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
#: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
msgid "New passwords do not match."
msgstr "新密码不匹配。"
@@ -1921,42 +1919,41 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
msgid "Creating certificate..."
msgstr "正在创建证书..."
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
msgstr "默认证书也可以在 CA 管理模块中创建。\n"
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
msgid "Finish"
msgstr "完成"
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
msgid "Really save configuration ?"
msgstr "真的保存配置吗?"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
msgid "Exit"
msgstr "退出"
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
msgid "Really exit configuration without saving ?"
msgstr "真的退出配置而不保存吗?"
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
msgid "Details"
msgstr "细节"
@@ -2241,8 +2238,7 @@
msgid "LDAP P&assword:"
msgstr "LDAP 密码(&A):"
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
#: src/include/ca-management/util.rb:1388
msgid "Certificate &Password:"
msgstr "证书密码(&P):"
@@ -2290,28 +2286,23 @@
msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
msgstr "证书和以 PEM 格式解密的密钥(&R)"
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
msgid "C&ertificate and the Key Encrypted in PEM Format"
msgstr "证书和以 PEM 格式加密的密钥(&E)"
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
msgid "&Certificate in DER Format"
msgstr "DER 格式的证书(&C)"
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
msgid "Cer&tificate and the Key in PKCS12 Format"
msgstr "证书和 PKCS12 格式的密钥(&T)"
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
msgid "&Like PKCS12 and Include the CA Chain"
msgstr "偏好 PKCS12 并包含 CA 链(&L)"
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
msgid "&New Password"
msgstr "新密码(&N)"
Modified: trunk/yast/zh_CN/po/cio.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/cio.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/cio.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-06-08 10:32+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -43,13 +43,13 @@
msgstr "已用"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "否"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "yes"
msgstr "是"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "否"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
msgid "Filter channels"
Modified: trunk/yast/zh_CN/po/cluster.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/cluster.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/cluster.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2016-03-04 00:01+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -125,13 +125,11 @@
#. BNC#880242, expected_votes must have value when "udp"
#: src/include/cluster/dialogs.rb:222
-#| 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"
+msgid "The Expected Votes has to be fulfilled when multicast transport is configured"
msgstr "当配置了多播传输时必须填写期望票数"
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
msgid "The Multicast Address has to be fulfilled"
msgstr "必须填写多播地址"
@@ -140,9 +138,7 @@
msgstr "多播端口必须为正整数"
#: src/include/cluster/dialogs.rb:272
-msgid ""
-"Only passive or active can be chosen if multiple interface used. Set to"
-" passive."
+msgid "Only passive or active can be chosen if multiple interface used. Set to passive."
msgstr "若使用了多个接口则只能选择主动或被动。设置为被动。"
#. BNC#871970, change member address struct to memberaddr
@@ -159,7 +155,7 @@
msgstr "绑定网络地址:"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
msgid "Multicast Address:"
msgstr "多播地址:"
@@ -209,127 +205,123 @@
" 请重新配置成员列表并确认全部其它设置。"
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
msgid "Enable Security Auth"
msgstr "启用安全认证"
-#: src/include/cluster/dialogs.rb:719
-msgid ""
-"For a newly created cluster, push the button below to generate"
-" /etc/corosync/authkey."
+#: src/include/cluster/dialogs.rb:721
+msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr "新创建的集群,请按下面按钮生成 /etc/corosync/authkey。"
-#: src/include/cluster/dialogs.rb:724
-msgid ""
-"To join an existing cluster, please copy /etc/corosync/authkey from other"
-" nodes manually."
+#: src/include/cluster/dialogs.rb:726
+msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr "要加入一个已有集群,请从其他节点手动复制 /etc/corosync/authkey。"
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
msgid "Failed to create /etc/corosync/authkey"
msgstr "创建 /etc/corosync/authkey 失败"
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
msgid "Create /etc/corosync/authkey succeeded"
msgstr "创建 /etc/corosync/authkey 成功"
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
msgid "Running"
msgstr "运行中"
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
msgid "Not running"
msgstr "未运行"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
msgid "Booting"
msgstr "引导时"
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
msgid "On -- Start pacemaker during boot"
msgstr "开 -- 引导时启动 pacemaker"
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
msgid "Off -- Start pacemaker manually"
msgstr "关 -- 手动启动 pacemaker"
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
msgid "Switch On and Off"
msgstr "打开和关闭"
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
msgid "Current Status: "
msgstr "当前状态:"
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
msgid "Start pacemaker Now"
msgstr "立即启动 pacemaker"
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
msgid "Stop pacemaker Now"
msgstr "立即停止 pacemaker"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
msgid "Sync Host"
msgstr "同步主机"
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Add"
msgstr "添加"
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
msgid "Del"
msgstr "删除"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Edit"
msgstr "编辑"
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
msgid "Sync File"
msgstr "同步文件"
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
msgid "Add Suggested Files"
msgstr "添加建议的文件"
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
msgid "Generate Pre-Shared-Keys"
msgstr "生成预共享密钥"
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
msgid "Csync2 Status Unknown"
msgstr "Csync2 状态未知"
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
msgid "Turn csync2 ON"
msgstr "开启 csync2"
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 OFF"
msgstr "关闭 csync2"
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
msgid "Enter a hostname"
msgstr "请输入一个主机名"
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
msgid "Edit the hostname"
msgstr "编辑主机名"
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
msgid "Enter a filename to synchronize"
msgstr "请输入要同步的文件名"
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
msgid "Edit the filename"
msgstr "编辑文件名"
#. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
@@ -338,12 +330,12 @@
"您想要覆盖它吗?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
msgid "Delete key file %1 failed."
msgstr "未能删除密钥文件 %1。"
#. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -351,15 +343,14 @@
"已生成密钥文件 %1。\n"
"点击\"添加建议的文件\"按钮将它添加到同步列表。"
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
msgid "Key generation failed."
msgstr "未能生成密钥。"
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
msgid ""
-"Conntrackd is a daemon which helps to duplicate firewall status between"
-" cluster nodes.\n"
+"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 ""
@@ -367,146 +358,60 @@
"YaST 可辅助配置 conntrackd 的一些基础部分。\n"
"您需要与 ocf:heartbeat:conntrackd 一起启动它。"
-#: src/include/cluster/dialogs.rb:1358
+#: src/include/cluster/dialogs.rb:1360
msgid "Dedicated Interface:"
msgstr "专用接口:"
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
msgid "IP:"
msgstr "IP:"
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
msgid "Group Number:"
msgstr "组编号:"
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr "生成 /etc/conntrackd/conntrackd.conf"
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
msgid "The Group Number must be a positive integer"
msgstr "组编号必须为正整数"
#. All helps are here
#: src/include/cluster/helps.rb:35
-#| msgid ""
-#| "<p><b><big>Bind Network Address</big></b><br>This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
-#| "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.</p>\n"
-#| "<p><b><big>Port</big></b><br>This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports.<br></p>\n"
-#| "<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>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
msgid ""
-"<p><b><big>Bind Network Address</big></b><br>This specifies the address"
-" which the openais executive should bind. This address should always end in "
-" zero. If the totem traffic should be routed over 192.168.5.92, set"
-" bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which"
-" case IPV6 networking will be used. In this case, the full address must be"
-" specified and there is no automatic selection of the network interface"
-" within a specific subnet as with IPv4. If IPv6 networking is used, the"
-" nodeid field must be specified.<br></p>\n"
-"<p><b><big>Multicast Address</big></b><br>This is the multicast address used"
-" by openais executive. The default should work for most networks, but"
-" the network administrator should be queried about a multicast address "
-" to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br"
-">This may also be an IPV6 multicast address, in which case IPV6 networking"
-" will be used. If IPv6 networking is used, the nodeid field must be"
-" specified.</p>\n"
-"<p><b><big>Port</big></b><br>This specifies the UDP port number. It is"
-" possible to use the same multicast address on a network with the openais "
-" services configured for different UDP ports.<br></p>\n"
-"<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 (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"
+"<p><b><big>Bind Network Address</big></b><br>This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
+"<p><b><big>Multicast Address</big></b><br>This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.</p>\n"
+"<p><b><big>Port</big></b><br>This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports.<br></p>\n"
+"<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 (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 ""
-"<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem"
-" 流量应通过 192.168.5.92 中转,则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6"
-" 地址,那样将会使用 IPV6 网络。这种情况下,必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6"
-" 网络,则必须指定节点 ID 字段。<br></p>\n"
-"<p><b><big>多播地址</big></b><br>这是 openais 执行文件使用的多播地址。默认值应可用于多数网络,但也应询问网络管理员要使用的"
-"多播地址。请避免 224.x.x.x 因为这是一个 \"配置\" 多播地址。<br>这里也可以为 IPV6 多播地址,那样将会使用 IPV6"
-" 网络。若使用了 IPV6 网络,则必须指定节点 ID 字段。</p>\n"
-"<p><b><big>端口</big></b><br>这指定了 UDP 端口号。可以在同一网络中为配置了不同的 UDP 端口的 openais"
-" 服务使用相同的多播地址。<br></p>\n"
-"<p><b><big>成员地址</big></b><br>这个列表通过 IP 地址指定了集群中的全部节点。当使用 udpu (Unicast)"
-" 时这里是可以配置的。<br></p>\n"
-"<p><b><big>节点 ID</big></b><br>该配置选项使用 IPv4 时为可选,IPv6 时为必选。这是一个 32"
-" 位值,指定了将传送给集群成员服务的节点标识符。若 IPv4 下该选项未指定,将使用该系统以环标识符 0 绑定到的 32 位 IP 地址。节点标识符值 0"
-" 是预留的,不应该使用。<br></p>\n"
-"<p><b><big>rrp 模式</big></b><br>这指定了冗余环的模式,可以为无,主动或被动。主动复制在故障网络环境中从发送到送达的延迟相对较低"
-",但性能较差。被动复制在 totem 协议未绑定 CPU 前可达到它的两倍速度。最后一个选项是无,仅使用一个网络接口来运行 totem"
-" 协议。若只指定了一个接口指令,则将自动选无。若指定了多个接口指令,则只能选择主动或被动。<br></p>\n"
-"<p><b><big>期望票数</big></b><br>参与表决的法定节点数的期望票数。当 corosync.conf 中存在 nodelist{}"
-" 部分时将自动计算 (当使用 unicast 传输时将生成该列表),也可以在 quorum{} 部分指定 (期望票数应使用集群的全部节点数)。若"
-" unicast 传输中存在期望票数,该值将覆盖自动计算出的值。<br></p>\n"
-"<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<"
-"br></p>\n"
+"<p><b><big>绑定网络地址</big></b><br>这指定了 openais 执行文件应绑定的地址。该地址应总以 0 结尾。若 totem 流量应通过 192.168.5.92 中转,则设置 bindnetaddr 为 192.168.5.0。<br>这里也可以为 IPV6 地址,那样将会使用 IPV6 网络。这种情况下,必须指定完整地址且无法像 IPV4 那样在特定子网中自动选择网络接口。若使用了 IPV6 网络,则必须指定节点 ID 字段。<br></p>\n"
+"<p><b><big>多播地址</big></b><br>这是 openais 执行文件使用的多播地址。默认值应可用于多数网络,但也应询问网络管理员要使用的多播地址。请避免 224.x.x.x 因为这是一个 \"配置\" 多播地址。<br>这里也可以为 IPV6 多播地址,那样将会使用 IPV6 网络。若使用了 IPV6 网络,则必须指定节点 ID 字段。</p>\n"
+"<p><b><big>端口</big></b><br>这指定了 UDP 端口号。可以在同一网络中为配置了不同的 UDP 端口的 openais 服务使用相同的多播地址。<br></p>\n"
+"<p><b><big>成员地址</big></b><br>这个列表通过 IP 地址指定了集群中的全部节点。当使用 udpu (Unicast) 时这里是可以配置的。<br></p>\n"
+"<p><b><big>节点 ID</big></b><br>该配置选项使用 IPv4 时为可选,IPv6 时为必选。这是一个 32 位值,指定了将传送给集群成员服务的节点标识符。若 IPv4 下该选项未指定,将使用该系统以环标识符 0 绑定到的 32 位 IP 地址。节点标识符值 0 是预留的,不应该使用。<br></p>\n"
+"<p><b><big>rrp 模式</big></b><br>这指定了冗余环的模式,可以为无,主动或被动。主动复制在故障网络环境中从发送到送达的延迟相对较低,但性能较差。被动复制在 totem 协议未绑定 CPU 前可达到它的两倍速度。最后一个选项是无,仅使用一个网络接口来运行 totem 协议。若只指定了一个接口指令,则将自动选无。若指定了多个接口指令,则只能选择主动或被动。<br></p>\n"
+"<p><b><big>期望票数</big></b><br>参与表决的法定节点数的期望票数。当 corosync.conf 中存在 nodelist{} 部分时将自动计算 (当使用 unicast 传输时将生成该列表),也可以在 quorum{} 部分指定 (期望票数应使用集群的全部节点数)。若 unicast 传输中存在期望票数,该值将覆盖自动计算出的值。<br></p>\n"
+"<p><b><big>自动生成节点 ID</big></b><br>当使用 IPv6 时需要节点 ID。启用自动生成节点 ID 将自动生成节点 ID。<br></p>\n"
#: 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.
<br></p>\n"
msgid ""
"\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. <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 ""
"\n"
-"<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用"
-" sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 totem"
-" 发送的消息,这将降低总吞吐量。启用后,据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU"
-" 帧传输的 100mbit 网络来说,在开启了此选项的 3ghz CPU 上,100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的"
-" 3ghz CPU 上,20% 的 CPU 使用率可以达到 10mb/秒的吞吐量。对于帧传输很大的 gig-e 网络来说:在启用了此选项的 3ghz"
-" CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n"
+"<p><b><big>启用安全认证</big></b><br>这指定了是否应该使用 HMAC/SHA1 认证来认证全部消息。它进一步指定了是否应该使用 sober128 加密算法加密全部数据来保护数据不受窃听。启用此选项将添加一个 36 字节的头部到每条 totem 发送的消息,这将降低总吞吐量。启用后,据 gprof 测量显示加密和认证在 aisexec 中消耗了 75% 的 CPU 周期。对于 1500 MTU 帧传输的 100mbit 网络来说,在开启了此选项的 3ghz CPU 上,100% CPU 使用率可达到 9mb/秒的吞吐量; 在关闭了此选项的 3ghz CPU 上,20% 的 CPU 使用率可以达到 10mb/秒的吞吐量。对于帧传输很大的 gig-e 网络来说:在启用了此选项的 3ghz CPU 上可以达到 20mb/秒的吞吐量; 在禁用了此选项的 3ghz CPU 上可以达到 60mb/秒的吞吐量。默认为开。<br></p>\n"
#: 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"
-"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall"
-" is enabled</p>\n"
+"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n"
+"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall is enabled</p>\n"
"\t\t\t"
msgstr ""
"\n"
@@ -517,42 +422,28 @@
#: 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"
-"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be"
-" synced.</p>\n"
-"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using"
-" the IP addresses and pre-shared-keys in Csync2. The key file is generated"
-" with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be"
-" copied to all members of the cluster manually after it's created.</p>\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"
+"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be synced.</p>\n"
+"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using the IP addresses and pre-shared-keys in Csync2. The key file is generated with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be copied to all members of the cluster manually after it's created.</p>\n"
"\t"
msgstr ""
"\n"
-"\t\t<p><b><big>同步主机</big></b><br>这里使用的主机名必须是集群节点的本地主机名。这意味着您必须输入与 hostname"
-" 命令的打印输出完全相同的内容。</p>\n"
+"\t\t<p><b><big>同步主机</big></b><br>这里使用的主机名必须是集群节点的本地主机名。这意味着您必须输入与 hostname 命令的打印输出完全相同的内容。</p>\n"
"\t\t<p><b><big>同步文件</big></b><br>要同步的完整绝对文件名。</p>\n"
-"\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k"
-" /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n"
+"\t\t<p><b><big>预共享密钥</big></b><br>在 Csync2 中使用 IP 地址和预共享密钥进行认证。可使用 csync2 -k /etc/csync2/key_hagroup 生成密钥文件。创建之后应将 key_hagroup 文件手动复制到所有集群成员中去。</p>\n"
"\t"
#: 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"
-"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated"
-" network interface. This is detected automatically.</p>\n"
-"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be"
-" used for syncing.</p>\n"
-"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for"
-" syncing.</p>\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"
+"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated network interface. This is detected automatically.</p>\n"
+"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be used for syncing.</p>\n"
+"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for syncing.</p>\n"
"\t"
msgstr ""
"\n"
-"\t\t<p><b><big>专用接口</big></b><br>一个用于同步的专用网络接口。接口必须支持多播,并且是在线可使用的。您或许需要预先配置它。<"
-"/p>\n"
+"\t\t<p><b><big>专用接口</big></b><br>一个用于同步的专用网络接口。接口必须支持多播,并且是在线可使用的。您或许需要预先配置它。</p>\n"
"\t\t<p><b><big>IP</big></b><br>指派给专用网络接口的 IPv4 地址。这是自动检测的。</p>\n"
"\t\t<p><b><big>多播地址</big></b><br>用于同步的多播地址。</p>\n"
"\t\t<p><b><big>组编号</big></b><br>同步时表示组的一个数字 ID。</p>\n"
@@ -609,97 +500,97 @@
msgstr "正在初始化..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
msgid "Initializing cluster Configuration"
msgstr "正在初始化集群配置"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
msgid "Read the database"
msgstr "读取数据库"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
msgid "Read the previous settings"
msgstr "读取以前的设置"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
msgid "Read SuSEFirewall Settings"
msgstr "读取 SuSEFirewall 设置"
#. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
msgid "Reading the database..."
msgstr "正在读取数据库..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
msgid "Reading the previous settings..."
msgstr "正在读取以前的设置..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
msgid "Reading SuSEFirewall settings..."
msgstr "正在读取 SuSEFirewall 设置..."
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
msgid "Finished"
msgstr "已完成"
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
msgid "Cannot install required package"
msgstr "无法安装所需的软件包"
#. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
msgid "Cannot load existing configuration"
msgstr "无法加载已有配置"
#. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
msgid "Cannot read database1."
msgstr "无法读取数据库 1。"
#. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
msgid "Cannot read database2."
msgstr "无法读取数据库 2。"
#. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
msgid "Cannot detect devices."
msgstr "无法检测设备。"
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
msgid "Saving cluster Configuration"
msgstr "正在保存集群配置"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
msgid "Write the settings"
msgstr "写入设置"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
msgid "Save changes to SuSEFirewall"
msgstr "保存修改到 SuSEFirewall"
#. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
msgid "Writing the settings..."
msgstr "正在写入设置..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
msgid "Saving changes to SuSEFirewall..."
msgstr "正在保存修改到 SuSEFirewall..."
#. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "无法写入设置。"
Modified: trunk/yast/zh_CN/po/control.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/control.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/control.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2016-06-05 16:45+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -49,266 +49,631 @@
" "
#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
msgid "CIM Server"
msgstr "通用信息模型 (CIM) 服务器"
#: control/control.SLED.glade.translations.glade:16
#: control/control.SLED.glade.translations.glade:17
#: control/control.SLED.glade.translations.glade:22
-#: control/control.SLED.glade.translations.glade:56
-#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
msgid "Installation Settings"
msgstr "安装设置"
#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
msgid "Overview"
msgstr "概览"
#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
msgid "Expert"
msgstr "专家"
#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
msgid "Live Installation Settings"
msgstr "Live 安装设置"
#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
msgid "Update Settings"
msgstr "更新设置"
#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Network Configuration"
msgstr "网络配置"
#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
msgid "Hardware Configuration"
msgstr "硬件配置"
#: control/control.SLED.glade.translations.glade:25
-#: control/control.SLED.glade.translations.glade:63
-#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
msgid "Preparation"
msgstr "准备"
#: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:50
-#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
msgid "Load linuxrc Network Configuration"
msgstr "加载 Linuxrc 网络配置"
#: control/control.SLED.glade.translations.glade:27
-#: control/control.SLED.glade.translations.glade:51
-#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
msgid "Network Autosetup"
msgstr "自动网络设置"
#: control/control.SLED.glade.translations.glade:28
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
msgid "Welcome"
msgstr "欢迎"
#: control/control.SLED.glade.translations.glade:29
-#: control/control.SLED.glade.translations.glade:53
-#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
msgid "Network Activation"
msgstr "网络激活"
#: control/control.SLED.glade.translations.glade:30
-#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
msgid "Disk Activation"
msgstr "磁盘激活"
#: control/control.SLED.glade.translations.glade:31
-#: control/control.SLED.glade.translations.glade:32
-#: control/control.SLED.glade.translations.glade:69
-#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
msgid "System Analysis"
msgstr "系统分析"
-#: control/control.SLED.glade.translations.glade:33
-#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
+#, fuzzy
+#| msgid "Online Update"
+msgid "Installer Update"
+msgstr "在线更新"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
msgid "Add-On Products"
msgstr "附加产品"
-#: control/control.SLED.glade.translations.glade:34
-#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
msgid "Disk"
msgstr "磁盘"
-#: control/control.SLED.glade.translations.glade:35
-#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:69
msgid "Time Zone"
msgstr "时区"
-#: control/control.SLED.glade.translations.glade:36
#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
msgid "User Settings"
msgstr "用户设置"
-#: control/control.SLED.glade.translations.glade:38
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
msgid "Installation Overview"
msgstr "安装概览"
-#: control/control.SLED.glade.translations.glade:39
#: control/control.SLED.glade.translations.glade:40
#: control/control.SLED.glade.translations.glade:41
#: control/control.SLED.glade.translations.glade:42
-#: control/control.SLED.glade.translations.glade:43
#: control/control.SLED.glade.translations.glade:44
#: control/control.SLED.glade.translations.glade:45
#: control/control.SLED.glade.translations.glade:46
#: control/control.SLED.glade.translations.glade:47
#: control/control.SLED.glade.translations.glade:48
-#: control/control.SLED.glade.translations.glade:58
-#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
#: control/control.SLED.glade.translations.glade:60
#: control/control.SLED.glade.translations.glade:61
#: control/control.SLED.glade.translations.glade:62
-#: control/control.SLED.glade.translations.glade:83
-#: control/control.SLED.glade.translations.glade:84
-#: control/control.SLED.glade.translations.glade:85
-#: control/control.SLED.glade.translations.glade:86
-#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
#: control/control.SLED.glade.translations.glade:88
#: control/control.SLED.glade.translations.glade:89
-#: control/control.SLED.glade.translations.glade:104
-#: control/control.SLED.glade.translations.glade:105
-#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
+#: control/control.openSUSE.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:56
+#: control/control.openSUSE.glade.translations.glade:58
+#: control/control.openSUSE.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:60
+#: control/control.openSUSE.glade.translations.glade:61
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.openSUSE.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:76
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.openSUSE.glade.translations.glade:102
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
msgid "Perform Installation"
msgstr "执行安装"
-#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "安装"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
msgid "Installation"
msgstr "安装"
-#: control/control.SLED.glade.translations.glade:70
-#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
msgid "System for Update"
msgstr "待更新系统"
-#: control/control.SLED.glade.translations.glade:72
-#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
msgid "Update"
msgstr "更新"
-#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
msgid "Update Summary"
msgstr "更新摘要"
-#: control/control.SLED.glade.translations.glade:74
-#: control/control.SLED.glade.translations.glade:75
-#: control/control.SLED.glade.translations.glade:76
#: control/control.SLED.glade.translations.glade:77
#: control/control.SLED.glade.translations.glade:78
-#: control/control.SLED.glade.translations.glade:97
-#: control/control.SLED.glade.translations.glade:98
-#: control/control.SLED.glade.translations.glade:99
-#: control/control.SLED.glade.translations.glade:100
-#: control/control.SLED.glade.translations.glade:101
-#: control/control.SLED.glade.translations.glade:102
-#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
#: control/control.SLED.glade.translations.glade:109
#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
+#: control/control.openSUSE.glade.translations.glade:90
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:122
+#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
msgid "Perform Update"
msgstr "执行更新"
-#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
msgid "Base Installation"
msgstr "基本安装"
-#: control/control.SLED.glade.translations.glade:80
-#: control/control.SLED.glade.translations.glade:81
-#: control/control.SLED.glade.translations.glade:82
-#: control/control.SLED.glade.translations.glade:93
-#: control/control.SLED.glade.translations.glade:94
-#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
msgid "AutoYaST Settings"
msgstr "AutoYaST 设置"
-#: control/control.SLED.glade.translations.glade:107
-#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
msgid "Configuration"
msgstr "配置"
-#: control/control.SLED.glade.translations.glade:108
-#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
msgid "System Configuration"
msgstr "系统配置"
-#~ msgid ""
-#~ "\n"
-#~ "<p><b>Congratulations!</b></p>\n"
-#~ "<p>The installation of openSUSE on your machine is complete.\n"
-#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-#~ "<p>Visit us at %1.</p>\n"
-#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ "<p><b>恭喜!</b></p>\n"
-#~ "<p>openSUSE 已在您的计算机上安装完毕。\n"
-#~ "点击<b>完成</b>后,您就可以登入系统了。</p>\n"
-#~ "<p>欢迎访问我们的站点:%1。</p>\n"
-#~ "<p>祝您使用愉快!<br>您的 openSUSE 开发团队</p>\n"
-#~ " "
+#: control/control.SLES.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click <b>Finish</b> to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.suse.com/.\n"
+#| "</p>\n"
+#| " "
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
+msgstr ""
+"\n"
+"<p>\n"
+"安装已成功完成。\n"
+"您的系统已经可以使用了。\n"
+"请点击<b>完成</b>来登入系统。\n"
+"</p>\n"
+"<p>\n"
+"欢迎访问我们的站点 http://www.suse.com/。\n"
+"</p>\n"
+" "
-#~ msgid ""
-#~ "The desktop environment on your computer provides the graphical user\n"
-#~ "interface for your computer, as well as a suite of applications for\n"
-#~ "email, Web browsing, office productivity, games, and utilities to\n"
-#~ "manage your computer.\n"
-#~ "\n"
-#~ "openSUSE offers a choice of desktop environments. The most widely\n"
-#~ "used desktop environments are GNOME and KDE, and they are equally\n"
-#~ "supported under openSUSE. Both desktop environments are easy to use,\n"
-#~ "highly integrated, and have an attractive look and feel. Each desktop\n"
-#~ "environment has a distinct style, so personal taste determines which\n"
-#~ "is the most appropriate desktop for you."
-#~ msgstr ""
-#~ "您计算机上的桌面环境为您的计算机提供了图形用户界面,以及用于\n"
-#~ "电子邮件、网络浏览、办公生产、游戏的一套应用程序\n"
-#~ "和管理计算机的实用工具。\n"
-#~ "\n"
-#~ "openSUSE 提供了几种桌面环境供您选择。使用最广泛的\n"
-#~ "桌面环境是 GNOME 和 KDE,它们在 openSUSE 下有着平等\n"
-#~ "的支持。两者均易于使用、高度集成、外观诱人。\n"
-#~ "每种桌面环境都有独特的风格,因此个人品味决定了哪款\n"
-#~ "桌面最适合您。"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
+#, fuzzy
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "待更新系统"
-#~ msgid "GNOME Desktop"
-#~ msgstr "GNOME 桌面"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE 桌面"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
-#~ msgid "XFCE Desktop"
-#~ msgstr "XFCE 桌面"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
-#~ msgid "LXDE Desktop"
-#~ msgstr "LXDE 桌面"
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
-#~ msgid "Minimal X Window"
-#~ msgstr "极简 X 窗口系统"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
+#, fuzzy
+#| msgid "XEN Virtualization Host"
+msgid "KVM Virtualization Host"
+msgstr "XEN 虚拟主机"
-#~ msgid "Enlightenment Desktop"
-#~ msgstr "Enlightenment 桌面"
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
-#~ msgid "Minimal Server Selection (Text Mode)"
-#~ msgstr "极简服务器选集 (文本模式)"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+#| msgid "XEN Virtualization Host"
+msgid "Xen Virtualization Host"
+msgstr "XEN 虚拟主机"
-#~ msgid "Online Repositories"
-#~ msgstr "在线软件源"
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
-#~ msgid "Desktop Selection"
-#~ msgstr "桌面选择"
+#: control/control.SLES.glade.translations.glade:48
+msgid "Network Services Configuration"
+msgstr "网络服务配置"
-#~ msgid "Network Services Configuration"
-#~ msgstr "网络服务配置"
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Load linuxrc Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "加载 Linuxrc 网络配置"
-#~ msgid "Installation Summary"
-#~ msgstr "安装摘要"
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "安装摘要"
+#: control/control.openSUSE.glade.translations.glade:3
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+"\n"
+"<p><b>恭喜!</b></p>\n"
+"<p>openSUSE 已在您的计算机上安装完毕。\n"
+"点击<b>完成</b>后,您就可以登入系统了。</p>\n"
+"<p>欢迎访问我们的站点:%1。</p>\n"
+"<p>祝您使用愉快!<br>您的 openSUSE 开发团队</p>\n"
+" "
+
+#: control/control.openSUSE.glade.translations.glade:10
+#, fuzzy
+#| msgid ""
+#| "The desktop environment on your computer provides the graphical user\n"
+#| "interface for your computer, as well as a suite of applications for\n"
+#| "email, Web browsing, office productivity, games, and utilities to\n"
+#| "manage your computer.\n"
+#| "\n"
+#| "openSUSE offers a choice of desktop environments. The most widely\n"
+#| "used desktop environments are GNOME and KDE, and they are equally\n"
+#| "supported under openSUSE. Both desktop environments are easy to use,\n"
+#| "highly integrated, and have an attractive look and feel. Each desktop\n"
+#| "environment has a distinct style, so personal taste determines which\n"
+#| "is the most appropriate desktop for you."
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"您计算机上的桌面环境为您的计算机提供了图形用户界面,以及用于\n"
+"电子邮件、网络浏览、办公生产、游戏的一套应用程序\n"
+"和管理计算机的实用工具。\n"
+"\n"
+"openSUSE 提供了几种桌面环境供您选择。使用最广泛的\n"
+"桌面环境是 GNOME 和 KDE,它们在 openSUSE 下有着平等\n"
+"的支持。两者均易于使用、高度集成、外观诱人。\n"
+"每种桌面环境都有独特的风格,因此个人品味决定了哪款\n"
+"桌面最适合您。"
+
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "GNOME 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Plasma Desktop"
+msgstr "KDE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+#| msgid "Minimal Server Selection (Text Mode)"
+msgid "Server (Text Mode)"
+msgstr "极简服务器选集 (文本模式)"
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+#| msgid "XFCE Desktop"
+msgid "Xfce Desktop"
+msgstr "XFCE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "LXDE Desktop"
+msgstr "LXDE 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr "极简 X 窗口系统"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Enlightenment Desktop"
+msgstr "Enlightenment 桌面"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "极简服务器选集 (文本模式)"
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+msgid "Online Repositories"
+msgstr "在线软件源"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "桌面选择"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "附加产品安装"
@@ -368,9 +733,6 @@
#~ msgid "Customer Center"
#~ msgstr "客户中心"
-#~ msgid "Online Update"
-#~ msgstr "在线更新"
-
#~ msgid "Release Notes"
#~ msgstr "版本资讯"
@@ -442,13 +804,10 @@
#~ msgid ""
#~ "openSUSE offers you a choice of user interfaces. The two major complete \n"
-#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a "
-#~ "full \n"
-#~ "suite of applications including email, a file manager, games and "
-#~ "utilities. \n"
+#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full \n"
+#~ "suite of applications including email, a file manager, games and utilities. \n"
#~ " \n"
-#~ "As desktop selection is a matter of taste, we do not give a "
-#~ "recommendation."
+#~ "As desktop selection is a matter of taste, we do not give a recommendation."
#~ msgstr ""
#~ "openSUSE 让您选择用户界面。两种完整的桌面环境是\n"
#~ "KDE 和 GNOME。两者都很易用,并带有一整套应用程序,\n"
@@ -491,6 +850,3 @@
#~ msgid "Virtual Machine"
#~ msgstr "虚拟机"
-
-#~ msgid "XEN Virtualization Host"
-#~ msgstr "XEN 虚拟主机"
Modified: trunk/yast/zh_CN/po/country.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/country.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/country.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2015-10-18 12:07+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -665,7 +665,9 @@
#. command line help text for 'set hwclock' option
#: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
msgstr "硬件时钟的新值"
#. summary label
@@ -851,49 +853,49 @@
"无效日期 (DD-MM-YYYY) %1。\n"
"请输入正确的日期。\n"
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
msgid "Other &Settings..."
msgstr "其它设置(&S)..."
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
msgid "Date and Time (NTP is configured)"
msgstr "日期和时间(NTP 已配置)"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
msgid "Date and Time"
msgstr "日期和时间"
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
msgid "&Hardware Clock Set to UTC"
msgstr "硬件时钟设置为 UTC (&H)"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
msgid "&Region"
msgstr "区域(&R)"
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
msgid "Time &Zone"
msgstr "时区(&Z)"
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
msgid "Date and Time:"
msgstr "日期和时间:"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -902,7 +904,7 @@
"<p><b><big>时区和时钟设置</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -917,7 +919,7 @@
"</p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -928,12 +930,12 @@
"</p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
msgid "Clock and Time Zone"
msgstr "时钟和时区"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
msgid "Select a valid time zone."
msgstr "选择有效的时区。"
@@ -1021,181 +1023,188 @@
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "西班牙语(拉丁美洲)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Italian"
msgstr "意大利语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese"
msgstr "葡萄牙语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil)"
msgstr "葡萄牙语(巴西)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Portuguese (Brazil -- US accents)"
msgstr "葡萄牙语(巴西 -- 美国口音)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Greek"
msgstr "希腊语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Dutch"
msgstr "荷兰语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Danish"
msgstr "丹麦语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Norwegian"
msgstr "挪威语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Swedish"
msgstr "瑞典语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Finnish"
msgstr "芬兰语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
msgid "Czech"
msgstr "捷克语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
msgid "Czech (qwerty)"
msgstr "捷克语 (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
msgid "Slovak"
msgstr "斯洛伐克语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
msgid "Slovak (qwerty)"
msgstr "斯洛伐克语 (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
msgid "Slovene"
msgstr "斯洛文尼亚语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "匈牙利语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "波兰语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "俄语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "塞尔维亚语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "爱沙尼亚语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "立陶宛语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "土耳其语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "克罗地亚语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "日语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "比利时语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "德沃夏克键盘"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "冰岛语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "乌克兰语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "高棉语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "韩语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "阿拉伯语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "塔吉克语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "繁体中文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "简体中文"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "罗马尼亚语"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr "美国国际"
Modified: trunk/yast/zh_CN/po/dhcp-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/dhcp-server.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/dhcp-server.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: dhcp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2016-06-05 16:30+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -513,8 +513,7 @@
#. at least minimal configuration
#: src/include/dhcp-server/dialogs2.rb:577
msgid ""
-"One or more selected network interfaces is not configured (no assigned IP "
-"address \n"
+"One or more selected network interfaces is not configured (no assigned IP address \n"
"and netmask)."
msgstr "一个或多个所选网络接口尚未配置 (无指派的 IP 地址和网关)。"
@@ -717,8 +716,7 @@
#: src/include/dhcp-server/dialogs2.rb:1546
#: src/include/dhcp-server/dialogs2.rb:1569
msgid ""
-"The dynamic DHCP address range must be in the same network as the DHCP "
-"server.\n"
+"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
msgstr ""
"动态 DHCP 地址范围必须与 DHCP 服务器在同一网络。\n"
@@ -877,8 +875,7 @@
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
-"YaST does not supported this. The DHCP server module can only read and "
-"write\n"
+"YaST does not supported this. The DHCP server module can only read and write\n"
"/etc/dhcpd.conf. The new configuration from %1 will not be imported. All\n"
"changes will be saved to the default configuration file.\n"
" \n"
@@ -906,8 +903,7 @@
"<p><b><big>Adding a New Range of DNS Records</big></b><br />\n"
"<b>First IP Address</b> defines\n"
"the starting address of the range and <b>Last IP Address</b> defines\n"
-"the last one. <b>Hostname Base</b> is a string that determines how "
-"hostnames\n"
+"the last one. <b>Hostname Base</b> is a string that determines how hostnames\n"
"are created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>).\n"
"<tt>%i</tt> is replaced with the number of the host in the range.\n"
"If no <tt>%i</tt> is defined, the number is added at the end of the\n"
@@ -947,8 +943,7 @@
#: src/include/dhcp-server/dns-helps.rb:42
msgid ""
"<p><b>New Zone Name</b> or <b>Reverse Zone Name</b>\n"
-"are taken from your current DHCP server and network settings and cannot be "
-"changed.</p>\n"
+"are taken from your current DHCP server and network settings and cannot be changed.</p>\n"
msgstr ""
"<p><b>新区域名称</b>或<b>反向区域名称</b>,\n"
"取自当前的 DHCP 服务器和网络设置,所以不能更改。</p>\n"
@@ -986,8 +981,7 @@
"the zone name servers.</p>\n"
msgstr ""
"<p><b><big>DNS 查询</big></b><br />\n"
-"每个 DNS 查询 (例如在一个 DNS 区域查询一个主机名的 IP 地址) 先询问当前区域名"
-"称服务器的父区域\n"
+"每个 DNS 查询 (例如在一个 DNS 区域查询一个主机名的 IP 地址) 先询问当前区域名称服务器的父区域\n"
"(对于 <tt>example.com</tt> 为 <tt>com</tt>),\n"
"然后向这些名称服务器发送一个 DNS 查询,\n"
"以获取包含所需 IP 地址的答复。<br />\n"
@@ -998,8 +992,7 @@
#: src/include/dhcp-server/dns-helps.rb:67
msgid ""
"<p>To add a <b>New Name Server</b>, click <b>Add</b>, complete the form,\n"
-"then click <b>Ok</b>. If the new name server name is included in the "
-"current\n"
+"then click <b>Ok</b>. If the new name server name is included in the current\n"
"DNS zone, also enter its IP address. This is mandatory because it is used\n"
"during the zone creation.</p>\n"
msgstr ""
@@ -1025,8 +1018,7 @@
"<p><b><big>DNS Records</big></b><br />\n"
"Define DNS hostnames for all DHCP clients. You do not need to define\n"
"all hostnames one by one. Set simple rules for how\n"
-"the hostnames are created. These rules define the ranges of IP addresses to "
-"use\n"
+"the hostnames are created. These rules define the ranges of IP addresses to use\n"
"and the string from which hostnames are generated for a range.</p>\n"
msgstr ""
"<p><b><big>DNS 记录</big></b><br />\n"
@@ -1122,13 +1114,10 @@
"<p>\n"
" To create or remove a single DNS record,\n"
"click <b>Add</b> or <b>Delete</b>.\n"
-"To synchronize the DNS entries with their reverse forms in the "
-"corresponding\n"
+"To synchronize the DNS entries with their reverse forms in the corresponding\n"
"reverse zone, select <b>Synchronize with Reverse Zone</b>.\n"
"Use <b>Remove DNS Records Matching Range</b> \n"
-"from <b>Special Tasks</b> to delete any information relating to this range "
-"of IP addresses from the DNS server. To create a new range of DNS records, "
-"select\n"
+"from <b>Special Tasks</b> to delete any information relating to this range of IP addresses from the DNS server. To create a new range of DNS records, select\n"
"<b>Add New Range of DNS Records</b> from <b>Special Tasks</b>.</p>\n"
msgstr ""
"<p>\n"
@@ -1137,8 +1126,7 @@
"要将 DNS 项与相应反向区域中的\n"
"反向形式同步,请选择<b>与反向区域同步</b>。\n"
"使用<b>特殊任务</b>中的\n"
-"<b>去除 DNS 记录匹配范围</b>可从该 DNS 服务器删除任何与此 IP 地址范围相关的信"
-"息。要创建新的 DNS 记录范围,请从<b>特殊任务</b>中\n"
+"<b>去除 DNS 记录匹配范围</b>可从该 DNS 服务器删除任何与此 IP 地址范围相关的信息。要创建新的 DNS 记录范围,请从<b>特殊任务</b>中\n"
"选择<b>添加新的 DNS 记录范围</b>。</p>\n"
#. old_range: $[
@@ -1417,8 +1405,7 @@
#: src/include/dhcp-server/dns-server-wizard.rb:234
msgid ""
"No IP address has been provided for a name server in the current DNS zone.\n"
-"This may not work because each zone needs the name and IP of its name server "
-"defined. \n"
+"This may not work because each zone needs the name and IP of its name server defined. \n"
"Really use the current settings?\n"
msgstr ""
"在当前 DNS 区域中未提供名称服务器的 IP 地址。\n"
@@ -1893,8 +1880,7 @@
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
-"their primary name server. If the name server runs on the same host as the "
-"DHCP\n"
+"their primary name server. If the name server runs on the same host as the DHCP\n"
"server, you can leave the fields empty.</p>"
msgstr ""
"<p><b><big>要更新的区域</big></b><br>\n"
@@ -1906,10 +1892,8 @@
#: src/include/dhcp-server/helps.rb:143
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
-"Here you can specify parameters that you want DHCP Server to be started "
-"with \n"
-"(e.g. \"-p 1234\") for a non-standard port to listen on). For all possible "
-"options,\n"
+"Here you can specify parameters that you want DHCP Server to be started with \n"
+"(e.g. \"-p 1234\") for a non-standard port to listen on). For all possible options,\n"
"consult dhcpd manual page. If left blank, default values will be used.</p>"
msgstr ""
"<p><b><big>DHCP 服务器启动参数</big></b><br>\n"
@@ -1921,8 +1905,7 @@
#: src/include/dhcp-server/helps.rb:150
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
-"Select one or more of the listed network cards to use for the DHCP server.</"
-"p>\n"
+"Select one or more of the listed network cards to use for the DHCP server.</p>\n"
msgstr ""
"<p><b><big>网卡选择</big></b><br>\n"
"选择用于 DHCP 服务器的列出的一张或多张网卡。</p>\n"
@@ -1986,8 +1969,7 @@
#. Wizard Installation - Step 2 7/9
#: src/include/dhcp-server/helps.rb:183
-msgid ""
-"<p><b>Print Server</b> offers this server as the default print server.</p>"
+msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr "<p><b>打印服务器</b>提供此服务器作为默认打印服务器。</p>"
#. Wizard Installation - Step 2 8/9
@@ -2002,8 +1984,7 @@
#. Wizard Installation - Step 2 9/9
#: src/include/dhcp-server/helps.rb:191
msgid ""
-"<p><b>Default Lease Time</b> sets the time after which the leased IP "
-"expires\n"
+"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
msgstr ""
"<p><b>默认租用时间</b>用于设置租用的 IP 在多长时间后失效,\n"
@@ -2027,8 +2008,7 @@
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
-"of the address range to be leased to clients. These addresses must have the "
-"same netmask.\n"
+"of the address range to be leased to clients. These addresses must have the same netmask.\n"
"For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check the <b>\n"
"Allow Dynamic BOOTP</b> flag if the specified range may be dynamically\n"
"assigned to BOOTP clients as well as DHCP clients</p>.\n"
@@ -2526,7 +2506,7 @@
" \n"
"现在正在中止。"
-#. error report
+#. error report
#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
@@ -2634,7 +2614,7 @@
msgid "Error occurred while creating %1."
msgstr "创建 %1 时出错。"
-#. error report, %1 is LDAP record key
+#. error report, %1 is LDAP record key
#: src/modules/DhcpServer.pm:2754
msgid "Error occurred while updating %1."
msgstr "更新 %1 时出错。"
Modified: trunk/yast/zh_CN/po/dns-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/dns-server.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/dns-server.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: dns server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2016-03-03 23:17+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -164,14 +164,12 @@
#. 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)"
+msgid "Name server (in fully qualified format finished with a dot or relative name)"
msgstr "名称服务器 (使用以一个点结尾的完全限定格式或相对名称)"
#. 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)"
+msgid "Mail server (in fully qualified format finished with a dot or relative name)"
msgstr "邮件服务器 (使用以一个点结尾的完全限定格式或相对名称)"
#. TRANSLATORS: commandline short help for command
@@ -221,8 +219,7 @@
#. 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"
+msgid "DNS resource record value, such as 192.0.34.166 for example.org's A record"
msgstr "DNS 资源记录值,诸如表示 example.org 的 A 记录的 192.0.34.166"
#. TRANSLATORS: commandline short help for command
@@ -307,8 +304,7 @@
#. TRANSLATORS: commandline error message
#. Both Add and Remove defined => Error!
#: 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:999 src/include/dns-server/cmdline.rb:1049
#: src/include/dns-server/cmdline.rb:1108
#: src/include/dns-server/cmdline.rb:1244
#: src/include/dns-server/cmdline.rb:1303
@@ -379,11 +375,10 @@
#. Table header item - ACL-options
#. Table menu item - Records listing
#: 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:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
msgid "Value"
msgstr "值"
@@ -401,7 +396,7 @@
#. TRANSLATORS: commandline table header item
#. Textentry - DNS adding zone - Name
#: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
msgid "Name"
msgstr "名称"
@@ -411,9 +406,9 @@
#. Table header item - DNS listing zones
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
msgid "Type"
msgstr "类型"
@@ -426,8 +421,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
#: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
msgid "Forwarders"
msgstr "转发对象"
@@ -457,12 +452,11 @@
#. TRANSLATORS: commandline table header item
#. TRANSLATORS: commandline table header item
#. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: 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:1905
+#: src/include/dns-server/dialog-main.rb:1639
msgid "Zone"
msgstr "区域"
@@ -491,14 +485,14 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
msgid "Mail Server"
msgstr "邮件服务器"
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
msgid "Priority"
msgstr "优先级"
@@ -560,8 +554,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:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
msgid "DNS Zones"
msgstr "DNS 区域"
@@ -583,7 +577,7 @@
#. check box
#. TRANSLATORS: checkbox label, turning LDAP support on or off
#: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
msgid "&LDAP Support Active"
msgstr "激活 &LDAP 支持"
@@ -608,132 +602,88 @@
msgstr "DNS 服务器专家配置(&E)..."
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
msgid "DNS Server"
msgstr "DNS 服务器"
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#| msgid "Apply Changes to Dialog"
-msgid "Apply Changes"
-msgstr "应用修改"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-msgid "Start-Up"
-msgstr "启动"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-msgid "Basic Options"
-msgstr "基本选项"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "日志记录"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: 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"
-msgstr "访问控制列表"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-msgid "TSIG Keys"
-msgstr "TSIG 密钥"
-
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
msgid "Local DNS Resolution &Policy"
msgstr "本地 DNS 解析策略(&P)"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
msgid "Merging forwarders is disabled"
msgstr "已禁用了合并转发对象"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
msgid "Automatic merging"
msgstr "自动合并"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
msgid "Merging forwarders is enabled"
msgstr "已启用了合并转发对象"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
msgid "Custom configuration"
msgstr "自定义配置"
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
msgid "Custom policy"
msgstr "自定义策略"
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
msgid "Local DNS Resolution &Forwarder"
msgstr "本地 DNS 解析转发对象(&F)"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
msgid "Using system name servers"
msgstr "使用系统名称服务器"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
msgid "This name server (bind)"
msgstr "此名称服务器 (bind)"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
msgid "Local dnsmasq server"
msgstr "本地 dnsmasq 服务器"
#. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
msgid "Add IP Address"
msgstr "添加 IP 地址"
#. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
msgid "IPv4 or IPv6 A&ddress"
msgstr "IPv4 或 IPv6 地址(&D)"
#. Selectionbox for listing current DNS-Forwarders
#. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
msgid "Forwarder &List"
msgstr "转发对象列表(&L)"
#. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
msgid "Cannot set local forwarder to %{forwarder}"
msgstr "无法将本地转发对象设为 %{forwarder}"
#. An error message, %1 is replaced with a variable IP
-#: src/include/dns-server/dialog-main.rb:877
+#: src/include/dns-server/dialog-main.rb:611
msgid "Cannot find local equivalent for IP %1."
msgstr "无法找到 IP %1 的本地等价。"
#. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
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"
@@ -743,64 +693,64 @@
"IP 地址 %1 目前正由此服务器使用,因此它已被修改为它的本地等价 %2。"
#. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
msgid "Invalid IPv4 or IPv6 address."
msgstr "无效的 IPv4 或 IPv6 地址。"
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
msgid ""
"A valid IPv6 address consists of letters a-f, numbers,\n"
"and colons."
msgstr "有效 IPv6 地址由字母 a 到 f,数字,和冒号组成。"
#. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
msgid "The specified forwarder is already present."
msgstr "指定转发对象已存在。"
#. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
msgid "Add or Change Option"
msgstr "添加或修改选项"
#. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
msgid "O&ption"
msgstr "选项(&P)"
#. Textentry for setting the basic-option value
#. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
msgid "&Value"
msgstr "值(&V)"
#. Pushbutton for changing the basic-option
#. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
msgid "C&hange"
msgstr "修改(&H)"
#. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
msgid "Current Options"
msgstr "当前选项"
#. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
msgid "Option"
msgstr "选项"
#. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
msgid ""
"Really set this\n"
"option without any value?\n"
msgstr "真的要设置此选项为没有任何值吗?\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:1173
+#: src/include/dns-server/dialog-main.rb:907
msgid ""
"Option %1 can only have a yes or no value set.\n"
"Really set it to %2?\n"
@@ -809,7 +759,7 @@
"真的将它设为 %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:1190
+#: src/include/dns-server/dialog-main.rb:924
msgid ""
"Option %1 can only be a number.\n"
"Really set it to %2?\n"
@@ -818,7 +768,7 @@
"真的将它设置为 %2 吗?\n"
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
msgid ""
"Quotes are not used correctly in this option.\n"
"Really set it to %1?\n"
@@ -827,7 +777,7 @@
"真的将它设为 %1 吗?\n"
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
msgid ""
"Brackets are not used correctly in this option.\n"
"Really set it to %1?\n"
@@ -836,7 +786,7 @@
"真的将它设为 %1 吗?\n"
#. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
msgid ""
"Option %1 should be set only once.\n"
"Really add another one?\n"
@@ -845,77 +795,77 @@
"真的要添加另一个吗?\n"
#. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
msgid "Log Type"
msgstr "日志类型"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
msgid "&System Log"
msgstr "系统日志(&S)"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
msgid "&File"
msgstr "文件(&F)"
#. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
msgid "Maximum &Size (MB)"
msgstr "最大大小 (MB)(&S)"
#. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
msgid "Maximum &Versions"
msgstr "最大版本数(&V)"
#. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
msgid "Additional Logging"
msgstr "额外日志记录"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
msgid "Log All DNS &Queries"
msgstr "记录全部 DNS 查询(&Q)"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
msgid "Log Zone &Updates"
msgstr "记录区域更新(&U)"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
msgid "Log Zone &Transfers"
msgstr "记录区域传输(&T)"
#. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
msgid "Select File for Log"
msgstr "选择日志文件"
#. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
msgid "Option Setup"
msgstr "选项设置"
#. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
msgid "&Name"
msgstr "名称(&N)"
#. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
msgid "Current ACL List"
msgstr "当前访问控制列表列表"
#. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
msgid "ACL"
msgstr "访问控制列表"
#. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
msgid ""
"This ACL is used by %1 zones.\n"
"Really remove it?\n"
@@ -924,12 +874,12 @@
"真的移除它吗?\n"
#. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
msgid "The specified ACL entry already exists."
msgstr "指定访问控制列表项已存在。"
#. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
msgid "Add New Zone "
msgstr "添加新区域"
@@ -938,8 +888,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:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
msgid "Master"
msgstr "主"
@@ -949,9 +899,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:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
msgid "Slave"
msgstr "从属"
@@ -960,35 +910,34 @@
#. TRANSLATORS: Table item - Server type
#. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-#
#. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
msgid "Forward"
msgstr "转发"
#. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
msgid "Configured DNS Zones"
msgstr "已配置的 DNS 区域"
#. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
msgid "A zone with the specified name is already configured."
msgstr "指定名称的区域已配置。"
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
msgid "Saving the configuration failed. Change the settings?"
msgstr "保存配置失败。修改设置吗?"
#. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
-#| msgid "Save configuration files"
+#: src/include/dns-server/dialog-main.rb:1903
msgid "Saving the configuration failed"
msgstr "保存配置失败"
#. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
msgid ""
"All changes will be lost.\n"
"Really leave the DNS server configuration without saving?"
@@ -996,74 +945,117 @@
"全部修改均将不复存在。\n"
"真的不保存就离开 DNS 服务器配置吗?"
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+msgid "Apply Changes"
+msgstr "应用修改"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+msgid "Start-Up"
+msgstr "启动"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+msgid "Basic Options"
+msgstr "基本选项"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "日志记录"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr "访问控制列表"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+msgid "TSIG Keys"
+msgstr "TSIG 密钥"
+
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
msgid "A&llow Dynamic Updates"
msgstr "允许动态更新(&L)"
#. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
msgid "TSIG &Key"
msgstr "TSIG 密钥(&K)"
#. check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
msgid "Enable &Zone Transport"
msgstr "启用区域传输(&Z)"
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
msgid "A&utomatically Generate Records From"
msgstr "自动生成记录自(&U)"
#. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
msgid "Zon&e"
msgstr "区域(&E)"
#. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
msgid "Connected Reverse Zones"
msgstr "连接的反向区域"
#. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
msgid ""
"This function is not available during\n"
"preparation for autoinstallation.\n"
msgstr "此功能在自动安装准备期间不可用。\n"
#. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
msgid "No TSIG key is defined."
msgstr "未定义 TSIG 密钥。"
#. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
msgid "&Name Server to Add"
msgstr "要添加的名称服务器(&N)"
#. Selectionbox - listing current nameservers
#. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
msgid "Na&me Server List"
msgstr "名称服务器列表(&M)"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
msgid "The specified name server already exists."
msgstr "指定名称服务器已存在。"
#. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
msgid "Mail Server to Add"
msgstr "要添加的邮件服务器"
#. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
msgid "&Address"
msgstr "地址(&A)"
@@ -1071,116 +1063,116 @@
#. IntField - zone settings - Record Value
#. IntField - zone settings - Record Value
#. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
#: src/include/dns-server/options.rb:435
msgid "&Priority"
msgstr "优先级(&P)"
#. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
msgid "Mail Relay List"
msgstr "邮件中继列表"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
msgid "The specified value is not a valid hostname or IP address."
msgstr "指定值不是一个有效的主机名或 IP 地址。"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
msgid "The specified mail server already exists."
msgstr "指定邮件服务器已存在。"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
msgid "Seconds"
msgstr "秒"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
msgid "Minutes"
msgstr "分钟"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
msgid "Hours"
msgstr "小时"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
msgid "Days"
msgstr "天"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
msgid "Weeks"
msgstr "周"
#. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
msgid "Seri&al"
msgstr "序列号(&A)"
#. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
msgid "TT&L"
msgstr "TT&L"
#. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
msgid "&Unit"
msgstr "单元(&U)"
#. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
msgid "Re&fresh"
msgstr "刷新(&F)"
#. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
msgid "Un&it"
msgstr "单元(&I)"
#. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
msgid "Retr&y"
msgstr "重试(&Y)"
#. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
msgid "Ex&piration"
msgstr "失效期(&P)"
#. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
msgid "U&nit"
msgstr "单元(&N)"
#. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
msgid "&Minimum"
msgstr "最小值(&M)"
#. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
msgid "Uni&t"
msgstr "单元(&T)"
#. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
msgid "The serial number of the zone must be specified."
msgstr "必须指定该区域的序列号。"
#. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
msgid "The serial number must be no more than %1 digits long."
msgstr "序列号的长度不能超过 %1 个数字。"
#. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
msgid ""
"The expiration time-out is higher than the time period\n"
"of zone refreshes. The zone will not be reachable\n"
@@ -1194,104 +1186,104 @@
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
msgid "&Record Key"
msgstr "记录键(&R)"
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
msgid "T&ype"
msgstr "类型(&Y)"
#. Textentry - zone settings - Record Value
#. IntField - zone settings - Record Value
#. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
msgid "Val&ue"
msgstr "值(&U)"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
msgid "&Service"
msgstr "服务(&S)"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
msgid "&Protocol"
msgstr "协议(&P)"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
msgid "&Weight"
msgstr "权重(&W)"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
msgid "&Port"
msgstr "端口(&P)"
#. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
msgid "A: IPv4 Domain Name Translation"
msgstr "A:IPv4 域名转译"
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
msgid "AAAA: IPv6 Domain Name Translation"
msgstr "AAAA:IPv6 域名转译"
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
msgid "CNAME: Alias for Domain Name"
msgstr "CNAME:域名别名"
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
msgid "NS: Name Server"
msgstr "NS:名称服务器"
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
msgid "MX: Mail Relay"
msgstr "MX:邮件中继"
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
msgid "PTR: Reverse Translation"
msgstr "PTR:反向转译"
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
msgid "SRV: Services Record"
msgstr "SRV:服务记录"
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
msgid "TXT: Text Record"
msgstr "TXT:文本记录"
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
msgid "SPF: Sender Policy Framework"
msgstr "SPF:发件人策略框架"
#. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
msgid "Record Settings"
msgstr "记录设置"
#. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
msgid "Configured Resource Records"
msgstr "已配置的资源记录"
#. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
msgid "Record Key"
msgstr "记录键"
#. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
msgid ""
"Invalid IPv6 reverse IP.\n"
"\n"
@@ -1303,16 +1295,15 @@
"IPv6 反向记录支持完整格式 (%1) 或当前区域的相对格式。"
#. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
msgid "Invalid IPv6 address."
msgstr "无效的 IPv6 地址。"
#. TRANSLATORS: Error message
#. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
msgid ""
-"Invalid %{type} record key. It should consist of printable US-ASCII"
-" characters excluding '='\n"
+"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
"and must be at least one character long."
msgstr "无效的 %{type} 记录键。它应由可打印的除 '=' 外的 US-ASCII 字符组成并且必须至少有一个字符的长度。"
@@ -1320,7 +1311,7 @@
#. %{type} - replaced with record type (TXT or SPF)
#. %{max} - replaced with the maximal length
#. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
msgid ""
"Maximal length of a %{type} record is %{max} characters.\n"
"This message is %{current} characters long."
@@ -1329,72 +1320,66 @@
"该消息的长度为 %{current} 个字符。"
#. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
msgid "CNAME cannot point to itself."
msgstr "CNAME 无法指向自身。"
#. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
msgid "An internal error has occurred."
msgstr "发生了一个内部错误。"
#. Dialog Caption - Expert Settings - Zone Editor
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
msgid "Zone Editor"
msgstr "区域编辑器"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
msgid "&Basics"
msgstr "基础(&B)"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
msgid "NS Recor&ds"
msgstr "NS 记录(&D)"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
msgid "&SOA"
msgstr "授权起始记录(SOA)(&S)"
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
msgid "R&ecords"
msgstr "记录(&E)"
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
msgid "M&X Records"
msgstr "M&X 记录"
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
msgid "Settings for Zone"
msgstr "区域设置"
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "高级(&V)"
-
#. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
msgid "At least one NS server must be set."
msgstr "必须设置至少一个 NS 服务器。"
@@ -1402,27 +1387,26 @@
#.
#. Automatically Generate Records From is a feature that makes YaST to generate
#. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
msgid ""
"Current zone records are automatically generated from %1 zone.\n"
-"To change records manually disable the Automatically Generate Records From"
-" feature."
+"To change records manually disable the Automatically Generate Records From feature."
msgstr ""
"当前区域记录自动生成自 %1 区域。\n"
"要手动修改记录,请禁用自动生成记录自这一功能。"
#. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
msgid "&Master DNS Server IP"
msgstr "主 DNS 服务器 IP(&M)"
#. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
msgid "Missing Master Server"
msgstr "缺少主服务器"
#. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
msgid ""
"Every slave zone must have its master server IP defined.\n"
"Configuration of a DNS server without a master server would fail.\n"
@@ -1433,32 +1417,32 @@
"您若继续,当前区域将被移除。"
#. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
msgid "No master DNS server defined."
msgstr "未定义主 DNS 服务器。"
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
msgid "The specified master name server is not a valid IP address."
msgstr "指定主名称服务器不是一个有效的 IP 地址。"
#. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
msgid "New &Forwarder IP Address"
msgstr "新转发对象 IP 地址(&F)"
#. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
msgid "Current &Zone Forwarders"
msgstr "当前区域转发对象(&Z)"
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
msgid "Forward Zone Editor"
msgstr "转发区域编辑器"
#. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
msgid ""
"This forward zone has no forwarders defined, which means\n"
"that all DNS queries for this zone are denied.\n"
@@ -1629,10 +1613,8 @@
#: src/include/dns-server/helps.rb:99
msgid ""
"<p><b><big>Master Servers</big></b><br>\n"
-"Set the IP addresses of the master name servers for this zone. Use <b>Add</b"
-">\n"
-"to add a new master name server. Select an existing one then click <b>Delete<"
-"/b>\n"
+"Set the IP addresses of the master name servers for this zone. Use <b>Add</b>\n"
+"to add a new master name server. Select an existing one then click <b>Delete</b>\n"
"to remove an existing one.</p>"
msgstr ""
"<p><b><big>主服务器</big></b><br>\n"
@@ -1646,8 +1628,7 @@
msgid ""
"<p><b><big>Zone Type</big></b><br>\n"
"To make this name server the primary source of the data of the zone,\n"
-"select <b>Master</b>. To make it the secondary name server, select <b>Slave<"
-"/b>\n"
+"select <b>Master</b>. To make it the secondary name server, select <b>Slave</b>\n"
"or <b>Stub</b>, so the data of the zone will be mirrored from the master\n"
"server.</p>"
msgstr ""
@@ -1727,8 +1708,7 @@
#: src/include/dns-server/helps.rb:153
msgid ""
"<p><b>Serial</b> number is used for determining if the zone has changed on\n"
-"the master servers (so that slave servers do not always need to synchronize"
-" the\n"
+"the master servers (so that slave servers do not always need to synchronize the\n"
"entire zone).</p>\n"
msgstr ""
"<p><b>序列号</b>用于确定该区域在主服务器上是否有所修改\n"
@@ -1776,10 +1756,8 @@
"<p><b><big>TSIG Key Management</big></b><br>\n"
"Define TSIG keys used for dynamic zone updates.\n"
"To add a new TSIG key, use the \n"
-"<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add</b"
-">.\n"
-"To delete an existing TSIG key, select it in the list and click <b>Delete</b"
-">.\n"
+"<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add</b>.\n"
+"To delete an existing TSIG key, select it in the list and click <b>Delete</b>.\n"
"</p>"
msgstr ""
"<p><b><big>TSIG 密钥管理</big></b><br>\n"
@@ -1888,13 +1866,11 @@
#: src/include/dns-server/helps.rb:242
msgid ""
"<p>\n"
-"Select <b>Log to System Log</b> to save DNS server log messages to the system"
-" log. \n"
+"Select <b>Log to System Log</b> to save DNS server log messages to the system log. \n"
"To save the DNS server log messages to a separate file, select \n"
"<b>Log to File</b> and set the <b>Filename</b> to which to save the log and \n"
"the <b>Maximum Size</b> of the log file.\n"
-"The DNS server automatically rotates the log files. Use <b>Maximum Versions<"
-"/b>\n"
+"The DNS server automatically rotates the log files. Use <b>Maximum Versions</b>\n"
"to specify how many log files should be saved.</p>\n"
msgstr ""
"<p>\n"
@@ -1957,8 +1933,7 @@
"<p>To add an already created key, set the <b>Filename</b>\n"
"(or use the <b>Browse</b> button to select it) and click <b>Add</b>.\n"
"To generate a new key, enter the <b>Filename</b> and the <b>Key ID</b>\n"
-"then click <b>Generate</b>. The new key will be generated and also added.</p"
-">\n"
+"then click <b>Generate</b>. The new key will be generated and also added.</p>\n"
msgstr ""
"<p>要添加已创建的密钥,请设置<b>文件名</b>\n"
"(或使用<b>浏览</b>按钮来选择文件名)并点击<b>添加</b>。\n"
@@ -1984,32 +1959,27 @@
#. Expert Mode Configuration - Zones #2
#: src/include/dns-server/helps.rb:298
msgid ""
-"<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b"
-">,\n"
+"<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b>,\n"
"and click <b>Add</b>.</p>\n"
msgstr "<p>要添加新的区域,请输入它的<b>区域名称</b>,选择<b>区域类型</b>,并点击<b>添加</b>。</p>\n"
#. Expert Mode Configuration - Zones #3
#: src/include/dns-server/helps.rb:302
msgid ""
-"<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address"
-" followed by\n"
+"<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address followed by\n"
"<tt>.in-addr.arpa</tt> as its <b>Zone Name</b> (for example, zone name\n"
"<tt>0.168.192.in-addr.arpa</tt> for network <tt>192.168.0.0/24</tt>), select\n"
"the <b>Zone Type</b>, and click <b>Add</b>.</p>\n"
msgstr ""
"<p>要添加新 IPv4 反向区域,请输入一部分反向 IPv4 地址,加上 <tt>.in-addr.arpa</tt> 作为它的<b>区域名称</b>\n"
-"(例如,网络 <tt>192.168.0.0/24</tt> 的区域名称为 <tt>0.168.192.in-addr.arpa</tt>),选择<b"
-">区域类型</t>,并点击 <b>添加</b>。</p>\n"
+"(例如,网络 <tt>192.168.0.0/24</tt> 的区域名称为 <tt>0.168.192.in-addr.arpa</tt>),选择<b>区域类型</t>,并点击 <b>添加</b>。</p>\n"
#. Expert Mode Configuration - Zones #4
#. %1, %2, %3, and %4 are replaced with examples
#: src/include/dns-server/helps.rb:311
msgid ""
-"<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address"
-" followed by\n"
-"<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone"
-" name are\n"
+"<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address followed by\n"
+"<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone name are\n"
"supported: Standard form: <tt>%2</tt>;\n"
"Forward form: <tt>%3</tt>;\n"
"Forward form without netmask bits: <tt>%4</tt>\n"
@@ -2037,8 +2007,7 @@
#: src/include/dns-server/helps.rb:334
msgid ""
"<p><b><big>DDNS and Zone Transport</big></b><br>\n"
-"Use this dialog to change dynamic DNS settings of the zone and control"
-" access\n"
+"Use this dialog to change dynamic DNS settings of the zone and control access\n"
"to the zone.</p>\n"
msgstr ""
"<p><b><big>DDNS 和区域传输</big></b><br>\n"
@@ -2097,8 +2066,7 @@
#: src/include/dns-server/helps.rb:371
msgid ""
"<p><b><big>NS Records</big></b><br>\n"
-"To add a new name server, enter the name server address and click <b>Add</b"
-">.\n"
+"To add a new name server, enter the name server address and click <b>Add</b>.\n"
"To remove one of the listed name servers, select it and click\n"
"<b>Delete</b>.</p>\n"
msgstr ""
@@ -2239,8 +2207,7 @@
"<p><b>PTR: Reverse Translation</b>:\n"
"<b>Record Key</b> is a full reverse zone name (derived from the IP address)\n"
"followed by a dot\n"
-"(such as <tt>1.0.168.192.in-addr.arpa.</tt> for IP address <tt>192.168.0.1<"
-"/tt>)\n"
+"(such as <tt>1.0.168.192.in-addr.arpa.</tt> for IP address <tt>192.168.0.1</tt>)\n"
" or a part of reverse zone name relative to the current zone\n"
"(such as <tt>1</tt> for IP address <tt>192.168.0.1</tt> in zone\n"
"<tt>0.168.192.in-addr.arpa.</tt>).\n"
@@ -2250,8 +2217,7 @@
"<b>记录键</b>是完整反向区域名称 (派生自 IP 地址) 后跟一个点\n"
"(例如,IP 地址为 <tt>192.168.0.1</tt>,则记录键为 </tt>1.0.168.192.in-addr.arpa.<tt>)\n"
"或者是相对于当前区域的反向区域名称的一部分\n"
-"(例如,区域 <tt>0.168.192.in-addr.arpa.</tt> 中 IP 地址 <tt>192.168.0.1</tt> 的记录键为 <"
-"tt>1</tt>)。\n"
+"(例如,区域 <tt>0.168.192.in-addr.arpa.</tt> 中 IP 地址 <tt>192.168.0.1</tt> 的记录键为 <tt>1</tt>)。\n"
"<b>值</b>是完全限定主机名后跟一个点。</p>\n"
#. Final step of the installation wizard - 1/5
@@ -2441,56 +2407,56 @@
msgstr "邮件中继(&M)"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
msgid "Initializing DNS Server Configuration"
msgstr "正在初始化 DNS 服务器配置"
#. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
msgid "Check the environment"
msgstr "检查环境"
#. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
msgid "Flush caches of the DNS daemon"
msgstr "刷新 DNS 守护进程的缓存"
#. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
msgid "Read the firewall settings"
msgstr "读取防火墙设置"
#. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
msgid "Read the settings"
msgstr "读取设置"
#. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
msgid "Checking the environment..."
msgstr "正在检查环境..."
#. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
msgid "Flushing caches of the DNS daemon..."
msgstr "正在刷新 DNS 守护进程的缓存..."
#. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
msgid "Reading the firewall settings..."
msgstr "正在读取防火墙设置..."
#. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
msgid "Reading the settings..."
msgstr "正在读取设置..."
#. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
msgid "Finished"
msgstr "已完成"
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
msgid ""
"Error occurred while calling netconfig.\n"
"Error: "
@@ -2499,72 +2465,72 @@
"错误:"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
msgid "Saving DNS Server Configuration"
msgstr "正在保存 DNS 服务器配置"
#. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
msgid "Save configuration files"
msgstr "保存配置文件"
#. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
msgid "Restart the DNS daemon"
msgstr "重启 DNS 守护进程"
#. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
msgid "Update zone files"
msgstr "更新区域文件"
#. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
msgid "Adjust the DNS service"
msgstr "调整 DNS 服务"
#. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
msgid "Call netconfig"
msgstr "调用 netconfig"
#. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
msgid "Write the firewall settings"
msgstr "写入防火墙设置"
#. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
msgid "Saving configuration files..."
msgstr "正在保存配置文件..."
#. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
msgid "Restarting the DNS daemon..."
msgstr "正在重启 DNS 守护进程..."
#. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
msgid "Updating zone files..."
msgstr "正在更新区域文件..."
#. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
msgid "Adjusting the DNS service..."
msgstr "正在调整 DNS 服务..."
#. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
msgid "Calling netconfig..."
msgstr "正在调用 netconfig..."
#. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
msgid "Writing the firewall settings..."
msgstr "正在写入防火墙设置..."
#. Cannot start service 'named', because of error that follows Error:. Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
msgid ""
"Error occurred while starting service named.\n"
"\n"
@@ -2573,43 +2539,43 @@
"\n"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
msgid "Stub"
msgstr "存根"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
msgid "Hint"
msgstr "提示"
#. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
msgid "The DNS server starts when booting the system."
msgstr "在引导系统时启动 DNS 服务器。"
#. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
msgid "The DNS server does not start when booting the system."
msgstr "在引导系统时不启动 DNS 服务器。"
#. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
#, perl-format
msgid "Configured Zones: %s"
msgstr "已配置的区域:%s"
#. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "无效的 LDAP 配置。无法使用 LDAP。"
#. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
msgid "Enable LDAP support?"
msgstr "激活 LDAP 支持吗?"
#. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
msgid ""
"Installation of required packages failed.\n"
"LDAP support will not be active."
@@ -2618,30 +2584,33 @@
"LDAP 支持将不会激活。"
#. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
msgid "Unknown LDAP initialization error."
msgstr "未知的 LDAP 初始化错误。"
#. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
msgid "Error occurred while creating %1."
msgstr "创建 %1 时出错。"
#. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
msgstr "创建 cn=defaultDNS,%1 时出错。未在使用 LDAP。"
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
msgid "Error occurred while updating %1."
msgstr "更新 %1 时出错。"
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
msgid "Error occurred while creating %1. Not using LDAP."
msgstr "创建 %1 时出错。未在使用 LDAP。"
+#~ msgid "Ad&vanced"
+#~ msgstr "高级(&V)"
+
#~ msgid "When &Booting"
#~ msgstr "引导时(&B)"
Modified: trunk/yast/zh_CN/po/docker.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/docker.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/docker.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-18 12:06+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -19,6 +19,116 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 2.0\n"
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid "&Kill Container"
+msgid "Changes in Container"
+msgstr "杀死容器(&K)"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "状态"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+msgid "&Exit"
+msgstr "退出(&E)"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid "&Stop Container"
+msgid "Commit Container"
+msgstr "停止容器(&S)"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+msgid "Repository"
+msgstr "仓库"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+msgid "Tag"
+msgstr "标签"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Inject &Terminal"
+msgid "Inject Shell"
+msgstr "插入终端(&T)"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
#. 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."
@@ -60,14 +170,6 @@
msgid "Running Docker Containers"
msgstr "运行中的 Docker 容器"
-#: src/lib/ydocker/main_dialog.rb:217
-msgid "Repository"
-msgstr "仓库"
-
-#: src/lib/ydocker/main_dialog.rb:218
-msgid "Tag"
-msgstr "标签"
-
#: src/lib/ydocker/main_dialog.rb:219
msgid "Image ID"
msgstr "映像 ID"
@@ -88,15 +190,11 @@
msgid "Image"
msgstr "映像"
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
msgid "Command"
msgstr "命令"
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "状态"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
msgid "Ports"
msgstr "端口"
@@ -132,10 +230,63 @@
msgid "&Commit"
msgstr "提交(&C)"
-#: src/lib/ydocker/main_dialog.rb:304
-msgid "&Exit"
-msgstr "退出(&E)"
-
#: src/lib/ydocker/main_dialog.rb:315
msgid "Do you really want to delete image \"%s\"?"
msgstr "您真的想要删除映像 \"%s\" 吗?"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid "&Containers"
+msgid "Run Container"
+msgstr "容器(&C)"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid "&Containers"
+msgid "Container"
+msgstr "容器(&C)"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""
Modified: trunk/yast/zh_CN/po/drbd.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/drbd.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/drbd.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-06 18:34+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -235,150 +235,91 @@
#: src/include/drbd/helps.rb:69
msgid ""
-"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a "
-"resource</p>\n"
+"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a resource</p>\n"
"\t\t"
msgstr ""
"<p>点击 \"添加\"、\"编辑\"、\"删除\" 按钮来添加、编辑或删除一个资源</p>\n"
"\t\t"
#: src/include/drbd/helps.rb:75
+#, fuzzy
+#| msgid ""
+#| "\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. 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"
+#| "\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
+#| "\t\t"
msgid ""
"\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. 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"
-"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated "
-"by yast automatically. A host can have different \"node-id\" in different "
-"resources.</p>\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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. 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"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
"\n"
-"\t\t<p>\"名称\" 是必需的并且必须匹配其中某个节点的 Linux 主机名 (uname -n)。"
-"主机名中不应包含 \".\"。</p>\n"
-"\t\t<p>\"地址:端口\":一个资源针对每个设备都需要一个 IP 地址,用于等待来自父"
-"设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个 TCP 端口,用于连"
-"接到节点的父设备。</p>\n"
-"\t\t<p>\"设备\":所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中"
-"您必须使用此设备,而不能使用由磁盘参数及其 minor 编号指定的底层块设备。或者要"
-"么省略名称,要么省略 minor 关键字及其编号。若您省略了名称则将使用默认的 /dev/"
-"drbd'minor 编号'。\n"
-"\t\t如:'/dev/drbd{service} minor {minor drbd number [0...255]}' 或 '/dev/"
-"drbd{minor drbd number [0...255]}'</p>\n"
-"\t\t<p>\"磁盘\":分布式复制块设备使用此块设备来真正存储和撷取数据。当其上正在"
-"运行分布式复制块设备时请永远不要访问这样的设备。</p>\n"
-"\t\t<p>\"元磁盘\":内部使用。内部使用意味着后备设备的最后一部分用于存储元数"
-"据。</p>\n"
-"\t\t<p>\"节点 ID\":节点 ID 是分布式复制块设备的一个内部值,将由 YaST 自动生成。"
-"同一主机在不同资源中可以有不同的节点 ID。</p>\n"
+"\t\t<p>\"名称\" 是必需的并且必须匹配其中某个节点的 Linux 主机名 (uname -n)。主机名中不应包含 \".\"。</p>\n"
+"\t\t<p>\"地址:端口\":一个资源针对每个设备都需要一个 IP 地址,用于等待来自父设备的进站连接以访问设备。每个分布式复制块设备资源都需要一个 TCP 端口,用于连接到节点的父设备。</p>\n"
+"\t\t<p>\"设备\":所描述的资源的块设备节点的名称。在您的应用程序 (文件系统) 中您必须使用此设备,而不能使用由磁盘参数及其 minor 编号指定的底层块设备。或者要么省略名称,要么省略 minor 关键字及其编号。若您省略了名称则将使用默认的 /dev/drbd'minor 编号'。\n"
+"\t\t如:'/dev/drbd{service} minor {minor drbd number [0...255]}' 或 '/dev/drbd{minor drbd number [0...255]}'</p>\n"
+"\t\t<p>\"磁盘\":分布式复制块设备使用此块设备来真正存储和撷取数据。当其上正在运行分布式复制块设备时请永远不要访问这样的设备。</p>\n"
+"\t\t<p>\"元磁盘\":内部使用。内部使用意味着后备设备的最后一部分用于存储元数据。</p>\n"
+"\t\t<p>\"节点 ID\":节点 ID 是分布式复制块设备的一个内部值,将由 YaST 自动生成。同一主机在不同资源中可以有不同的节点 ID。</p>\n"
"\t\t"
#: src/include/drbd/helps.rb:89
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
-"\t\t<p>Protocol A: write IO is reported as completed, if it has reached "
-"local disk and local TCP send buffer.</p>\n"
-"\t\t<p>Protocol B: write IO is reported as completed, if it has reached "
-"local disk and remote buffer cache.</p>\n"
-"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both "
-"local and remote disk.</p>\n"
+"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n"
+"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n"
+"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n"
"\t\t\t\t\t\t\t\t\t\t \n"
"\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n"
-"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node "
-"was a degraded cluster</p>\n"
+"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n"
"\n"
-"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-"
-"error to the upper layers</p>\n"
+"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n"
"\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n"
-"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by "
-"DRBD</p>\n"
+"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n"
"\n"
-"\t\t<p><b>timeout</b>: If the partner node fails to send an expected "
-"response packet within time 10ths of a second, the partner node is "
-"considered dead and therefore the TCP/IP connection is abandoned. This must "
-"be lower than connect-int and ping-int. The default value is 60 = 6 seconds, "
-"the unit 0.1 seconds.</p>\n"
-"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-"
-"alive packet. In case the peer's reply is not received within this time "
-"period, it is considered as dead. The default value is 500ms, the default "
-"unit is 100ms</p>\n"
-"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive "
-"packet</p>\n"
+"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n"
+"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n"
+"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n"
"\n"
-"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two "
-"write barriers</p>\n"
-"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write "
-"request for count times the timeout, it is expelled from the cluster. The "
-"default value is 0, which disables this feature.</p>\n"
-"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top "
-"of DRBD, it is possible to limit the bandwidth which may be used by "
-"background synchronizations. The default is 250 KB/sec, the default unit is "
-"KB/sec.</p>\n"
-"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (= "
-"active set) can get. The default number of extents is 127. (Minimum: 7, "
-"Maximum: 3843)</p>\n"
+"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n"
+"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n"
+"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n"
+"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n"
"\t\t"
msgstr ""
"\n"
"\t\t<p><b>协议</b></p>\n"
-"\t\t<p>Protocol A: write IO is reported as completed, if it has reached "
-"local disk and local TCP send buffer.</p>\n"
-"\t\t<p>Protocol B: write IO is reported as completed, if it has reached "
-"local disk and remote buffer cache.</p>\n"
-"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both "
-"local and remote disk.</p>\n"
+"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n"
+"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n"
+"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n"
"\t\t\t\t\t\t\t\t\t\t \n"
"\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n"
-"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node "
-"was a degraded cluster</p>\n"
+"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n"
"\n"
-"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-"
-"error to the upper layers</p>\n"
+"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n"
"\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n"
-"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by "
-"DRBD</p>\n"
+"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n"
"\n"
-"\t\t<p><b>timeout</b>: If the partner node fails to send an expected "
-"response packet within time 10ths of a second, the partner node is "
-"considered dead and therefore the TCP/IP connection is abandoned. This must "
-"be lower than connect-int and ping-int. The default value is 60 = 6 seconds, "
-"the unit 0.1 seconds.</p>\n"
-"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-"
-"alive packet. In case the peer's reply is not received within this time "
-"period, it is considered as dead. The default value is 500ms, the default "
-"unit is 100ms</p>\n"
-"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive "
-"packet</p>\n"
+"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n"
+"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n"
+"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n"
"\n"
-"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two "
-"write barriers</p>\n"
-"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write "
-"request for count times the timeout, it is expelled from the cluster. The "
-"default value is 0, which disables this feature.</p>\n"
-"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top "
-"of DRBD, it is possible to limit the bandwidth which may be used by "
-"background synchronizations. The default is 250 KB/sec, the default unit is "
-"KB/sec.</p>\n"
-"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (= "
-"active set) can get. The default number of extents is 127. (Minimum: 7, "
-"Maximum: 3843)</p>\n"
+"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n"
+"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n"
+"\t\t<p><b>rate</b>: To ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n"
+"\t\t<p><b>al-extents</b>: parameter you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n"
"\t\t"
#: src/include/drbd/helps.rb:113
@@ -389,53 +330,27 @@
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<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"
+"\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. "
-"Should disable the LVM cache when combined drbd with LVM.</p>\n"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
"\n"
-"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata "
-"and PV state flags are obtained from the lvmetad instance and no scanning is "
-"done by the individual commands. Because lvmetad's cache cannot be "
-"synchronized between nodes, users are advised to disable lvmetad in cluster "
-"environments.</p>\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
"\n"
"\t\t"
msgstr ""
"\n"
"\t\t<p><b>LVM 配置文件 /etc/lvm/lvm.conf</b></p>\n"
-"\t\t<p>要在 DRBD 中使用 LVM,必须修改 LVM 配置文件中的一些选项并移除节点上的"
-"旧缓存项。</p>\t\t<p>更多消息,包括文件布局,请参考 'man lvm.conf'。</p>\n"
+"\t\t<p>要在 DRBD 中使用 LVM,必须修改 LVM 配置文件中的一些选项并移除节点上的旧缓存项。</p>\t\t<p>更多消息,包括文件布局,请参考 'man lvm.conf'。</p>\n"
"\t\t\t\t\t\t\t\t\t\t \n"
-"\t\t<p><b>设备过滤器</b>:这标记了来自 LVM 扫描物理卷签名得到的设备列表的底层"
-"块设备。通过这种方式,引导 LVM 从 DRBD 设备读取物理卷签名,而不是从底层后备块设备"
-"读取。</p>\t\t<p><b>自动过滤器</b>:根据 DRBD 的配置,LVM 过滤器将总是自动修"
-"改的。要手动修改,请禁用自动过滤器复选框。</p>\n"
-"\t\t<p>过滤器由一个正则表达式数组组成。这些表达式可由您选择的一个字符分隔,并"
-"带有 'a' (接受) 或 'r' (拒绝) 前缀。</p>\t\t<p>例如,这样设置过滤器 [\"r|/"
-"dev/sda.*|\"]</p>\n"
+"\t\t<p><b>设备过滤器</b>:这标记了来自 LVM 扫描物理卷签名得到的设备列表的底层块设备。通过这种方式,引导 LVM 从 DRBD 设备读取物理卷签名,而不是从底层后备块设备读取。</p>\t\t<p><b>自动过滤器</b>:根据 DRBD 的配置,LVM 过滤器将总是自动修改的。要手动修改,请禁用自动过滤器复选框。</p>\n"
+"\t\t<p>过滤器由一个正则表达式数组组成。这些表达式可由您选择的一个字符分隔,并带有 'a' (接受) 或 'r' (拒绝) 前缀。</p>\t\t<p>例如,这样设置过滤器 [\"r|/dev/sda.*|\"]</p>\n"
"\n"
-"\t\t<p><b>LVM 缓存</b>:启用/开启写入 LVM 缓存是默认的。当混合使用 DRBD 和 LVM 时"
-"应禁用 LVM 缓存。</p>\n"
+"\t\t<p><b>LVM 缓存</b>:启用/开启写入 LVM 缓存是默认的。当混合使用 DRBD 和 LVM 时应禁用 LVM 缓存。</p>\n"
"\n"
-"\t\t<p><b>LVMetad</b>:当启用了 lvmetad 时,卷组元数据和 PV 状态旗标是从 lvmetad 实例"
-"获取的,个别命令不会执行扫描。因为 lvmetad 的缓存无法在节点间同步,建议用户在集群环境"
-"中禁用 lvmetad。</p>\n"
+"\t\t<p><b>LVMetad</b>:当启用了 lvmetad 时,卷组元数据和 PV 状态旗标是从 lvmetad 实例获取的,个别命令不会执行扫描。因为 lvmetad 的缓存无法在节点间同步,建议用户在集群环境中禁用 lvmetad。</p>\n"
"\n"
"\t\t"
@@ -444,27 +359,21 @@
msgstr "<p><b><big>分布式复制块设备 (DRBD) 全局配置</big></b></p>"
#: src/include/drbd/helps.rb:136
-msgid ""
-"<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's "
-"sanity check</p>"
+msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr "<p>勾选<b>\"禁用 IP 验证\"</b>来禁用 drbdadm 的一个合理性检查</p>"
#: src/include/drbd/helps.rb:139
msgid ""
-"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it "
-"waited so\n"
+"<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"
" of your server connected to a serial terminal server with\n"
" limited logging capacity.\n"
-" The Dialog will print the count each 'dialog-refresh' "
-"seconds,\n"
+" The Dialog will print the count each 'dialog-refresh' seconds,\n"
" set it to 0 to disable redrawing completely. </p>"
msgstr ""
"<p><b>对话框刷新:</b> 用户对话框计数并显示当前等待的秒数。\n"
-" 若您服务器的终端连接到了一个日志功能有限的串行终端服务器上,"
-"您可能想要禁用此功能。\n"
-" 该对话框每到 '对话框刷新' 秒数时将打印计数,设为 0 将完全禁用"
-"重绘功能。</p>"
+" 若您服务器的终端连接到了一个日志功能有限的串行终端服务器上,您可能想要禁用此功能。\n"
+" 该对话框每到 '对话框刷新' 秒数时将打印计数,设为 0 将完全禁用重绘功能。</p>"
#: src/include/drbd/helps.rb:147
msgid ""
@@ -475,8 +384,7 @@
" as configured mentioned in this file. </p>"
msgstr ""
"<p><b>最少次数:</b>\n"
-" 若您想要稍后不用重新加载模块 就定义更多资源,请使用此"
-"选项。\n"
+" 若您想要稍后不用重新加载模块 就定义更多资源,请使用此选项。\n"
" 默认在加载模块时会加载此文件 中配置的全部设备。</p>"
#. Summary dialog help 1/3
@@ -614,67 +522,86 @@
msgstr "警告!集群不应使用 lvmetad。"
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:143
+#: src/include/drbd/resource_conf.rb:144
msgid "Resource Name"
msgstr "资源名称"
-#: src/include/drbd/resource_conf.rb:150
+#: src/include/drbd/resource_conf.rb:151
msgid "Nodes"
msgstr "节点"
-#: src/include/drbd/resource_conf.rb:153
+#: src/include/drbd/resource_conf.rb:154
msgid "Add"
msgstr "添加"
-#: src/include/drbd/resource_conf.rb:154
+#: src/include/drbd/resource_conf.rb:155
msgid "Edit"
msgstr "编辑"
-#: src/include/drbd/resource_conf.rb:155
+#: src/include/drbd/resource_conf.rb:156
msgid "Delete"
msgstr "删除"
-#: src/include/drbd/resource_conf.rb:187
+#: src/include/drbd/resource_conf.rb:188
msgid "Save"
msgstr "保存"
#. Since n_name can't be edit, so set direct is OK
-#: src/include/drbd/resource_conf.rb:329
+#: src/include/drbd/resource_conf.rb:336
msgid "Protocol"
msgstr "协议"
#. return `cancel or a string
-#: src/include/drbd/resource_conf.rb:569
+#: src/include/drbd/resource_conf.rb:560
msgid "OK"
msgstr "好的"
-#: src/include/drbd/resource_conf.rb:570
+#: src/include/drbd/resource_conf.rb:561
msgid "Cancel"
msgstr "取消"
-#: src/include/drbd/resource_conf.rb:584
+#: src/include/drbd/resource_conf.rb:575
msgid "Node name can not be empty."
msgstr "节点名称不能为空。"
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:687
+#: src/include/drbd/resource_conf.rb:719
msgid "Node names must not include \".\" , using the local hostname."
msgstr "节点名称必须不包含 \".\",使用本机主机名。"
-#: src/include/drbd/resource_conf.rb:707
+#: src/include/drbd/resource_conf.rb:739
msgid "Please fill out all fields."
msgstr "请填写全部字段。"
-#: src/include/drbd/resource_conf.rb:716
+#: src/include/drbd/resource_conf.rb:754
msgid "Please configure at least two nodes."
msgstr "请配置至少两个节点。"
#. No need to check integrity since it will disabled when configuring
-#: src/include/drbd/resource_conf.rb:751
+#: src/include/drbd/resource_conf.rb:789
msgid "Enter the node name:"
msgstr "输入节点名称:"
-#: src/include/drbd/resource_conf.rb:757
+#: src/include/drbd/resource_conf.rb:795
msgid "Node name must be different."
msgstr "节点名称必须不同。"
@@ -779,70 +706,70 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:115
+#: src/modules/Drbd.rb:114
msgid "Failed to merge separated DRBD conf files\n"
msgstr "合并独立的 DRBD 配置文件失败\n"
-#: src/modules/Drbd.rb:137
+#: src/modules/Drbd.rb:136
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr "写入 drbd.conf.YaST2prepare 失败"
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:192
+#: src/modules/Drbd.rb:191
msgid "Initializing DRBD Configuration"
msgstr "正在初始化分布式复制块设备 (DRBD) 配置"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:199
msgid "Read global settings"
msgstr "读取全局设置"
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:200
msgid "Read resources"
msgstr "读取资源"
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:201
msgid "Read LVM configurations"
msgstr "读取 LVM 配置"
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:202
msgid "Read daemon status"
msgstr "读取守护程序状态"
-#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
msgid "Read SuSEFirewall Settings"
msgstr "读取 SuSEFirewall 设置。"
-#: src/modules/Drbd.rb:207
+#: src/modules/Drbd.rb:206
msgid "Reading global settings..."
msgstr "正在读取全局设置..."
-#: src/modules/Drbd.rb:208
+#: src/modules/Drbd.rb:207
msgid "Reading resources..."
msgstr "正在读取资源..."
-#: src/modules/Drbd.rb:209
+#: src/modules/Drbd.rb:208
msgid "Reading LVM configurations..."
msgstr "正在读取 LVM 配置..."
-#: src/modules/Drbd.rb:210
+#: src/modules/Drbd.rb:209
msgid "Reading daemon status..."
msgstr "正在读取守护程序状态..."
-#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
msgid "Finished"
msgstr "已完成"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:515
+#: src/modules/Drbd.rb:514
msgid "Failed to backup drbd.conf"
msgstr "备份 drbd.conf 失败"
-#: src/modules/Drbd.rb:524
+#: src/modules/Drbd.rb:523
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr "清理 drbd.conf 以进行 drbdadm 测试失败"
-#: src/modules/Drbd.rb:548
+#: src/modules/Drbd.rb:547
msgid ""
"Invalid configuration of resource %1\n"
"%2"
@@ -850,12 +777,12 @@
"无效的资源配置 %1\n"
"%2"
-#: src/modules/Drbd.rb:567
+#: src/modules/Drbd.rb:566
msgid "Failed to bring drbd.conf back"
msgstr "恢复 drbd.conf 失败"
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:638
+#: src/modules/Drbd.rb:637
msgid "Writing DRBD Configuration"
msgstr "正在写入分布式复制块设备 (DRBD) 配置"
@@ -863,47 +790,47 @@
#. 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:650
+#: src/modules/Drbd.rb:649
msgid "Write global settings"
msgstr "写入全局设置"
-#: src/modules/Drbd.rb:651
+#: src/modules/Drbd.rb:650
msgid "Write resources"
msgstr "写入资源"
-#: src/modules/Drbd.rb:652
+#: src/modules/Drbd.rb:651
msgid "Write LVM configurations"
msgstr "写入 LVM 配置"
-#: src/modules/Drbd.rb:653
+#: src/modules/Drbd.rb:652
msgid "Set daemon status"
msgstr "设置守护程序状态"
-#: src/modules/Drbd.rb:654
+#: src/modules/Drbd.rb:653
msgid "Write the SuSEfirewall settings"
msgstr "写入 SuSEfirewall 设置"
-#: src/modules/Drbd.rb:657
+#: src/modules/Drbd.rb:656
msgid "Writing global settings..."
msgstr "正在写入全局设置..."
-#: src/modules/Drbd.rb:658
+#: src/modules/Drbd.rb:657
msgid "Writing resources..."
msgstr "正在写入资源..."
-#: src/modules/Drbd.rb:659
+#: src/modules/Drbd.rb:658
msgid "Writing LVM configurations..."
msgstr "正在写入 LVM 配置..."
-#: src/modules/Drbd.rb:660
+#: src/modules/Drbd.rb:659
msgid "Setting daemon status..."
msgstr "正在设置守护程序状态..."
-#: src/modules/Drbd.rb:661
+#: src/modules/Drbd.rb:660
msgid "Writing the SuSEFirewall settings"
msgstr "正在写入 SuSEFirewall 设置..."
-#: src/modules/Drbd.rb:672
+#: src/modules/Drbd.rb:671
msgid "Failed to make directory /etc/drbd.d"
msgstr "创建文件夹 /etc/drbd.d 失败"
Modified: trunk/yast/zh_CN/po/fcoe-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/fcoe-client.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/fcoe-client.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-06-11 13:33+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -528,33 +528,33 @@
msgstr "<p>现在安装它吗?</p>"
#. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
msgid "Cannot start service 'lldpad'"
msgstr "无法启动服务 'lldpad'"
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
msgid "Cannot start service 'fcoe'"
msgstr "无法启动服务 'fcoe'"
#. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
msgid "Cannot start lldpad systemd socket"
msgstr "无法启动 lldpad systemd 套接字"
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
msgid "Cannot start lldpad service."
msgstr "无法启动 lldpad 服务。"
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
msgid "Cannot start fcoemon systemd socket."
msgstr "无法启动 fcoemon systemd 套接字。"
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
msgid "Cannot start fcoe service."
msgstr "无法启动 fcoe 服务。"
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -564,112 +564,112 @@
"您或许可以编辑设置并重新创建以太网光纤通道 (FCoE) 虚拟局域网接口以获得一个有效的配置。"
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
msgid "Initializing fcoe-client Configuration"
msgstr "正在初始化以太网光纤通道 (FCoE) 客户端配置"
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
msgid "Check installed packages"
msgstr "检查已安装软件包"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
msgid "Check services"
msgstr "检查服务"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
msgid "Detect network cards"
msgstr "检测网卡"
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
msgid "Read /etc/fcoe/config"
msgstr "读取 /etc/fcoe/config"
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
msgid "Checking for installed packages..."
msgstr "正在检查已安装软件包..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
msgid "Checking for services..."
msgstr "正在检查服务..."
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
msgid "Detecting network cards..."
msgstr "正在检测网卡..."
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
msgid "Reading /etc/fcoe/config"
msgstr "正在读取 /etc/fcoe/config"
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
msgid "Finished"
msgstr "已完成"
#. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
msgid "Starting of services failed."
msgstr "启动服务失败。"
#. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
msgid "Cannot detect devices."
msgstr "无法检测设备。"
#. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
msgid "Cannot read /etc/fcoe/config."
msgstr "无法读取 /etc/fcoe/config。"
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
msgid "Saving fcoe-client Configuration"
msgstr "正在保存以太网光纤通道 (FCoE) 客户端配置"
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
msgid "Write the settings"
msgstr "写入设置"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
msgid "Restart FCoE service"
msgstr "重启以太网光纤通道 (FCoE) 服务"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
msgid "Adjust start of services"
msgstr "调整服务启动状态"
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
msgid "Writing the settings..."
msgstr "正在写入设置..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
msgid "Restarting FCoE service..."
msgstr "正在重启以太网光纤通道 (FCoE) 服务..."
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
msgid "Adjusting start of services..."
msgstr "正在调整服务启动状态..."
#. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
msgid "Cannot write settings to /etc/fcoe/config."
msgstr "无法将设置写入 /etc/fcoe/config。"
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
@@ -678,43 +678,43 @@
"细节请参考 /var/log/YaST2/y2log。"
#. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
msgid "Restarting of service fcoe failed."
msgstr "重启以太网光纤通道 (FCoE) 服务失败。"
#. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr "无法写入 /etc/sysconfig/network/ifcfg-files。"
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
msgid "<b>General FCoE configuration</b>"
msgstr "<b>以太网光纤通道 (FCoE) 常规配置</b>"
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
msgid "<b>Interfaces</b>"
msgstr "<b>接口</b>"
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
msgid "<i>Netcard</i>:"
msgstr "<i>网卡</i>:"
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
msgid "<b>Starting of services</b>"
msgstr "<b>服务启动</b>"
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
msgid "enabled"
msgstr "已启用"
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
msgid "disabled"
msgstr "已禁用"
Modified: trunk/yast/zh_CN/po/firewall.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/firewall.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/firewall.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-10-14 15:52+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: American English <opensuse-zh(a)opensuse.org>\n"
@@ -23,6 +23,16 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.5\n"
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
#. TRANSLATORS: message popup
#: src/clients/firewall_proposal.rb:113
msgid ""
@@ -182,7 +192,7 @@
#. TRANSLATORS: tree menu item
#: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
#: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
msgid "Logging Level"
msgstr "日志记录级别"
@@ -689,7 +699,7 @@
#: src/include/firewall/subdialogs.rb:349
#: src/include/firewall/subdialogs.rb:509
#: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
msgid "Source Network"
msgstr "来源网络"
@@ -700,8 +710,8 @@
#: src/include/firewall/subdialogs.rb:351
#: src/include/firewall/subdialogs.rb:511
#: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
msgid "Protocol"
msgstr "协议"
@@ -755,28 +765,28 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
msgid "Req. IP"
msgstr "请求的 IP"
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
msgid "Req. Port"
msgstr "请求的端口"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
msgid "Redir. to IP"
msgstr "重定向到 IP"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
msgid "Redir. to Port"
msgstr "重定向到端口"
@@ -896,10 +906,10 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
msgid "Zone"
msgstr "区域"
@@ -1397,217 +1407,219 @@
msgstr "选择要删除的项。"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
msgid "Firewall configuration"
msgstr "防火墻设置"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
msgid "Start-up settings"
msgstr "启动设置"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
msgid "Known firewall zones"
msgstr "已知防火墙区域"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
msgid "Network interfaces configuration"
msgstr "网络接口配置"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
msgid "Allowed services, ports, and protocols"
msgstr "允许的服务、端口和协议"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
msgid "Broadcast packet settings"
msgstr "广播数据包设置"
#. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
msgid "Masquerading settings"
msgstr "伪装设置"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
msgid "Redirect requests to masqueraded IP"
msgstr "将请求重定向到伪装的 IP"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
msgid "Logging settings"
msgstr "日志记录设置"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
msgid "Firewall configuration summary"
msgstr "防火墙配置摘要"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
msgid "Enables firewall"
msgstr "启用防火墙"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
msgid "Disables firewall"
msgstr "禁用防火墙"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
msgid "Show current settings"
msgstr "显示当前设置"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
msgid "Start firewall in the boot process"
msgstr "在引导过程中启动防火墙"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
msgid "Start firewall manually"
msgstr "手动启动防火墙"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
msgid "List configured entries"
msgstr "列出已经配置项"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
msgid "Zone short name"
msgstr "区域简称"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
msgid "Add a new record"
msgstr "添加新记录"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
msgid "Remove a record"
msgstr "删除记录"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
msgid "Network interface configuration name"
msgstr "网络接口配置名称"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
msgid "Logging accepted packets (all|crit|none)"
msgstr "记录接受的数据包 (all|crit|none)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
msgid "Logging not accepted packets (all|crit|none)"
msgstr "记录未接受的数据包 (all|crit|none)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
msgid "Logging broadcast packets (yes|no)"
msgstr "记录广播数据包 (yes|no)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
msgid "Set value"
msgstr "设置值"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
msgid "Port name or number; comma-separate multiple ports"
msgstr "端口名或端口号;逗号分隔的多个端口"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
msgid "Known firewall service; comma-separate multiple services"
msgstr "已知防火墙服务;逗号分隔的多个服务"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
msgid "TCP port name or number; comma-separate multiple ports"
msgstr "TCP 端口名或端口号;逗号分隔的多个端口"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
msgid "UDP port name or number; comma-separate multiple ports"
msgstr "UDP 端口名或端口号;逗号分隔的多个端口"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
msgid "RPC port name; comma-separate multiple ports"
msgstr "RPC 端口名;逗号分隔的多个端口"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
msgid "IP protocol name; comma-separate multiple protocols"
msgstr "IP 协议名;逗号分隔的多个协议"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
msgid "Set zone protection (yes|no)"
msgstr "设置区域保护 (yes|no)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
msgid "Detailed information"
msgstr "详细信息"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
msgid "Enable option"
msgstr "启用选项"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
msgid "Disable option"
msgstr "禁用选项"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
msgstr "来源网络,例如 0/0 或 145.12.35.0/255.255.255.0"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
msgid "Protocol (tcp|udp)"
msgstr "协议 (tcp|udp)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
msgid "Requested external IP (optional)"
msgstr "请求的外部 IP(可选)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
msgid "Requested port name or number"
msgstr "请求的端口名或端口号"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
msgid "Redirect to internal IP"
msgstr "重定向到内部 IP"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
msgid "Redirect to port on internal IP (optional)"
msgstr "重定向到内部 IP 上的端口(可选)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
msgid "Record number"
msgstr "记录编号"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
msgid "Use port names instead of port numbers"
msgstr "使用端口名而不是端口号"
#. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
msgid "Unknown zone %1."
msgstr "未知区域 %1。"
@@ -1620,180 +1632,180 @@
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
msgid "Parameter %1 must be set."
msgstr "必须设置参数 %1。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
msgid "Listing Known Firewall Zones:"
msgstr "正在列出已知防火墙区域:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
msgid "Shortcut"
msgstr "快捷键"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
msgid "Zone Name"
msgstr "区域名"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
msgid "Summary:"
msgstr "摘要:"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
msgid "Only one parameter is allowed."
msgstr "只允许一个参数。"
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
msgid "Start-Up:"
msgstr "启动:"
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
msgid "Enabling firewall in the boot process..."
msgstr "正在引导过程中启用防火墙..."
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
msgid "Removing firewall from the boot process..."
msgstr "正在从引导过程中移除防火墙..."
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
msgid "Firewall is enabled in the boot process"
msgstr "防火墙已在引导过程中启用"
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
msgid "Firewall needs manual starting"
msgstr "防火墙需要手动启动"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
msgid "Network Interfaces in Firewall Zones:"
msgstr "防火墙区域中的网络接口:"
#. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
msgid "Special firewall string"
msgstr "特殊防火墙字符串"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
msgid "Interface"
msgstr "接口"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
msgid "Device Name"
msgstr "设备名"
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
msgid "Adding special string %1 into zone %2..."
msgstr "正在将特殊字符串 %1 添加到区域 %2 中..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
msgid "Adding interface %1 into zone %2..."
msgstr "正在将接口 %1 添加到区域 %2 中..."
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
msgid "Removing special string %1 from zone %2..."
msgstr "正在将特殊字符串 %1 从区域 %2 中移除..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
msgid "Removing interface %1 from zone %2..."
msgstr "正在将接口 %1 从区域 %2 中移除..."
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
msgid "Log all"
msgstr "全部记录"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
msgid "Log only critical"
msgstr "只记录关键信息"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
msgid "Do not log any"
msgstr "不记录任何信息"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
msgid "Global Logging Settings:"
msgstr "全局日志记录设置:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
msgid "Rule Type"
msgstr "规则类型"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
msgid "Value"
msgstr "值"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
msgid "Accepted"
msgstr "已接受"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
msgid "Not accepted"
msgstr "未接受"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
msgid "Logging Broadcast Packets:"
msgstr "记录广播数据包:"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
msgid "Logging enabled"
msgstr "日志记录已启用"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
msgid "Logging disabled"
msgstr "日志记录已禁用"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
msgid "Short"
msgstr "短"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
msgid "Logging Status"
msgstr "日志记录状态"
@@ -1802,168 +1814,181 @@
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
msgid "Value %1 is not allowed for option %2."
msgstr "选项 %2 不允许值 %1。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
msgid "Allowed Broadcast Ports:"
msgstr "允许的广播端口:"
#. TRANSLATORS: CommandLine header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
msgid "Port"
msgstr "端口"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
msgid "Only one action command is allowed here."
msgstr "这里只允许一个动作命令。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
msgid "Defined Firewall Services:"
msgstr "已定义的防火墙服务:"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
msgid "ID"
msgstr "ID"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
msgid "Service Name"
msgstr "服务名称"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
msgid "TCP port"
msgstr "TCP 端口"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
msgid "UDP port"
msgstr "UDP 端口"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
msgid "RPC port"
msgstr "RPC 端口"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
msgid "IP protocol"
msgstr "IP 协议"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
msgid "Allowed Services in Zones:"
msgstr "区域中允许的服务:"
#. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
msgid "All services"
msgstr "全部服务"
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
msgid "Entire zone unprotected"
msgstr "整个区域不受保护"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
msgid "Service ID"
msgstr "服务 ID"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
msgid "Additional Allowed Ports:"
msgstr "额外允许的端口:"
#. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
msgid "All ports"
msgstr "全部端口"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
msgid "Allowed Additional IP Protocols in Zones:"
msgstr "区域中允许的额外 IP 协议:"
#. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
msgid "All IP protocols"
msgstr "全部 IP 协议"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
msgid "IP Protocol"
msgstr "IP 协议"
#. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
msgid "Unknown service %1."
msgstr "未知服务 %1。"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
msgid "Protection can only be set for internal zones."
msgstr "只能为内部区域设置保护。"
#. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
msgid "At least one of %1 must be set."
msgstr "至少必须设置一个 %1。"
#. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
msgid "At least one action command from %1 must be set."
msgstr "必须设置至少一个来自 %1 的动作命令。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
msgid "Redirect Requests to Masqueraded IP:"
msgstr "将请求重定向到伪装的 IP:"
#. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
msgid "Unknown port name %1."
msgstr "未知端口名 %1。"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
msgid "Masquerading Settings:"
msgstr "伪装设置:"
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
#. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
msgstr "伪装为 %1"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
msgid "enabled"
msgstr "已启用"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
msgid "disabled"
msgstr "已禁用"
Modified: trunk/yast/zh_CN/po/firstboot.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/firstboot.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/firstboot.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-02-03 00:40+0800\n"
"Last-Translator: 玛格丽特 · 苏 <i(a)marguerite.su>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -121,13 +121,13 @@
msgstr "标签"
#: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "状态"
+
+#: src/clients/firstboot_config.rb:68
msgid "Module Name"
msgstr "模块名"
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "状态"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
@@ -293,7 +293,7 @@
"</p>\n"
#. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
msgid "There is not enough space to install all additional packages."
msgstr "磁盘空间不足以安装全部的附加软件包。"
Modified: trunk/yast/zh_CN/po/fonts.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/fonts.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/fonts.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-01-17 14:12+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -20,71 +20,59 @@
#. 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
+#: src/lib/fonts/fonts-config-state.rb:59
msgid "Bitmap Fonts"
msgstr "点阵字体"
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
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 ""
-"不像'轮廓字体' (通过曲线以数学方式描述的字体,其余方案选择),'点阵字体'代表一组字体,容纳了每个字形和尺寸的位图。从而,每个字体只存在几种尺寸。它们渲"
-"染起来非常快,因为位图不需要计算,并且被认为是更加可读的,尤其在小尺寸环境 (甚至,某些轮廓字体还容纳了所谓的'嵌入点阵',为小尺寸设计的其自身的点阵版本)"
-"。点阵字体使用黑白渲染,不能平滑。"
+msgstr "不像'轮廓字体' (通过曲线以数学方式描述的字体,其余方案选择),'点阵字体'代表一组字体,容纳了每个字形和尺寸的位图。从而,每个字体只存在几种尺寸。它们渲染起来非常快,因为位图不需要计算,并且被认为是更加可读的,尤其在小尺寸环境 (甚至,某些轮廓字体还容纳了所谓的'嵌入点阵',为小尺寸设计的其自身的点阵版本)。点阵字体使用黑白渲染,不能平滑。"
-#: src/lib/fonts/fonts-config-state.rb:106
+#: src/lib/fonts/fonts-config-state.rb:107
msgid "Black and White Rendering"
msgstr "黑白渲染"
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
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 ""
-"使用黑白渲染、没有反锯齿 (灰阶平滑) 的字体。与平滑字体相比,它们更加可读,没有任何平滑带来的缺陷 (模糊或笔画粗细不均匀等)。针对删格化 (hint) "
-"良好的字体 (例如 Liberation 1 字体),这一设置可在保持缩放性能的同时给出点阵质量的字体。"
+msgstr "使用黑白渲染、没有反锯齿 (灰阶平滑) 的字体。与平滑字体相比,它们更加可读,没有任何平滑带来的缺陷 (模糊或笔画粗细不均匀等)。针对删格化 (hint) 良好的字体 (例如 Liberation 1 字体),这一设置可在保持缩放性能的同时给出点阵质量的字体。"
-#: src/lib/fonts/fonts-config-state.rb:126
+#: src/lib/fonts/fonts-config-state.rb:127
msgid "Black and White Rendering for Monospaced Fonts"
msgstr "针对等宽字体的黑白渲染"
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
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
+#: src/lib/fonts/fonts-config-state.rb:147
msgid "Default"
msgstr "默认"
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
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 ""
-"反锯齿平滑渲染字体。不像黑白渲染的字体,这一设置有时通过牺牲一定可读性可以生成 '漂亮的' 字体。已知有较好删格化指令的 TrueType "
-"字体将使用字节码解释器 (bytecode interpreter) 渲染,否则将使用 'hintslight' 删格化级别的 FreeType "
-"自动删格器 (autohinter)。使用字体原生的删格化指令可生成笔画较细的字形。将使用默认字族偏好列表 (目前偏好具有较好删格化指令的 "
-"TrueType 字体)。"
+msgstr "反锯齿平滑渲染字体。不像黑白渲染的字体,这一设置有时通过牺牲一定可读性可以生成 '漂亮的' 字体。已知有较好删格化指令的 TrueType 字体将使用字节码解释器 (bytecode interpreter) 渲染,否则将使用 'hintslight' 删格化级别的 FreeType 自动删格器 (autohinter)。使用字体原生的删格化指令可生成笔画较细的字形。将使用默认字族偏好列表 (目前偏好具有较好删格化指令的 TrueType 字体)。"
-#: src/lib/fonts/fonts-config-state.rb:166
+#: src/lib/fonts/fonts-config-state.rb:167
msgid "CFF Fonts"
msgstr "CFF 字体"
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs."
-msgstr ""
-"考虑到 Adobe 对 FreeType 库的贡献,紧凑字体格式 (CFF) 的字体可被认为是在渲染出字形的可读性和平滑度之间折中得比较好的字体。"
+msgstr "考虑到 Adobe 对 FreeType 库的贡献,紧凑字体格式 (CFF) 的字体可被认为是在渲染出字形的可读性和平滑度之间折中得比较好的字体。"
-#: src/lib/fonts/fonts-config-state.rb:209
+#: src/lib/fonts/fonts-config-state.rb:210
msgid "Exclusive Autohinter Rendering"
msgstr "仅使用自动删格器渲染"
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
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 ""
-"不像默认方案,即使针对删格化良好的字体也使用 FreeType 的自动删格器 (使用 'hintslight' 级别)。这将生成更厚实,但有时也更模糊 "
-"(因此可读性更差) 的字形。将使用默认字族偏好列表。"
+msgstr "不像默认方案,即使针对删格化良好的字体也使用 FreeType 的自动删格器 (使用 'hintslight' 级别)。这将生成更厚实,但有时也更模糊 (因此可读性更差) 的字形。将使用默认字族偏好列表。"
-#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr "次像素渲染"
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr "使用 LCD 显示器的次像素渲染功能。需要启用了次像素渲染的 FreeType 库。"
@@ -471,9 +459,7 @@
#: 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 ""
-"<p>默认设置中,FreeType 的自动删格器的使用取决于字体类型和原生删格化指令质量。可通过<b>强制开启自动删格化</b>选项强制使用自动删格器。<"
-"/p>"
+msgstr "<p>默认设置中,FreeType 的自动删格器的使用取决于字体类型和原生删格化指令质量。可通过<b>强制开启自动删格化</b>选项强制使用自动删格器。</p>"
#: src/lib/fonts/fonts-dialog.rb:1094
msgid "<p>For each hinting algorithm, hint style (hinting level) is chosen."
@@ -489,8 +475,7 @@
#: 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 ""
-"<p>某些轮廓字体也包含了所谓的点阵笔画,即给定字体特定尺寸的点阵版本。在这里可以将之完全关闭,仅针对覆盖指定语言的字体开启,或针对每个字体都开启。"
+msgstr "<p>某些轮廓字体也包含了所谓的点阵笔画,即给定字体特定尺寸的点阵版本。在这里可以将之完全关闭,仅针对覆盖指定语言的字体开启,或针对每个字体都开启。"
#: src/lib/fonts/fonts-dialog.rb:1109
msgid "<h3>Subpixel Rendering</h3>"
@@ -542,9 +527,7 @@
#: 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 ""
-"<p>系统将在列表中查找第一个<b>已安装</b>字族,当然也考虑其它查询元素。可至 <b>fontinfo.opensuse.org</b> 浏览和安装 "
-"SUSE 发行版可用的字体软件包。</p>"
+msgstr "<p>系统将在列表中查找第一个<b>已安装</b>字族,当然也考虑其它查询元素。可至 <b>fontinfo.opensuse.org</b> 浏览和安装 SUSE 发行版可用的字体软件包。</p>"
#: src/lib/fonts/fonts-dialog.rb:1138
msgid "<h3>Forcing Family Preferences</h3>"
@@ -576,8 +559,7 @@
#: 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 ""
-"<p>当勾选后,该选项将为这里定义的偏好列表引入非常强的分量。若字族涵盖了所需字符集,该选项会在文档或图形界面请求字族前就从列表中推送字族。</p>"
+msgstr "<p>当勾选后,该选项将为这里定义的偏好列表引入非常强的分量。若字族涵盖了所需字符集,该选项会在文档或图形界面请求字族前就从列表中推送字族。</p>"
#. delete families, that are part of list for some alias
#: src/lib/fonts/fpl-add-dialog.rb:57
@@ -608,5 +590,3 @@
#: src/lib/fonts/select-ebl-dialog.rb:240
msgid "&Languages"
msgstr "语言(&L)"
-
-
Modified: trunk/yast/zh_CN/po/geo-cluster.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/geo-cluster.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-05 23:46+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -60,8 +60,8 @@
#.
#. $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:470
-#: src/include/geo-cluster/dialogs.rb:819 src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
msgid "Geo Cluster Configuration"
msgstr "地理集群配置"
@@ -113,17 +113,17 @@
msgstr "仲裁主机"
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:809
+#: src/include/geo-cluster/dialogs.rb:819
msgid "Add"
msgstr "添加"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:810
+#: src/include/geo-cluster/dialogs.rb:820
msgid "Edit"
msgstr "编辑"
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:811
+#: src/include/geo-cluster/dialogs.rb:821
msgid "Delete"
msgstr "删除"
@@ -169,15 +169,11 @@
msgstr "要写入到不同的文件夹,请输入一个绝对路径。"
#: src/include/geo-cluster/dialogs.rb:142
-msgid ""
-"For a newly created geo cluster, push the button below to generate /etc/"
-"booth/<key>."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr "对于新创建的地理集群,请按下面按钮来生成 /etc/booth/<key>。"
#: src/include/geo-cluster/dialogs.rb:147
-msgid ""
-"To join a existing geo cluster, please copy /etc/booth/<key> from other "
-"nodes manually."
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
msgstr "要加入一个已有地理集群,请从其它节点手动复制 /etc/booth/<key>。"
#: src/include/geo-cluster/dialogs.rb:151
@@ -254,86 +250,86 @@
msgstr "票据不能为空"
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:412 src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr "防火墙配置"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:559
+#: src/include/geo-cluster/dialogs.rb:569
msgid "Enter an IP address of your arbitrator"
msgstr "请输入一个您的仲裁主机的 IP 地址"
-#: src/include/geo-cluster/dialogs.rb:570
+#: src/include/geo-cluster/dialogs.rb:580
msgid "Edit IP address of your arbitrator"
msgstr "编辑您仲裁主机的 IP 地址"
-#: src/include/geo-cluster/dialogs.rb:586
+#: src/include/geo-cluster/dialogs.rb:596
msgid "Enter an IP address of your site"
msgstr "请输入您站点的 IP 地址"
-#: src/include/geo-cluster/dialogs.rb:597
+#: src/include/geo-cluster/dialogs.rb:607
msgid "Edit IP address of your site"
msgstr "编辑您站点的 IP 地址"
-#: src/include/geo-cluster/dialogs.rb:619
+#: src/include/geo-cluster/dialogs.rb:629
msgid "Ticket name already exist!"
msgstr "票据名称已存在!"
#. Validation check before switch to authentication
#. Still fall to :authentication or :ok
-#: src/include/geo-cluster/dialogs.rb:651
+#: src/include/geo-cluster/dialogs.rb:661
msgid "Configuration name can not be empty."
msgstr "配置名称不能为空。"
-#: src/include/geo-cluster/dialogs.rb:654
+#: src/include/geo-cluster/dialogs.rb:664
msgid "Configuration name can not be duplicated."
msgstr "无法复制配置名称。"
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:662
+#: src/include/geo-cluster/dialogs.rb:672
msgid "port is invalid!"
msgstr "端口无效!"
-#: src/include/geo-cluster/dialogs.rb:668
+#: src/include/geo-cluster/dialogs.rb:678
msgid "transport have to be filled!"
msgstr "必须填写「传输」!"
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:684
msgid "arbitrator have to be filled!"
msgstr "必须填写仲裁主机!"
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:689
msgid "site have to be filled!"
msgstr "必须填写「站点」!"
-#: src/include/geo-cluster/dialogs.rb:684
+#: src/include/geo-cluster/dialogs.rb:694
msgid "ticket have to be filled!"
msgstr "必须填写票据!"
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:738
+#: src/include/geo-cluster/dialogs.rb:748
msgid "Failed to create authentication file "
msgstr "创建认证文件失败"
-#: src/include/geo-cluster/dialogs.rb:741
+#: src/include/geo-cluster/dialogs.rb:751
msgid "Authentication file "
msgstr "认证文件"
-#: src/include/geo-cluster/dialogs.rb:741
+#: src/include/geo-cluster/dialogs.rb:751
msgid " created successfully."
msgstr "创建成功。"
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:800
+#: src/include/geo-cluster/dialogs.rb:810
msgid "GeoCluster Configuration Select"
msgstr "地理集群配置选择"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:816
msgid "Choose configuration file:"
msgstr "请选择配置文件:"
@@ -486,9 +482,7 @@
msgid "Configuration summary ..."
msgstr "配置摘要 ..."
-#~ msgid ""
-#~ "A relative path will be saved in /etc/booth, or using absolute path "
-#~ "directly."
+#~ msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
#~ msgstr "相对路径将被保存在 /etc/booth 中,或直接使用绝对路径。"
#~ msgid "Succeed to created authentification file "
Modified: trunk/yast/zh_CN/po/installation.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/installation.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/installation.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-06 00:08+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -114,29 +114,29 @@
"与手册中的屏幕有所不同。\n"
#. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
msgid "Start service %1"
msgstr "启动服务 %1"
#. TRANSLATORS: progress stage, %1 stands for service name
#. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
#: src/lib/installation/clients/inst_restore_settings.rb:47
msgid "Starting service %1..."
msgstr "正在启动服务 %1..."
#. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
msgid "Adjusting Network Settings"
msgstr "正在调整网络设置"
#. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
msgid "Network settings are being adjusted."
msgstr "正在调整网络设置。"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
msgid ""
"The previous installation has failed.\n"
"Would you like it to continue?\n"
@@ -149,7 +149,7 @@
"注意:您可能需要再次输入一些信息。"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
msgid ""
"The previous installation has been aborted.\n"
"Would you like it to continue?\n"
@@ -164,7 +164,7 @@
#. popup headline (#x1)
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
#: src/lib/installation/clients/inst_doit.rb:60
msgid "Starting Installation..."
msgstr "正在启动安装..."
@@ -263,12 +263,8 @@
#. 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 ""
-"<p>若您想要为某些设备创建黑名单通道以降低内核内存占用,请使用<b>屏蔽设备</"
-"b>。</p>"
+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 "<p>若您想要为某些设备创建黑名单通道以降低内核内存占用,请使用<b>屏蔽设备</b>。</p>"
#. progress step title
#: src/lib/installation/cio_ignore.rb:157
@@ -276,7 +272,7 @@
msgstr "正在屏蔽设备..."
#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:82
+#: src/lib/installation/clients/copy_files_finish.rb:83
msgid "Copying files to installed system..."
msgstr "正在将文件复制到安装好的系统..."
@@ -304,9 +300,7 @@
msgstr "从映像安装"
#: 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."
+msgid "Here you can choose to use Novell pre-defined images to speed up RPM installation."
msgstr "在此您可以选择使用 Novell 预制映像来加速 RPM 安装。"
#: src/lib/installation/clients/deploy_image_auto.rb:135
@@ -318,9 +312,7 @@
msgstr "不从映像安装(&D)"
#: src/lib/installation/clients/deploy_image_auto.rb:155
-msgid ""
-"Custom images deployment - this needs a URL to be configured as installation "
-"source"
+msgid "Custom images deployment - this needs a URL to be configured as installation source"
msgstr "自定义映像部署 - 这需要配置一个 URL 作为安装来源"
#. Image name, Image location
@@ -329,15 +321,11 @@
msgstr "在此您可以创建自定义映像。\n"
#: 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"
+msgid "You have to configure the software selection first before you can create an image here"
msgstr "您必须先配置软件选集才能在此创建映像"
#: src/lib/installation/clients/deploy_image_auto.rb:176
-msgid ""
-"Create an image file (AutoYaST will fetch it from the given location during "
-"installation)"
+msgid "Create an image file (AutoYaST will fetch it from the given location during installation)"
msgstr "创建一个映像文件 (AutoYaST 将在安装时从给定位置撷取它)"
#: src/lib/installation/clients/deploy_image_auto.rb:183
@@ -363,8 +351,7 @@
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"
-"selection of patterns. The rest of the packages which are not contained in "
-"the\n"
+"selection of patterns. The rest of the packages which are not contained in the\n"
"images will be installed from packages the standard way.</p>\n"
msgstr ""
"<p><b>从映像安装</b>用于加快安装速度。\n"
@@ -374,12 +361,9 @@
#: 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"
-"image on the harddisk which is a lot faster and can be pre-configured "
-"already.\n"
-"Everything else than RPM installation is done like during a normal auto-"
-"installation.</p>"
+"want to skip the complete step of RPM installation. Instead AutoYaST will dump an\n"
+"image on the harddisk which is a lot faster and can be pre-configured already.\n"
+"Everything else than RPM installation is done like during a normal auto-installation.</p>"
msgstr ""
"<p>若您想要跳过整个 RPM 安装步骤可使用<b>创建自用映像</b>。\n"
"AutoYaST 将转储一个安装更快、可预配置好的映像到硬盘。\n"
@@ -393,13 +377,9 @@
#. TRANSLATORS: help text
#: 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 ""
-"<p>注意当从映像安装时,全部源自映像的软件包的时间戳记将不会匹配安装日期,而是"
-"映像创建日期。</p>"
+"<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 "<p>注意当从映像安装时,全部源自映像的软件包的时间戳记将不会匹配安装日期,而是映像创建日期。</p>"
#. TRANSLATORS: help text
#: src/lib/installation/clients/deploying_proposal.rb:80
@@ -482,7 +462,7 @@
msgstr "%1 的更新 %2"
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:306
+#: src/lib/installation/clients/inst_system_analysis.rb:321
msgid "Unknown Product"
msgstr "未知产品"
@@ -523,14 +503,14 @@
#. 7 = Failed to connect to host.
#. 28 = Operation timeout.
#. push button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
#: src/lib/installation/clients/inst_download_release_notes.rb:126
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:319
msgid "Re&lease Notes..."
msgstr "版本资讯(&L)..."
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:169
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -543,12 +523,11 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:177
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
-"Use <b>License Translations...</b> to show the license in all available "
-"translations.\n"
+"Use <b>License Translations...</b> to show the license in all available translations.\n"
"</p>\n"
msgstr ""
"<P>\n"
@@ -557,7 +536,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -568,7 +547,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:190
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -580,7 +559,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:197
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
msgid ""
"<p>\n"
"Select <b>Abort</b> to abort the\n"
@@ -592,44 +571,51 @@
"</p>\n"
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:213
-#: src/lib/installation/clients/inst_complex_welcome.rb:415
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
msgid "License Agreement"
msgstr "许可协议"
#. combo box label
#. combobox
#. TRANSLATORS: Combo box
-#: src/lib/installation/clients/inst_complex_welcome.rb:237
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
#: src/lib/installation/clients/inst_release_notes.rb:217
-#: src/lib/installation/clients/inst_release_notes.rb:431
+#: src/lib/installation/clients/inst_release_notes.rb:429
msgid "&Language"
msgstr "语言(&L)"
#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:247
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
msgid "&Keyboard Layout"
msgstr "键盘布局(&K)"
#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:261
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
msgid "I &Agree to the License Terms."
msgstr "我同意许可条款。(&A)"
#. Report error about missing license acceptance
-#. !/usr/bin/env rspec
-#: src/lib/installation/clients/inst_complex_welcome.rb:287
-#: test/inst_complex_welcome_test.rb:106
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
msgid "You must accept the license to install this product"
msgstr "您必须接受许可才能安装本产品"
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "正在检查安装好的系统..."
+
#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:406
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
msgid "K&eyboard Test"
msgstr "键盘测试(&e)"
#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:436
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
msgid "License &Translations..."
msgstr "许可译文(&T)..."
@@ -706,24 +692,19 @@
#: src/lib/installation/clients/inst_congratulate.rb:215
msgid ""
"<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
-"AutoYaST is a way to do a complete SUSE Linux installation without user "
-"interaction. AutoYaST\n"
-"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 <tt>/root/autoinst."
-"xml</tt>.</p>"
+"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+"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 <tt>/root/autoinst.xml</tt>.</p>"
msgstr ""
"<p>若您想要创建一个 AutoYaST 方案请使用<b>克隆</b>。\n"
"AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n"
"AutoYaST 需要一个方案来了解安装好的系统应该是怎样的。\n"
-"若选中此选项,将把一份匹配当前系统的方案导出到 <tt>/root/autoyast.xml</tt>。"
-"</p>"
+"若选中此选项,将把一份匹配当前系统的方案导出到 <tt>/root/autoyast.xml</tt>。</p>"
#. #187558
#. Load Add-On products configured in the fist stage
#: src/lib/installation/clients/inst_congratulate.rb:310
-msgid ""
-"<p>To clone the current 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>要克隆当前系统,您必须安装 <b>%1</b> 软件包。</p>"
#: src/lib/installation/clients/inst_congratulate.rb:313
@@ -744,16 +725,16 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:109
-#: src/lib/installation/clients/inst_deploy_image.rb:354
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
#: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
msgid "Deploying Images..."
msgstr "正在部署映像..."
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:170
+#: src/lib/installation/clients/inst_deploy_image.rb:168
msgid ""
"Deploying images has failed.\n"
"Aborting the installation...\n"
@@ -762,30 +743,29 @@
"正在中止安装...\n"
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:202
+#: src/lib/installation/clients/inst_deploy_image.rb:200
msgid ""
"Debugging has been turned on.\n"
-"YaST will open a software manager for you to check the current status of "
-"packages."
+"YaST will open a software manager for you to check the current status of packages."
msgstr ""
"已经打开调试功能。\n"
"YaST 将打开一个软件包管理器来让您检查软件包当前状态。"
#. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:378
+#: src/lib/installation/clients/inst_deploy_image.rb:376
msgid "Downloading image at speed %1/s"
msgstr "正在下载映像,速度:%1/秒"
-#: src/lib/installation/clients/inst_deploy_image.rb:383
+#: src/lib/installation/clients/inst_deploy_image.rb:381
msgid "Downloading image %1 at speed %2/s"
msgstr "正在下载映像 %1,速度:%2/秒"
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:441
msgid "Deploying image..."
msgstr "正在部署映像..."
-#: src/lib/installation/clients/inst_deploy_image.rb:448
+#: src/lib/installation/clients/inst_deploy_image.rb:444
msgid "Deploying image %1..."
msgstr "正在部署映像 %1..."
@@ -802,15 +782,11 @@
msgid "&Disk to Use"
msgstr "要使用的磁盘(&D)"
-#: 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/lib/installation/clients/inst_disk_for_image.rb:92
+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/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
msgid "Hard Disk for Image Deployment"
msgstr "用于部署映像的硬盘"
@@ -886,71 +862,74 @@
msgid "Show &package updates"
msgstr "显示软件包更新(&P)"
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+msgid "Calling step %1..."
+msgstr "正在调用步骤 %1..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr " * %1"
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "安装出错"
+
#. Adjust a SlideShow dialog if not configured
#. kilobytes
#. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
msgid "Finishing Basic Installation"
msgstr "正在完成基础安装"
#. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
msgid "Creating list of finish scripts to call..."
msgstr "正在创建要调用的收尾脚本列表..."
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "已完成"
+
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:203
+#: src/lib/installation/clients/inst_finish.rb:456
msgid "Copy files to installed system"
msgstr "复制文件到安装好的系统"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:210
+#: src/lib/installation/clients/inst_finish.rb:463
msgid "Save configuration"
msgstr "保存配置"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:217
+#: src/lib/installation/clients/inst_finish.rb:470
msgid "Save installation settings"
msgstr "保存安装设置"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:226
+#: src/lib/installation/clients/inst_finish.rb:479
msgid "Install boot manager"
msgstr "安装引导管理器"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:233
+#: src/lib/installation/clients/inst_finish.rb:486
msgid "Prepare system for initial boot"
msgstr "为首次引导准备系统"
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:337
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
msgid "Checking stage: %1..."
msgstr "正在检查阶段:%1..."
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:424
-msgid "Calling step %1..."
-msgstr "正在调用步骤 %1..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:444
-msgid " * %1"
-msgstr " * %1"
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:481
-msgid "Finished"
-msgstr "已完成"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:613
-msgid "Installation Error"
-msgstr "安装出错"
-
#. Button to accept a license agreement
#: src/lib/installation/clients/inst_info.rb:63
msgid "I &Agree"
@@ -999,26 +978,21 @@
"<b>Add Online Repositories Before Installation</b>.</p>"
msgstr ""
"<p>\n"
-"要在安装或者更新时使用建议的远程软件源,请选择<b>在安装前添加在线软件源</b>。"
-"</p>"
+"要在安装或者更新时使用建议的远程软件源,请选择<b>在安装前添加在线软件源</b>。</p>"
#. help text for installation method
#: src/lib/installation/clients/inst_installation_options.rb:209
msgid ""
"<p>\n"
-"To install an add-on product from separate media together with &product;, "
-"select\n"
+"To install an add-on product from separate media together with &product;, select\n"
"<b>Include Add-on Products from Separate Media</b>.</p>\n"
msgstr ""
"<p>\n"
-"要在安装 &product; 时从独立介质安装附加产品,请选择<b>包括独立介质中的附加产"
-"品</b>。</p>\n"
+"要在安装 &product; 时从独立介质安装附加产品,请选择<b>包括独立介质中的附加产品</b>。</p>\n"
#. help text: additional help for installation
#: src/lib/installation/clients/inst_installation_options.rb:212
-msgid ""
-"<p>If you need specific hardware drivers for installation, see <i>http://"
-"drivers.suse.com</i> site.</p>"
+msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr "<p>若您需要安装特种硬件驱动,请参考 <i>http://drivers.suse.com</i> 站点。</p>"
#. Error message
@@ -1073,8 +1047,7 @@
#: src/lib/installation/clients/inst_network_check.rb:143
msgid ""
"<p>A configured network is needed for using remote repositories\n"
-"or add-on products. If you do not use remote repositories, skip the "
-"configuration.</p>\n"
+"or add-on products. If you do not use remote repositories, skip the configuration.</p>\n"
msgstr ""
"<p>您需要配置一个网络连接来使用远程的软件源或附加产品。\n"
"若您不使用远程软件源也可以跳过该配置。</p>\n"
@@ -1091,31 +1064,23 @@
#. TRANSLATORS: help text, part 1
#: 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"
+"<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"
"<b>GNOME</b> and <b>KDE</b>.</p>"
msgstr ""
-"<p>对于 Linux,<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环"
-"境。\n"
+"<p>对于 Linux,<b>选择</b>至关重要。<i>openSUSE</i> 提供了几种不同的桌面环境。\n"
"下面您可以看到两种主流的桌面:<b>GNOME</b> 和 <b>KDE</b>。</p>"
#. TRANSLATORS: help text, part 3
#: 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"
-"selection or after installation, you can change your selection or add "
-"additional desktop \n"
+"<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"
+"selection or after installation, you can change your selection or add additional desktop \n"
"environments. This screen allows you to set the default.</p>"
msgstr ""
-"<p>您也可以使用<b>其它</b>选项选择更满足您需要的其它桌面环境 (或者选择一个极"
-"简安装软件集)。\n"
-"稍后在软件选择中或安装后,您仍可以修改您的选择或添加额外桌面环境。本屏幕允许"
-"您设置默认桌面环境。</p>"
+"<p>您也可以使用<b>其它</b>选项选择更满足您需要的其它桌面环境 (或者选择一个极简安装软件集)。\n"
+"稍后在软件选择中或安装后,您仍可以修改您的选择或添加额外桌面环境。本屏幕允许您设置默认桌面环境。</p>"
#. TRANSLATORS: dialog caption
#: src/lib/installation/clients/inst_new_desktop.rb:121
@@ -1148,7 +1113,7 @@
#. Use 'zero' if image installation is not used
#. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
msgid "Installing Packages..."
msgstr "正在安装软件包..."
@@ -1180,7 +1145,7 @@
msgstr "<p>安装好的 Linux 系统的<b>版本资讯</b>摘要说明了其新功能和改动。</p>\n"
#. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
msgid "<p>No release notes have been installed.</p>"
msgstr "<p>未安装版本资讯。</p>"
@@ -1205,98 +1170,97 @@
#. This dialog in not interactive
#. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
msgid "Analyzing the Computer"
msgstr "正在分析计算机"
#. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
msgid "Probe USB devices"
msgstr "检测 USB 设备"
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
msgid "Probing USB devices..."
msgstr "正在检测 USB 设备..."
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
msgid "Probe FireWire devices"
msgstr "检测火线设备..."
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
msgid "Probing FireWire devices..."
msgstr "正在检测火线设备..."
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
msgid "Probe floppy disk devices"
msgstr "检测软盘设备"
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
msgid "Probing floppy disk devices..."
msgstr "正在检测软盘设备..."
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
msgid "Probe hard disk controllers"
msgstr "检测硬盘控制器"
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
msgid "Probing hard disk controllers..."
msgstr "正在检测硬盘控制器..."
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
msgid "Load kernel modules for hard disk controllers"
msgstr "为硬盘控制器加载内核模块"
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
msgid "Loading kernel modules for hard disk controllers..."
msgstr "正在为硬盘控制器加载内核模块..."
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
msgid "Probe hard disks"
msgstr "检测硬盘"
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
msgid "Probing hard disks..."
msgstr "正在检测硬盘..."
#. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
msgid "Search for system files"
msgstr "搜索系统文件"
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
msgid "Searching for system files..."
msgstr "正在搜索系统文件..."
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
msgid "Initialize software manager"
msgstr "初始化软件包管理器"
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
msgid "Initializing software manager..."
msgstr "正在初始化软件包管理器..."
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
msgid "System Probing"
msgstr "系统检测"
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
msgid "YaST is probing computer hardware and installed systems now."
msgstr "YaST 现在正在检测计算机硬件和已安装的系统。"
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:242
+#: src/lib/installation/clients/inst_system_analysis.rb:257
msgid ""
"\n"
-"Check 'drivers.suse.com' if you need specific hardware drivers for "
-"installation."
+"Check 'drivers.suse.com' if you need specific hardware drivers for installation."
msgstr ""
"\n"
"若您需要安装特种硬件驱动请查看 'drivers.suse.com'。"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:256
+#: src/lib/installation/clients/inst_system_analysis.rb:271
msgid ""
"No hard disks were found for the installation.\n"
"Please check your hardware!\n"
@@ -1306,7 +1270,7 @@
"请检查您的硬件!\n"
"%1\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:266
+#: src/lib/installation/clients/inst_system_analysis.rb:281
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1317,7 +1281,7 @@
"(尤其是在 S/390 或 iSCSI 系统上)\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:277
+#: src/lib/installation/clients/inst_system_analysis.rb:292
msgid ""
"No hard disks and no hard disk controllers were\n"
"found for the installation.\n"
@@ -1329,7 +1293,7 @@
"%1\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:322
+#: src/lib/installation/clients/inst_system_analysis.rb:337
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
@@ -1338,7 +1302,7 @@
"即将中止安装。"
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:184
+#: src/lib/installation/clients/inst_update_installer.rb:187
msgid ""
"A valid update could not be found at\n"
"%s.\n"
@@ -1349,7 +1313,7 @@
"\n"
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:190
+#: src/lib/installation/clients/inst_update_installer.rb:193
msgid ""
"Could not fetch update from\n"
"%s.\n"
@@ -1359,19 +1323,35 @@
"%s。\n"
"\n"
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:215
+#: src/lib/installation/clients/inst_update_installer.rb:265
msgid ""
-"Downloading installer updates from \n"
+"Downloading the optional installer updates from \n"
"%s\n"
"failed.\n"
"\n"
-"Would you like to check your network configuration?"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
msgstr ""
-"从 %s\n"
-"下载安装器更新失败。\n"
-"\n"
-"您想要检查您的网络配置吗?"
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
@@ -1438,8 +1418,7 @@
#: src/lib/installation/clients/inst_upgrade_urls.rb:256
msgid ""
"<p>Here you see all software repositories found\n"
-"on the system you are upgrading. Enable the ones you want to include in the "
-"upgrade process.</p>"
+"on the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>"
msgstr ""
"<p>在此您可以看到从您正在升级的系统中发现的全部软件源。\n"
"请启用您想要在升级过程中使用的软件源。</p>"
@@ -1637,7 +1616,7 @@
msgstr "<p>请点击<b>下一步</b>执行基本系统配置。</p>\n"
#. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
msgid "No workflow defined for this kind of installation."
msgstr "没有为此类安装方式定义安装流程。"
@@ -1711,6 +1690,26 @@
msgid "Saving hardware configuration..."
msgstr "正在保存硬件配置..."
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+#| msgid "Clone System Configuration"
+msgid "Import SSH Host Keys and Configuration"
+msgstr "复制系统配置"
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+#| msgid "&Clone System Configuration"
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "复制系统配置(&C)"
+
#. progress step title
#: src/lib/installation/clients/ssh_settings_finish.rb:64
msgid "Copying SSH settings to installed system..."
@@ -1778,6 +1777,34 @@
msgid "Copying log files to installed system..."
msgstr "正在将日志文件复制到安装好的系统..."
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "设备"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Export Configuration"
+msgid "Import SSH Configuration"
+msgstr "导出配置(&E)"
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
@@ -1903,8 +1930,7 @@
#: src/lib/installation/proposal_store.rb:426
msgid ""
"<p>\n"
-"Select <b>Install</b> to perform a new installation with the values "
-"displayed.\n"
+"Select <b>Install</b> to perform a new installation with the values displayed.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -1992,13 +2018,8 @@
msgid "Enabling remote administration..."
msgstr "正在启用远程管理..."
-#. skip forward or backward
-#: src/lib/installation/select_system_role.rb:48
-msgid "System Role"
-msgstr "系统角色"
-
#. A Continue-Cancel popup
-#: src/lib/installation/select_system_role.rb:82
+#: src/lib/installation/select_system_role.rb:79
msgid "Changing the system role may undo adjustments you may have done."
msgstr "修改系统角色可能冲销您已做的调整。"
@@ -2013,6 +2034,35 @@
msgid "Creating root filesystem snapshot..."
msgstr "正在创建根文件系统快照..."
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+msgid "No previous Linux installation found"
+msgstr ""
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
#. autoyast tried to read a file but had no success.
#: src/lib/transfer/file_from_url.rb:156
msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
@@ -2077,12 +2127,12 @@
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
msgid "Failed to read information about installation images"
msgstr "无法读取安装映像信息"
#. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
msgid "Deploying..."
msgstr "正在部署..."
@@ -2090,19 +2140,19 @@
#.
#. @see #all_supported_types
#. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
msgid "Storing user preferences..."
msgstr "正在储存用户偏好..."
#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
#.
#. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
msgid "Restoring user preferences..."
msgstr "正在恢复用户偏好..."
#. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
msgid ""
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
@@ -2110,43 +2160,42 @@
"安装未能自动解决软件包依赖关系。\n"
"将打开软件包管理器来让您手动解决那些依赖关系。"
+#~ msgid ""
+#~ "Downloading installer updates from \n"
+#~ "%s\n"
+#~ "failed.\n"
+#~ "\n"
+#~ "Would you like to check your network configuration?"
+#~ msgstr ""
+#~ "从 %s\n"
+#~ "下载安装器更新失败。\n"
+#~ "\n"
+#~ "您想要检查您的网络配置吗?"
+
+#~ msgid "System Role"
+#~ msgstr "系统角色"
+
#~ msgid "Generating AutoYaST profile if needed..."
#~ msgstr "若需要则生成 AutoYaST 方案..."
#~ msgid ""
-#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST "
-#~ "profile.\n"
-#~ "AutoYaST is a way to do a complete SUSE Linux installation without user "
-#~ "interaction. AutoYaST\n"
-#~ "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 <tt>/root/autoinst."
-#~ "xml</tt>.</p>"
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "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 <tt>/root/autoinst.xml</tt>.</p>"
#~ msgstr ""
#~ "<p>若您想要创建一个 AutoYaST 方案请使用<b>复制系统设置</b>。\n"
#~ "AutoYaST 是一种无需用户干预即可完整安装 SUSE Linux 的方式。\n"
#~ "AutoYaST 需要一个方案来获知安装后的系统应该长什么样子。\n"
-#~ "若选择了此选项,将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。</"
-#~ "p>"
+#~ "若选择了此选项,将把当前 系统的方案存储到 <tt>/root/autoinst.xml</tt>。</p>"
-#~ msgid ""
-#~ "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
+#~ msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
#~ msgstr "安装结束后写入 AutoYaST 方案到 /root/autoinst.xml 吗?"
-#~ msgid "Clone System Configuration"
-#~ msgstr "复制系统配置"
+#~ msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
+#~ msgstr "AutoYaST 方案将被写入在 /root/autoinst.xml 下(<a href=\"%1\">不写入</a>)。"
-#~ msgid "&Clone System Configuration"
-#~ msgstr "复制系统配置(&C)"
-
-#~ msgid ""
-#~ "The AutoYaST profile will be written under /root/autoinst.xml (<a href="
-#~ "\"%1\">do not write it</a>)."
-#~ msgstr ""
-#~ "AutoYaST 方案将被写入在 /root/autoinst.xml 下(<a href=\"%1\">不写入</a>)。"
-
-#~ msgid ""
-#~ "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
+#~ msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
#~ msgstr "将不会保存 AutoYaST 方案(<a href=\"%1\">写入</a>)。"
#~ msgid "Location of Stored Configuration"
@@ -2155,9 +2204,6 @@
#~ msgid "Failed to store configuration. Details can be found in log."
#~ msgstr "存储配置失败。可在日志中找到细节。"
-#~ msgid "&Export Configuration"
-#~ msgstr "导出配置(&E)"
-
#~ msgid "ERROR: Missing Title"
#~ msgstr "错误:缺少标题"
@@ -2274,14 +2320,10 @@
#~ msgid "Network Card"
#~ msgstr "网卡"
-#~ msgid "Device"
-#~ msgstr "设备"
-
#~ msgid "Hardware Information of the Selected Network Card"
#~ msgstr "所选网卡的硬件信息"
-#~ msgid ""
-#~ "<p>Here you can configure your network cards to be used immediately.</p>"
+#~ msgid "<p>Here you can configure your network cards to be used immediately.</p>"
#~ msgstr "<p>在此您可以配置您要立即使用的网卡。</p>"
#~ msgid ""
@@ -2402,9 +2444,7 @@
#~ msgstr ""
#~ "<p><big><b>代理</b></big>\n"
#~ "<br>代理是一个基于服务器的网络访问缓存。\n"
-#~ "在大多数情况下,若您能直接连接到互联网,就没有必要使用代理。(注意,这不是"
-#~ "科学上网代理。科学上网的软件需要您另装,具体垂询https://forum.suse.org.cn "
-#~ "请以暗号形式转义掉敏感词!)</p>\n"
+#~ "在大多数情况下,若您能直接连接到互联网,就没有必要使用代理。(注意,这不是科学上网代理。科学上网的软件需要您另装,具体垂询https://forum.suse.org.cn 请以暗号形式转义掉敏感词!)</p>\n"
#~ msgid ""
#~ "<p>Command: <tt>%1</tt> has failed.</p>\n"
@@ -2483,9 +2523,7 @@
#~ msgid "Writing Network Setup..."
#~ msgstr "正在写入网络设置..."
-#~ msgid ""
-#~ "<p>Please, wait while network configuration is being written and tested..."
-#~ "</p>"
+#~ msgid "<p>Please, wait while network configuration is being written and tested...</p>"
#~ msgstr "<p>正在写入和测试网络配置, 请稍候...</p>"
#~ msgid ""
@@ -2569,8 +2607,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Select <b>New Installation</b> if there is no existing Linux system on "
-#~ "your\n"
+#~ "Select <b>New Installation</b> if there is no existing Linux system on your\n"
#~ "machine or if you want to replace an existing Linux system completely,\n"
#~ "discarding all its configuration data.\n"
#~ "</p>\n"
@@ -2595,8 +2632,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Select <b>Use Automatic Configuration</b> to let the installation "
-#~ "program\n"
+#~ "Select <b>Use Automatic Configuration</b> to let the installation program\n"
#~ "configure your network and hardware automatically. Otherwise you will\n"
#~ "be offered a configuration proposal with the possibility to tune all the\n"
#~ "settings manually. Inexperienced users are advised to use automatic\n"
@@ -2734,8 +2770,7 @@
#~ msgid "Connecting to the inst-sys failed. Debugger cannot continue."
#~ msgstr "连接 inst-sys 失败,调试工具无法继续。"
-#~ msgid ""
-#~ "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>"
+#~ msgid "<p>To access the X11 system, the <b>%1</b> package must be installed.</p>"
#~ msgstr "<p>要访问 X11 系统,必须安装 <b>%1</b> 软件包。</p>"
#~ msgid "<p>Do you want to install it now?</p>"
@@ -2787,27 +2822,21 @@
#~ msgstr "正在初始化字体..."
#~ msgid ""
-#~ "<p><b>Installation from Images</b> is used to speed the installation "
-#~ "up. \n"
-#~ "Images contain compressed snapshots of installed system matching your "
-#~ "selection \n"
-#~ "of patterns. The rest of packages which are not in images will be "
-#~ "installed from \n"
+#~ "<p><b>Installation from Images</b> is used to speed the installation up. \n"
+#~ "Images contain compressed snapshots of installed system matching your selection \n"
+#~ "of patterns. The rest of packages which are not in images will be installed from \n"
#~ "packages the standard way.</p>"
#~ msgstr ""
#~ "<p><b>从映像安装</b>可以用来加快安装速度。\n"
#~ "映像中包含压缩的安装系统快照,和您选择的模式相匹配。\n"
#~ "其他不在映像中的软件包将以标准方法安装。</p>"
-#~ msgid ""
-#~ "<p>Installation is currently writing the automatic configuration. Please "
-#~ "wait...</p>"
+#~ msgid "<p>Installation is currently writing the automatic configuration. Please wait...</p>"
#~ msgstr "<p>安装程序正在写入自动安装配置。请稍等...</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "Select <b>New Installation</b> if there is no existing Linux system on "
-#~ "your\n"
+#~ "Select <b>New Installation</b> if there is no existing Linux system on your\n"
#~ "machine or if you want to replace an existing Linux system completely,\n"
#~ "abandoning all its configuration data.\n"
#~ "</p>"
@@ -2820,8 +2849,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "To install an add-on product from separate media together with &product;, "
-#~ "select\n"
+#~ "To install an add-on product from separate media together with &product;, select\n"
#~ "<b>Include Add-On Products from Separate Media</b>.</p>"
#~ msgstr ""
#~ "<p>\n"
@@ -2833,8 +2861,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Your hard disk has not been modified in any way, so you can still safely "
-#~ "abort.\n"
+#~ "Your hard disk has not been modified in any way, so you can still safely abort.\n"
#~ "</p>\n"
#~ msgstr ""
#~ "<p>\n"
@@ -2863,8 +2890,7 @@
#~ msgstr "修复已安装系统(&P)"
#~ msgid ""
-#~ "<p>Select <b>Repair Installed System</b> if you have a damaged Linux "
-#~ "system on\n"
+#~ "<p>Select <b>Repair Installed System</b> if you have a damaged Linux system on\n"
#~ "your hard disk. This option can try to fix problems automatically.\n"
#~ "</p>"
#~ msgstr ""
@@ -2890,8 +2916,7 @@
#~ msgid ""
#~ "Accessing the YaST module %1 has failed.\n"
#~ "More information can be found in the '%2' file.\n"
-#~ "Please report this bug at %3 and attach the YaST logs stored in the '%4' "
-#~ "directory."
+#~ "Please report this bug at %3 and attach the YaST logs stored in the '%4' directory."
#~ msgstr ""
#~ "访问 YaST 模块 %1 失败。\n"
#~ "更多信息可以在文件“%2”中找到。\n"
@@ -2934,14 +2959,10 @@
#~ msgstr "正在运行调试程序..."
#~ 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"
-#~ "<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a "
-#~ "large number\n"
-#~ "of desktop applications such as email, file browser, games and many "
-#~ "others.</p>"
+#~ "<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"
+#~ "<b>GNOME</b> and <b>KDE</b>. Both provide an easy to use desktop with a large number\n"
+#~ "of desktop applications such as email, file browser, games and many others.</p>"
#~ msgstr ""
#~ "<p>对于 Linux,<b>选择</b>至关重要。<i>openSUSE</i>提供了几种\n"
#~ " 不同的桌面环境。下面您可以看到两种主流的桌面:\n"
@@ -2949,8 +2970,7 @@
#~ "带有很多桌面软件,比如 Email、文件浏览器、游戏等。</p>"
#~ msgid ""
-#~ "<p>As desktop selection is a matter of taste a clear <i>recommendation "
-#~ "can't be\n"
+#~ "<p>As desktop selection is a matter of taste a clear <i>recommendation can't be\n"
#~ "given</i>.</p>"
#~ msgstr "<p>桌面选择,在于品味,所以并<i>没有明确的推荐</i>。</p>"
@@ -2987,11 +3007,9 @@
#, fuzzy
#~ msgid ""
-#~ "<p>Installation from images is faster than installation from RPM "
-#~ "packages\n"
+#~ "<p>Installation from images is faster than installation from RPM packages\n"
#~ "because it does not need to handle with RPM database, locks etc.\n"
-#~ "One of the images also contains the joint RPM database and other metadata."
-#~ "</p>"
+#~ "One of the images also contains the joint RPM database and other metadata.</p>"
#~ msgstr ""
#~ "<p>从映像安装比从 RPM 软件包安装的速度块。\n"
#~ "因为不需要处理 RPM 数据库,比如锁定等。\n"
@@ -2999,21 +3017,16 @@
#~ msgid ""
#~ "<p>If there is no direct access to installation images,\n"
-#~ "installation program has to download them first before they are deployed."
-#~ "</p>"
+#~ "installation program has to download them first before they are deployed.</p>"
#~ msgstr ""
#~ "<p>如果不能直接访问到安装映像,\n"
#~ "安装程序必须先下载它们,然后才能部署。<p>"
#~ 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"
-#~ "<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an "
-#~ "easy to use desktop\n"
-#~ "with a large number of desktop applications such as email, file browser, "
-#~ "games and many others.</p>"
+#~ "<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"
+#~ "<b>GNOME</b> and <b>KDE</b> (in two different versions). Both provide an easy to use desktop\n"
+#~ "with a large number of desktop applications such as email, file browser, games and many others.</p>"
#~ msgstr ""
#~ "<p>对于 Linux,<b>选择</b>至关重要。<i>openSUSE</i>提供了\n"
#~ "几种不同的桌面环境。下面您可以看到两种主流的桌面:\n"
@@ -3022,13 +3035,10 @@
#~ msgid ""
#~ "openSUSE offers you a choice of user interfaces. The two major complete \n"
-#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a "
-#~ "full \n"
-#~ "suite of applications including email, a file manager, games and "
-#~ "utilities.\n"
+#~ "desktops are KDE and GNOME. Both provide an easy-to-use desktop with a full \n"
+#~ "suite of applications including email, a file manager, games and utilities.\n"
#~ "\n"
-#~ "As desktop selection is a matter of taste, we do not give a "
-#~ "recommendation."
+#~ "As desktop selection is a matter of taste, we do not give a recommendation."
#~ msgstr ""
#~ "openSUSE 给您用户界面的选择。两种主流桌面 KDE 和 GNOME\n"
#~ "都容易使用,并带有一整套应用程序,包括 Email、文件管理器、\n"
Modified: trunk/yast/zh_CN/po/iscsi-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/iscsi-client.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-05 17:03+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -110,14 +110,13 @@
msgid "Add"
msgstr "添加"
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
#: src/include/iscsi-client/dialogs.rb:160
msgid "Edit"
msgstr "编辑"
#: src/include/iscsi-client/dialogs.rb:161
-msgid "Log Out"
-msgstr "注销"
+msgid "Disconnect"
+msgstr "断开"
#: src/include/iscsi-client/dialogs.rb:186
msgid "Connected"
@@ -128,9 +127,6 @@
msgstr "发现"
#: src/include/iscsi-client/dialogs.rb:193
-msgid "Log In"
-msgstr "登入"
-
#: src/include/iscsi-client/dialogs.rb:223
msgid "Connect"
msgstr "连接"
@@ -171,58 +167,75 @@
msgid "Startup"
msgstr "启动"
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "手动"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr "IP 地址"
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
msgid "Port"
msgstr "端口"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Key"
msgstr "键"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Value"
msgstr "值"
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
msgid "Service"
msgstr "服务"
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
msgid "Connected Targets"
msgstr "已连接目标"
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
msgid "Discovered Targets"
msgstr "已发现目标"
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
msgid "iSCSI Initiator Overview"
msgstr "iSCSI 发起端概览"
#. discovery new target
#. 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/dialogs.rb:407
+#: 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 发起端</h1>"
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
msgid "iSCSI Initiator Discovery"
msgstr "iSCSI 发起端发现"
@@ -331,57 +344,48 @@
#. table of connected targets
#: src/include/iscsi-client/helps.rb:90
-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 ""
-"当前会话列表。要添加新目标,请选择它并按<b>添加</b>。\n"
-"要移除某个目标,请按<b>注销</b>。\n"
-"要修改启动状态,请按<b>切换</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 "<p>当前会话列表。</p><p>使用<b>添加</b>按钮来获取额外目标。将启动探索来检测新目标和已连接目标的启动模式是否保持未变。<br>使用<b>断开连接</b>来取消连接并从列表中移除该目标。<br>要修改启动状态,请按<b>编辑</b>。</p>"
#. 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>警告</h1>"
-#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115
-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>当<b>读</b>/<b>写</b>访问一个 iSCSI 设备时,请确保此访问是排它的。否则会有"
-"潜在的数据损坏风险。</p>\n"
+#: 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>当<b>读</b>/<b>写</b>访问一个 iSCSI 设备时,请确保此访问是排它的。否则会有潜在的数据损坏风险。</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"
+#| "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>"
msgid ""
-"<p><b>InitiatorName</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>"
+"<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>发起端名称</b> 是 <tt>/etc/iscsi/initiatorname.iscsi</tt> 中的一个值。\n"
"若您有 iBFT,此值将从那里添加,并且您只能在 BIOS 设置中修改它。</p>"
-#: src/include/iscsi-client/helps.rb:103
+#: src/include/iscsi-client/helps.rb:106
msgid ""
-"If you want to use <b>iSNS</b> (Internet Storage Name Service) for "
-"discovering targets instead of the default SendTargets method,\n"
-"fill in the IP address of the iSNS server and port. The default port should "
-"be 3205.\n"
+"If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method,\n"
+"fill in the IP address of the iSNS server and port. The default port should be 3205.\n"
msgstr ""
-"若您想用 <b>iSNS</b> (互联网存储名称服务) 来发现目标,而不是用默认的 "
-"SendTargets 方法,\n"
+"若您想用 <b>iSNS</b> (互联网存储名称服务) 来发现目标,而不是用默认的 SendTargets 方法,\n"
"请填上 iSNS 服务器的 IP 地址和端口。默认端口应是 3205。\n"
-#: 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"
-"Only change <b>Port</b> if needed. For authentication, use <b>Username</b> "
-"and <b>Password</b>. If you do not need authentication,\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 ""
"请输入所发现服务器的 <b>IP 地址</b>。\n"
@@ -389,18 +393,10 @@
"认证请使用<b>用户名</b>和<b>密码</b>。\n"
"若您不需要认证,请选择<b>无认证</b>。\n"
-#: src/include/iscsi-client/helps.rb:122
-msgid ""
-"List of nodes offered by the iSCSI target. Select one item and click "
-"<b>Connect</b>. "
+#: 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 "iSCSI 目标提供的节点列表。请选择一项并按<b>连接</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 "选择认证类型并输入<b>用户名</b>和<b>密码</b>。"
-
#: src/include/iscsi-client/helps.rb:132
msgid "<h1>Startup</h1>"
msgstr "<h1>启动</h1>"
@@ -409,26 +405,29 @@
msgid ""
"<p><b>manual</b> is for iSCSI targets which are not to be connected by\n"
"default, the user needs to connect them manually</p>\n"
-"<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. "
-"when\n"
+"<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. when\n"
"root is on iSCSI. As such it will be evaluated by the initrd.</p>\n"
-"<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI "
-"service\n"
+"<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI service\n"
"starts up.</p>\n"
msgstr ""
"<p><b>手动</b>用于默认不连接的 iSCSI 目标,用户需要手动连接它们</p>\n"
-"<p><b>引导时</b>用于在引导时连接的 iSCSI 目标,例如,当 root 在 iSCSI 上时。"
-"因为这样 initrd 就需要评估位于 iSCSI 上的 root 分区了。</p>\n"
+"<p><b>引导时</b>用于在引导时连接的 iSCSI 目标,例如,当 root 在 iSCSI 上时。因为这样 initrd 就需要评估位于 iSCSI 上的 root 分区了。</p>\n"
"<p><b>自动</b>用于当 iSCSI 服务启动时自动连接的 iSCSI 目标。</p>\n"
-#. list of discovered targets
+#: src/include/iscsi-client/helps.rb:141
+msgid "<h1>Authentication</h1>"
+msgstr "<h1>认证</h1>"
+
#: 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 "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。"
+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 "<p>这里的默认设置是<i>无认证</i>。若出于安全原因需要认证请反选复选框。在'进站认证','出站认证',或两者中输入<b>用户名</b>和<b>密码</b>。</p><p><b>请注意:</b><br>这里的'进站认证'与 iSCSI 目标服务器端的'出站认证'相关联,反之亦然。</p>"
-#: 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 "<p>这个屏幕显示了已发现的目标列表。</p><p>使用<b>发现</b>按钮来从由 IP 地址指定的服务器上获取可用 iSCSI 目标。<br>使用<b>连接</b>来建立到目标的连接。若登录成功,<i>已连接</i>列显示状态为'真'且目标将出现在<i>已连接目标</i>屏幕。<br>要移除目标请使用<b>删除</b>按钮。<br><b>提示:</b>仅可以移除未连接的目标。若需要,请先在<i>已连接目标</i>屏幕点击<b>断开连接</b>。</p><p><b>请注意:</b>再次启动<b>探索</b>意味着重新探索目标,可能会修改已连接目标的启动模式(为默认的'手动')。若您想要添加新目标而不修改启动模式,请切换到<i>已连接目标</i>屏幕并使用<b>添加</b>按钮。</p>"
+
+#: src/include/iscsi-client/helps.rb:167
msgid "<h1>iBTF</h1>"
msgstr "<h1>iBTF</h1>"
@@ -463,31 +462,44 @@
msgid "Error occurred while logging out from the selected target."
msgstr "从所选目标注销时出错。"
-#. toggle all 3 possible values (bnc#457252)
#: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
msgid "No record found."
msgstr "未找到记录。"
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
msgid "No valid IP address"
msgstr "无有效 IP 地址"
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
msgid "Port field cannot be empty"
msgstr "端口号不能为空"
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:423
+#: src/include/iscsi-client/widgets.rb:393
+msgid "Incorrect Initiator Name"
+msgstr "不正确的发起端名称"
+
+#: src/include/iscsi-client/widgets.rb:394
+#, fuzzy
+#| msgid ""
+#| "Incorrect InitiatorName.\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"
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 ""
"错误的发起端名称。\n"
"正确的语法为\n"
@@ -497,13 +509,18 @@
"例如:\n"
"iqn.2007-04.cz.server:storage.disk.sdb\n"
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:625
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
msgid "Insert the IP address."
msgstr "请输入 IP 地址。"
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
#. validate port number
-#: src/include/iscsi-client/widgets.rb:631
+#: src/include/iscsi-client/widgets.rb:596
msgid "Insert the port."
msgstr "请输入端口。"
@@ -511,38 +528,36 @@
#. ******************* 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:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
msgid "True"
msgstr "真"
-#: src/include/iscsi-client/widgets.rb:733
-#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
msgid "False"
msgstr "假"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:771
-#: src/include/iscsi-client/widgets.rb:891
-msgid ""
-"The target with this TargetName is already connected. Make sure that "
-"multipathing is enabled to prevent data corruption."
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
+msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr "已连接名称为此目标名称的目标。请确保启用了多路径以防止数据损坏。"
-#: src/include/iscsi-client/widgets.rb:774
-#: src/include/iscsi-client/widgets.rb:894
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Continue"
msgstr "继续"
-#: src/include/iscsi-client/widgets.rb:775
-#: src/include/iscsi-client/widgets.rb:895
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
msgid "Cancel"
msgstr "取消"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:885
+#: src/include/iscsi-client/widgets.rb:869
msgid "The target is already connected."
msgstr "目标已连接。"
@@ -559,9 +574,7 @@
#. don't check interactively for packages (bnc#367300)
#. skip it during second stage or when create AY profile
#: src/modules/IscsiClient.rb:96
-msgid ""
-"<p>To configure the iSCSI initiator, the <b>%1</b> package must be installed."
-"</p>"
+msgid "<p>To configure the iSCSI initiator, the <b>%1</b> package must be installed.</p>"
msgstr "<p>必须安装 <b>%1</b> 软件包才能配置 iSCSI 发起端。</p>"
#: src/modules/IscsiClient.rb:99
@@ -633,7 +646,7 @@
msgstr "全部"
#. }
-#: src/modules/IscsiClientLib.rb:694
+#: src/modules/IscsiClientLib.rb:730
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -644,75 +657,38 @@
"旧的发起端名称将替换为 iBFT 中的值并创建备份。\n"
"您若想要使用不同的发起端名称,请到 BIOS 中修改之。\n"
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
+msgid "Target connection failed.\n"
+msgstr "目标连接失败。\n"
+
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1147
+#: src/modules/IscsiClientLib.rb:1208
msgid "Configuration summary..."
msgstr "配置摘要..."
-#~| msgid "Disconnected"
-#~ msgid "Disconnect"
-#~ msgstr "断开"
+#~ msgid "Log Out"
+#~ msgstr "注销"
-#~ 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 ""
-#~ "<p>当前会话列表。</p><p>使用<b>添加</b>按钮来获取额外目标。将启动探索来检"
-#~ "测新目标和已连接目标的启动模式是否保持未变。<br>使用<b>断开连接</b>来取消"
-#~ "连接并从列表中移除该目标。<br>要修改启动状态,请按<b>编辑</b>。</p>"
+#~ msgid "Log In"
+#~ msgstr "登入"
-#~| msgid "Authentication"
-#~ msgid "<h1>Authentication</h1>"
-#~ msgstr "<h1>认证</h1>"
-
#~ 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>"
+#~ "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 ""
-#~ "<p>这里的默认设置是<i>无认证</i>。若出于安全原因需要认证请反选复选框。"
-#~ "在'进站认证','出站认证',或两者中输入<b>用户名</b>和<b>密码</b>。</"
-#~ "p><p><b>请注意:</b><br>这里的'进站认证'与 iSCSI 目标服务器端的'出站认"
-#~ "证'相关联,反之亦然。</p>"
+#~ "当前会话列表。要添加新目标,请选择它并按<b>添加</b>。\n"
+#~ "要移除某个目标,请按<b>注销</b>。\n"
+#~ "要修改启动状态,请按<b>切换</b>。\n"
-#~ 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 ""
-#~ "<p>这个屏幕显示了已发现的目标列表。</p><p>使用<b>发现</b>按钮来从由 IP 地"
-#~ "址指定的服务器上获取可用 iSCSI 目标。<br>使用<b>连接</b>来建立到目标的连"
-#~ "接。若登录成功,<i>已连接</i>列显示状态为'真'且目标将出现在<i>已连接目标</"
-#~ "i>屏幕。<br>要移除目标请使用<b>删除</b>按钮。<br><b>提示:</b>仅可以移除未"
-#~ "连接的目标。若需要,请先在<i>已连接目标</i>屏幕点击<b>断开连接</b>。</"
-#~ "p><p><b>请注意:</b>再次启动<b>探索</b>意味着重新探索目标,可能会修改已连"
-#~ "接目标的启动模式(为默认的'手动')。若您想要添加新目标而不修改启动模式,请切"
-#~ "换到<i>已连接目标</i>屏幕并使用<b>添加</b>按钮。</p>"
+#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
+#~ msgstr "选择认证类型并输入<b>用户名</b>和<b>密码</b>。"
-#~| msgid "Initiator Name"
-#~ msgid "Incorrect Initiator Name"
-#~ msgstr "不正确的发起端名称"
+#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
+#~ msgstr "已发现的目标列表。可启动新<b>发现</b>或<b>连接</b>到任意目标。"
-#~| msgid "Image creation failed."
-#~ msgid "Target connection failed.\n"
-#~ msgstr "目标连接失败。\n"
-
#~ msgid "Toggle Start-Up"
#~ msgstr "转换启动"
Modified: trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/iscsi-lio-server.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-05 23:57+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -85,7 +85,7 @@
msgstr "使用认证"
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
msgid "LUN"
msgstr "逻辑单元编号"
@@ -102,7 +102,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:238
#: src/include/iscsi-lio-server/dialogs.rb:326
#: src/include/iscsi-lio-server/dialogs.rb:373
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/widgets.rb:453
msgid "Add"
msgstr "添加"
@@ -118,7 +118,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:240
#: src/include/iscsi-lio-server/dialogs.rb:328
#: src/include/iscsi-lio-server/dialogs.rb:375
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/widgets.rb:454
msgid "Delete"
msgstr "删除"
@@ -149,13 +149,13 @@
#. enable/disable none/incoming/outgoing authentication
#: src/include/iscsi-lio-server/dialogs.rb:217
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "无认证"
#: src/include/iscsi-lio-server/dialogs.rb:226
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/widgets.rb:229
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "进站认证"
@@ -163,22 +163,22 @@
#. dialog to add/modify user and password
#: src/include/iscsi-lio-server/dialogs.rb:233
#: src/include/iscsi-lio-server/dialogs.rb:254
-#: src/include/iscsi-lio-server/widgets.rb:223
-#: src/include/iscsi-lio-server/widgets.rb:236
-#: src/include/iscsi-lio-server/widgets.rb:721
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
msgid "Username"
msgstr "用户名"
#: src/include/iscsi-lio-server/dialogs.rb:233
#: src/include/iscsi-lio-server/dialogs.rb:255
-#: src/include/iscsi-lio-server/widgets.rb:224
-#: src/include/iscsi-lio-server/widgets.rb:237
-#: src/include/iscsi-lio-server/widgets.rb:722
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
msgid "Password"
msgstr "密码"
#: src/include/iscsi-lio-server/dialogs.rb:249
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/widgets.rb:242
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "出站认证"
@@ -400,58 +400,38 @@
#. discovery authentication
#: src/include/iscsi-lio-server/helps.rb:119
-msgid ""
-"Select the type of authentication. Use <b>No Authentication</b> or one of "
-"<b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert "
-"<b>User</b> and <b>Password</b>."
-msgstr ""
-"选择认证类型。可使用<b>无认证</b>,或<b>进站</b>和<b>出站</b>之一 (进出站可同"
-"时选)。然后插入<b>用户</b>和<b>密码</b>。"
+msgid "Select the type of authentication. Use <b>No Authentication</b> or one of <b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert <b>User</b> and <b>Password</b>."
+msgstr "选择认证类型。可使用<b>无认证</b>,或<b>进站</b>和<b>出站</b>之一 (进出站可同时选)。然后插入<b>用户</b>和<b>密码</b>。"
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
msgid ""
-"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN "
-"imported from\n"
-" target portal group. Specify which initiator is allowed to connect (use "
-"<i>InitiatorName</i>\n"
-" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> "
-"will remove the initiator access to the LUN.</p>"
-msgstr ""
-"<p>使用<b>添加</b>来给予一个发起端 (iSCSI 客户端) 从目标门户组导入的逻辑单元编号的访问权限。"
-"请指定允许连接的发起端 (使用来自 iSCSI 发起端上的 '/etc/"
-"iscsi/initatorname.iscsi' 中的<i>发起端名称</i>)。<b>删除</b>将移除该发起端对"
-"逻辑单元编号的访问权限。</p>"
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
+msgstr "<p>使用<b>添加</b>来给予一个发起端 (iSCSI 客户端) 从目标门户组导入的逻辑单元编号的访问权限。请指定允许连接的发起端 (使用来自 iSCSI 发起端上的 '/etc/iscsi/initatorname.iscsi' 中的<i>发起端名称</i>)。<b>删除</b>将移除该发起端对逻辑单元编号的访问权限。</p>"
#: src/include/iscsi-lio-server/helps.rb:130
+#, fuzzy
+#| msgid ""
+#| "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different values for incoming and outgoing authentication.\n"
+#| " If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgid ""
-"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN "
-"target number must be unique.<br>After pressing <b>Edit Auth</b>, select the "
-"type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both "
-"together. Then insert <b>User</b> and <b>Password</b>. Please make sure to "
-"set different values for incoming and outgoing authentication.\n"
-" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</"
-"b> is disabled here.</p>"
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgstr ""
-"<p>使用<b>编辑逻辑单元编号</b>可修改逻辑单元编号映射。请注意逻辑单元编号目标"
-"数字必须唯一。<br>在按下<b>编辑认证</b>后,请选择认证类型。可使用<b>进站</b>、"
-"<b>出站</b>或两者。然后插入<b>用户</b>和<b>密码</b>。请确保进出站认证设为了"
-"不同的值。\n"
+"<p>使用<b>编辑逻辑单元编号</b>可修改逻辑单元编号映射。请注意逻辑单元编号目标数字必须唯一。<br>在按下<b>编辑认证</b>后,请选择认证类型。可使用<b>进站</b>、<b>出站</b>或两者。然后插入<b>用户</b>和<b>密码</b>。请确保进出站认证设为了不同的值。\n"
"若在之前对话框禁用了<b>使用认证</b>,那这里的<b>编辑认证</b>也是禁用的。</p>"
#: src/include/iscsi-lio-server/helps.rb:137
-msgid ""
-"<p><b>Copy</b> offers the possibility to give an additional initiator access "
-"to the LUN.</p>"
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
msgstr "<p><b>复制</b>提供了给予另一个发起端逻辑单元编号访问权限的可能。</p>"
#. target dialog
#: src/include/iscsi-lio-server/helps.rb:139
msgid ""
-"List of offered targets and target portal groups. Create a new target by "
-"clicking <b>Add</b>.\n"
-"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</"
-"b>."
+"List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
+"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</b>."
msgstr ""
"所提供的目标和目标门户组列表。点击<b>添加</b>可创建一个新目标。\n"
"要删除或修改某项,请选择它并按<b>修改</b>或<b>删除</b>。"
@@ -465,11 +445,9 @@
#: src/include/iscsi-lio-server/helps.rb:147
msgid ""
-"It is possible to make arbitary block devices or files available under a "
-"<b>LUN</b>.\n"
+"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
-"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN</"
-"b>. \n"
+"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN</b>. \n"
"The name needs to be unique within the target portal group. If the user\n"
"does not provide a name for LUN, it is generated automatically."
msgstr ""
@@ -482,13 +460,11 @@
#: src/include/iscsi-lio-server/helps.rb:154
#: src/include/iscsi-lio-server/helps.rb:173
msgid ""
-"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which "
-"address\n"
+"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
"and port the service will be available. Default for port number is 3260.\n"
"Only ip addresses assigned to one of the network cards are possible."
msgstr ""
-"<p>在<b>IP 地址</b>和<b>端口号</b>下您可以指定服务在哪个地址和端口可用。默认"
-"端口号是 3260。\n"
+"<p>在<b>IP 地址</b>和<b>端口号</b>下您可以指定服务在哪个地址和端口可用。默认端口号是 3260。\n"
"只有指定到一个网卡的 IP 地址才可以。"
#: src/include/iscsi-lio-server/helps.rb:163
@@ -497,11 +473,9 @@
#: src/include/iscsi-lio-server/helps.rb:166
msgid ""
-"It is possible to make arbitary block devices or files available under a "
-"lun.\n"
+"It is possible to make arbitary block devices or files available under a lun.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
-"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN</"
-"b>. \n"
+"The <b>LUN name</b> is an arbitrary name to uniquely identify the <b>LUN</b>. \n"
"The name needs to be unique within the target portal group. If the user\n"
"does not provide a name for LUN, it is generated automatically."
msgstr ""
@@ -512,188 +486,183 @@
"它将自动生成。"
#: src/include/iscsi-lio-server/helps.rb:180
-msgid ""
-"It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional "
-"configuration options."
+msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr "可以<b>添加</b>、<b>编辑</b>或<b>删除</b>全部额外配置选项。"
#: src/include/iscsi-lio-server/helps.rb:185
msgid ""
-"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing "
-"purposes).\n"
-"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and "
-"<b>Sectors</b> are optional."
+"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
+"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
msgstr ""
"如有需要可编辑 <b>逻辑单元编号</b>,设置<b>类型</b> (nullio 用于测试目的)。\n"
-"若类型为 fileio,则请设置磁盘设备或文件的<b>路径</b>。<b>SCSI ID</b> 和<b>扇"
-"区</b>为可选项。"
+"若类型为 fileio,则请设置磁盘设备或文件的<b>路径</b>。<b>SCSI ID</b> 和<b>扇区</b>为可选项。"
#. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
msgid "Problem changing authentication"
msgstr "修改认证出现问题"
#. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
msgid "Invalid Username"
msgstr "无效的用户名"
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
msgid "Invalid Password."
msgstr "无效的密码。"
-#: src/include/iscsi-lio-server/widgets.rb:251
+#: src/include/iscsi-lio-server/widgets.rb:262
msgid "Selected LUN is already in use!"
msgstr "所选逻辑单元编号已在使用!"
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
msgid "Selected Name is already in use!"
msgstr "所选名称 %1 已被使用!"
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected Path must be either block device or normal file!"
msgstr "所选路径必须是块设备或常规文件!"
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
msgid "Selected Path is already in use!"
msgstr "所选路径已被使用!"
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
msgid "Path:"
msgstr "路径:"
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
msgid "Browse"
msgstr "浏览"
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
msgid "Select file or device"
msgstr "选择文件或设备"
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
msgid "Initiator LUN"
msgstr "发起端逻辑单元编号"
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
msgid "Target LUN"
msgstr "目标逻辑单元编号"
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
msgid "Change:"
msgstr "修改:"
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
msgid "Target LUN %1 used more than once!"
msgstr "目标逻辑单元编号 %1 使用了不止一次!"
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
msgid "Need to enable at least one Authentification!"
msgstr "需要至少启用一个认证!"
-#: src/include/iscsi-lio-server/widgets.rb:619
+#: src/include/iscsi-lio-server/widgets.rb:630
msgid "Initiator name:"
msgstr "发起端名称:"
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
msgid "Import LUNs from TPG"
msgstr "从目标门户组导入逻辑单元编号"
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
msgid "Initiator name must not be empty!"
msgstr "发起端名称不能为空!"
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. 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:701
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
msgid "Initiator name already exists!"
msgstr "发起端名称已存在!"
#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
+#: src/include/iscsi-lio-server/widgets.rb:689
msgid "New initiator name:"
msgstr "新发起端名称:"
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
msgid "OK"
msgstr "确定"
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
msgid "Cancel"
msgstr "取消"
#. create items from targets
-#: src/include/iscsi-lio-server/widgets.rb:785
+#: src/include/iscsi-lio-server/widgets.rb:796
msgid "Enabled"
msgstr "已启用"
-#: src/include/iscsi-lio-server/widgets.rb:785
-#: src/include/iscsi-lio-server/widgets.rb:1263
-#: src/include/iscsi-lio-server/widgets.rb:1366
-#: src/include/iscsi-lio-server/widgets.rb:1403
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
msgid "Disabled"
msgstr "已禁用"
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:822
-#: src/include/iscsi-lio-server/widgets.rb:936
-#: src/include/iscsi-lio-server/widgets.rb:1290
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
msgid "Really delete the selected item?"
msgstr "真的删除所选项吗?"
-#: src/include/iscsi-lio-server/widgets.rb:1004
+#: src/include/iscsi-lio-server/widgets.rb:1015
msgid "Problem creating target %1 with tpg %2"
msgstr "使用目标门户组 %2 创建目标 %1 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1026
+#: src/include/iscsi-lio-server/widgets.rb:1037
msgid "Problem setting network portal to %1"
msgstr "设置网络门户为 %1 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1047
+#: src/include/iscsi-lio-server/widgets.rb:1058
msgid "Problem removing lun %1"
msgstr "移除逻辑单元编号 %1 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1072
+#: src/include/iscsi-lio-server/widgets.rb:1083
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr "设置逻辑单元编号 %1 (名称:%2) 到路径 %3 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1086
+#: src/include/iscsi-lio-server/widgets.rb:1097
msgid "Problem setting auth on %1:%2 to %3"
msgstr "设置 %1:%2 上的认证为 %3 时出现问题"
#. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1200
+#: src/include/iscsi-lio-server/widgets.rb:1211
msgid "The target cannot be empty."
msgstr "目标不能为空。"
-#: src/include/iscsi-lio-server/widgets.rb:1204
+#: src/include/iscsi-lio-server/widgets.rb:1215
msgid "The target portal group cannot be empty."
msgstr "目标门户组不能为空。"
-#: src/include/iscsi-lio-server/widgets.rb:1215
+#: src/include/iscsi-lio-server/widgets.rb:1226
msgid "The target already exists."
msgstr "目标已存在。"
-#: src/include/iscsi-lio-server/widgets.rb:1235
+#: src/include/iscsi-lio-server/widgets.rb:1246
msgid "Incoming"
msgstr "进站"
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1249
msgid "Outgoing"
msgstr "出站"
-#: src/include/iscsi-lio-server/widgets.rb:1240
+#: src/include/iscsi-lio-server/widgets.rb:1251
msgid "None"
msgstr "无"
-#: src/include/iscsi-lio-server/widgets.rb:1452
+#: src/include/iscsi-lio-server/widgets.rb:1463
msgid ""
"There isn't any initiator specified.\n"
"To allow an initiator login to the target, please\n"
@@ -706,23 +675,23 @@
"(可参考发起端上的 /etc/iscsi/initiatorname.iscsi)。\n"
"真的想要继续而不指定可访问发起端吗?"
-#: src/include/iscsi-lio-server/widgets.rb:1466
+#: src/include/iscsi-lio-server/widgets.rb:1477
msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr "在 %1:%2 中为发起端 %3 移除逻辑单元编号 %4 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1481
+#: src/include/iscsi-lio-server/widgets.rb:1492
msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr "在 %1:%2 中为发起端 %3 添加逻辑单元编号 %4:%5 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1502
+#: src/include/iscsi-lio-server/widgets.rb:1513
msgid "Problem removing initiator %3 from %1:%2"
msgstr "从 %1:%2 中移除发起端 %3 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1526
+#: src/include/iscsi-lio-server/widgets.rb:1537
msgid "Problem creating initiator %3 for %1:%2"
msgstr "为 %1:%2 创建发起端 %3 时出现问题"
-#: src/include/iscsi-lio-server/widgets.rb:1561
+#: src/include/iscsi-lio-server/widgets.rb:1572
msgid "Problem changing auth for initiator %3 in %1:%2"
msgstr "在 %1:%2 中为发起端 %3 修改认证时出现问题"
Modified: trunk/yast/zh_CN/po/kdump.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/kdump.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/kdump.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-05 16:54+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -52,25 +52,17 @@
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:117
-msgid ""
-"The naming scheme is:/boot/vmlinu[zx]-<kernel_string>[.gz] Please enter only "
-"\"kernel_string\"."
-msgstr ""
-"命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 请只输入 \"kernel_string"
-"\"。"
+msgid "The naming scheme is:/boot/vmlinu[zx]-<kernel_string>[.gz] Please enter only \"kernel_string\"."
+msgstr "命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 请只输入 \"kernel_string\"。"
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:128
-msgid ""
-"The kdump commandline is the command line that needs to be passed off to the "
-"kdump kernel."
+msgid "The kdump commandline is the command line that needs to be passed off to the kdump kernel."
msgstr "kdump 命令行是需要被传送到 kdump 内核的命令行。"
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:139
-msgid ""
-"Set this variable if you only want to _append_ values to the default command "
-"line string."
+msgid "Set this variable if you only want to _append_ values to the default command line string."
msgstr "如果您想要附加值到默认命令行字符串,请设定此变量。"
#. TRANSLATORS: CommandLine help
@@ -100,9 +92,7 @@
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:190
-msgid ""
-"SMTP password for sending notification messages. Path of file which includes "
-"password (plain text file)."
+msgid "SMTP password for sending notification messages. Path of file which includes password (plain text file)."
msgstr "发送通知消息的 SMTP 密码。密码文件 (普通文本文件) 的路径。"
#. TRANSLATORS: CommandLine help
@@ -147,9 +137,7 @@
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:255
-msgid ""
-"Dump target includes type of target from: file (local filesystem), ftp, ssh, "
-"sftp, nfs, cifs"
+msgid "Dump target includes type of target from: file (local filesystem), ftp, ssh, sftp, nfs, cifs"
msgstr "转储标的包括下列标的类型:文件(本地文件系统), ftp, ssh, sftp, nfs, cifs"
#. TRANSLATORS: CommandLine help
@@ -189,12 +177,8 @@
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:303
-msgid ""
-"The naming scheme is: /boot/vmlinu[zx]-<kernel_string>[.gz] kernel means "
-"only \"kernel_string\"."
-msgstr ""
-"命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 内核只意味着 "
-"\"kernel_string\"。"
+msgid "The naming scheme is: /boot/vmlinu[zx]-<kernel_string>[.gz] kernel means only \"kernel_string\"."
+msgstr "命名方式是:/boot/vmlinu[zx]-<kernel_string>[.gz] 内核只意味着 \"kernel_string\"。"
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:310
@@ -203,9 +187,7 @@
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:317
-msgid ""
-"Option means runlevel to boot the kdump kernel. Only values such as 1,2,3,5 "
-"or s are allowed"
+msgid "Option means runlevel to boot the kdump kernel. Only values such as 1,2,3,5 or s are allowed"
msgstr "选项意味着引导 kdump 内核的运行级别。只允许如 1,2,3,5 这样的数值或 s"
#. TRANSLATORS: CommandLine help
@@ -386,7 +368,7 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:496
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
msgid "To apply changes a reboot is necessary."
msgstr "需要重启来应用变更。"
@@ -433,8 +415,7 @@
#. TRANSLATORS: CommandLine printed text help
#: src/clients/kdump.rb:813
-msgid ""
-"Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
+msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
msgstr "选项只能包括 \"none\"、\"ELF\"、\"compressed\" 或 \"lzo\" 值。"
#. TRANSLATORS: CommandLine error message
@@ -757,8 +738,7 @@
#: src/include/kdump/helps.rb:36
msgid ""
"<p><b>Enable/Disable Kdump</b><br>\n"
-" Enable or disable kdump. The boot option crashkernel parameter is added/"
-"removed. \n"
+" Enable or disable kdump. The boot option crashkernel parameter is added/removed. \n"
" To apply changes, a reboot is necessary.<br></p>\n"
msgstr ""
"<p><b>启用/禁用 Kdump</b><br>\n"
@@ -779,17 +759,10 @@
#: src/include/kdump/helps.rb:46
msgid ""
"<p><b>Firmware-Assisted Dump</b><br>\n"
-" Dumps are not generated before the partition is reinitialized but take "
-"place when the partition is restarting. When performing a firmware-"
-"assisted dump, system memory is frozen and the partition rebooted, which "
-"allows a new instance of the operating system to dump data from the "
-"previous kernel crash. This feature is suitable only when the system has "
-"more than 1.5 GB of memory.</p>"
+" Dumps are not generated before the partition is reinitialized but take place when the partition is restarting. When performing a firmware-assisted dump, system memory is frozen and the partition rebooted, which allows a new instance of the operating system to dump data from the previous kernel crash. This feature is suitable only when the system has more than 1.5 GB of memory.</p>"
msgstr ""
"<p><b>固件辅助转储</b><br>\n"
-" 转储在分区重新初始化前不会生成,而是在分区重启时生成。当执行固件辅助转储"
-"时,将冻结系统内存并重启分区,这将允许以一个新操作系统实例来从之前崩溃的内核"
-"中转储数据。此功能只适合于有多于 1.5 GB 内存的系统。</p>"
+" 转储在分区重新初始化前不会生成,而是在分区重启时生成。当执行固件辅助转储时,将冻结系统内存并重启分区,这将允许以一个新操作系统实例来从之前崩溃的内核中转储数据。此功能只适合于有多于 1.5 GB 内存的系统。</p>"
#. Kdump Memor&y [MB] - IntField 1/1
#: src/include/kdump/helps.rb:57
@@ -810,10 +783,8 @@
"<p><b>Dump Format</b><br>\n"
" <i>No Dump</i> - Only save the kernel log.<br>\n"
" <i>ELF Format</i> - Create dump file in the ELF format.<br>\n"
-" <i>Compressed Format</i> - Compress dump data by each page with gzip."
-"<br>\n"
-" <i>LZO Compressed Format</i> - Slightly bigger files but much faster."
-"<br>\n"
+" <i>Compressed Format</i> - Compress dump data by each page with gzip.<br>\n"
+" <i>LZO Compressed Format</i> - Slightly bigger files but much faster.<br>\n"
"</p>"
msgstr ""
"<p><b>转储格式</b></br>\n"
@@ -827,8 +798,7 @@
#: src/include/kdump/helps.rb:72
msgid ""
"<p><b>Saving Target for Kdump Image</b><br>\n"
-" The target for saving kdump images. Select type of target for saving "
-"dumps.<br></p>"
+" The target for saving kdump images. Select type of target for saving dumps.<br></p>"
msgstr ""
"<p><b>Kdump 映像的保存标的</b><br>\n"
" 保存 Kdump 映像的标的。选择保存转储的标的类型。<br></p>"
@@ -838,13 +808,11 @@
msgid ""
"<p><b>Local Filestem</b> - Save kdump image in the local filesystem.\n"
" <i>Directory for Saving Dumps</i> - The path for saving kdump images.\n"
-" Selecting directory for saving kdump images via dialog by pressing "
-"<i>Browse</i>\n"
+" Selecting directory for saving kdump images via dialog by pressing <i>Browse</i>\n"
" <br></p>"
msgstr ""
"<p><b>本地文件系统</b> - 保存 kdump 映像到本地文件系统。\n"
-" <i>保存转储的目录</i> - 保存 kdump 映像的路径。n 通过按浏览选择对话框"
-"中的文件夹作为保存 kdump 映像的位置。</i>\n"
+" <i>保存转储的目录</i> - 保存 kdump 映像的路径。n 通过按浏览选择对话框中的文件夹作为保存 kdump 映像的位置。</i>\n"
" <br></p>"
#. Dump Format - RadioButtons 3/7
@@ -855,8 +823,7 @@
" <i>Port</i> - The port number for connection.\n"
" <i>Directory on Server</i> - The path for saving kdump images.\n"
" <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>"
+" <i>User Name</i> for ftp connection. <i>Password</i> for ftp connection.<br></p>"
msgstr ""
"<p><b>FTP</b> - 通过 FTP 保存 kdump 映像。\n"
" <i>服务器名</i> - FTP 服务器的名称。\n"
@@ -980,12 +947,10 @@
msgid ""
"<p><b>Enable Delete Old Dump Images</b> - \n"
" Enable Delete Old Dump Images. If the number of dump files in \n"
-" <i>Number of Old Dumps</i> exceeds this number, older dumps are removed."
-"<br></p>"
+" <i>Number of Old Dumps</i> exceeds this number, older dumps are removed.<br></p>"
msgstr ""
"<p><b>启用删除旧转储映像</b> - \n"
-" 启用删除旧转储映像。如果转储文件数目超出了 <i>旧转储数目</i> 指定的数字,"
-"将删除旧转储映像。<br></p>"
+" 启用删除旧转储映像。如果转储文件数目超出了 <i>旧转储数目</i> 指定的数字,将删除旧转储映像。<br></p>"
#. Enable Copy Ke&rnel into the Dump Directory - CheckBox 1/1
#: src/include/kdump/helps.rb:157
@@ -997,63 +962,45 @@
" everything in place for debugging.<br></p>\n"
msgstr ""
"<p><b>启用复制内核到转储目录</b> - \n"
-" 如果选中了此选项,内核和调试信息 (若安装) 将复制到转储目录。默认为 \"关"
-"\"。备份所有文件有助于调试。<br></p>\n"
+" 如果选中了此选项,内核和调试信息 (若安装) 将复制到转储目录。默认为 \"关\"。备份所有文件有助于调试。<br></p>\n"
#. SMTP Server
#: src/include/kdump/helps.rb:165
-msgid ""
-"<p><b>SMTP Server</b> used for sending a notification email after a dump.</p>"
+msgid "<p><b>SMTP Server</b> used for sending a notification email after a dump.</p>"
msgstr "<p><b>SMTP 服务器</b>用来在转储后发送通知邮件。</p>"
#. SMTP User Name
#: 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 ""
-"<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>用户名</b>。可选。如果您不指定"
-"用户名和密码,将使用普通 SMTP。</p>\n"
+" set. This is optional. If you do not specifiy a username and password, plain SMTP will be used.</p>\n"
+msgstr "<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>用户名</b>。可选。如果您不指定用户名和密码,将使用普通 SMTP。</p>\n"
#. SMTP Password
#: 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 ""
-"<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>密码</b>。可选。如果您不指定用"
-"户名和密码,将使用普通 SMTP。</p>\n"
+"<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 "<p>当设置了 <i>SMTP 服务器</i>后的 SMTP 验证<b>密码</b>。可选。如果您不指定用户名和密码,将使用普通 SMTP。</p>\n"
#. Notification To (email addresses)
#: 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"
+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 "<p><b>通知接收对象</b>指定了当转储保存后发送通知邮件的电子邮件地址。</p>\n"
#. Notification CC (email addresses)
#: 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 ""
-"<p><b>通知抄送对象</b>指定了当转储保存后,通过抄送方式发送通知电子邮件的以空"
-"格分割的电子邮件地址列表。</p>\n"
+"<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 "<p><b>通知抄送对象</b>指定了当转储保存后,通过抄送方式发送通知电子邮件的以空格分割的电子邮件地址列表。</p>\n"
#. Number of Old Dumps (number)
#: src/include/kdump/helps.rb:185
msgid ""
-"<p><b>Number of Old Dumps</b> specifies how many old dumps are kept. If the "
-"number of dump files \n"
+"<p><b>Number of Old Dumps</b> specifies how many old dumps are kept. If the number of dump files \n"
"exceeds this number, older dumps are removed.</p>"
-msgstr ""
-"<p><b>旧转储数目</b>指定了保存多少旧转储文件。如果转储文件数目超过了该数字,"
-"旧转储文件将被删除。</p>"
+msgstr "<p><b>旧转储数目</b>指定了保存多少旧转储文件。如果转储文件数目超过了该数字,旧转储文件将被删除。</p>"
#. Read dialog help 1/2
#: src/include/kdump/helps.rb:189
@@ -1281,131 +1228,129 @@
"细节请参考 %{log}。"
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:506
+#: src/modules/Kdump.rb:511
msgid "Initializing kdump Configuration"
msgstr "初始化 kdump 配置"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
msgid "Reading the config file..."
msgstr "正在读取配置文件..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:517
+#: src/modules/Kdump.rb:522
msgid "Reading kernel boot options..."
msgstr "正在读取内核引导选项..."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:519
+#: src/modules/Kdump.rb:524
msgid "Calculating memory limits..."
msgstr "正在计算内存限制..."
#. Progress step 2/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:530
msgid "Reading partitions of disks..."
msgstr "正在读取磁盘分区..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:532
msgid "Reading available memory and calibrating usage..."
msgstr "正在读取可用内存并校准用量..."
#. Error message
-#: src/modules/Kdump.rb:539
+#: src/modules/Kdump.rb:544
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "无法读取配置文件 /etc/sysconfig/kdump"
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:552
msgid "Cannot read kernel boot options."
msgstr "无法读取内核引导选项。"
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:560
msgid "Cannot read available memory."
msgstr "无法读取可用内存。"
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:581
+#: src/modules/Kdump.rb:586
msgid "Saving kdump Configuration"
msgstr "保存 kdump 配置"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:610
+#: src/modules/Kdump.rb:615
msgid "Write the settings"
msgstr "写入设置"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:617
msgid "Update boot options"
msgstr "更新引导选项"
#. Progress step 1/2
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:621
msgid "Writing the settings..."
msgstr "正在写入设置..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:623
msgid "Updating boot options..."
msgstr "正在更新引导选项..."
#. Progress finished
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:625
msgid "Finished"
msgstr "已完成"
#. Error message
-#: src/modules/Kdump.rb:630
+#: src/modules/Kdump.rb:635
msgid "Cannot write settings."
msgstr "无法写入设置。"
#. Error message
-#: src/modules/Kdump.rb:639
+#: src/modules/Kdump.rb:644
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "添加 crashkernel 参数到引导加载器失败。"
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:750
+#: src/modules/Kdump.rb:764
msgid "Kdump status: %1"
msgstr "Kdump 状态:%1"
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:765
msgid "enabled"
msgstr "已启用"
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:765
msgid "disabled"
msgstr "已禁用"
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:772
msgid "Value(s) of crashkernel option: %1"
msgstr "crashkernel 选项的值:%1"
-#: src/modules/Kdump.rb:765
+#: src/modules/Kdump.rb:779
msgid "Dump format: %1"
msgstr "转储格式:%1"
-#: src/modules/Kdump.rb:772
+#: src/modules/Kdump.rb:786
msgid "Target of dumps: %1"
msgstr "转储标的:%1"
-#: src/modules/Kdump.rb:779
+#: src/modules/Kdump.rb:793
msgid "Number of dumps: %1"
msgstr "转储数目:%1"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:871
-msgid ""
-"Warning! There might not be enough free space. %{required} required, but "
-"only %{available} are available."
+#: src/modules/Kdump.rb:885
+msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
msgstr "警告!可能没有足够的剩余空间。需要 %{required},但只有 %{available} 可用。"
#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:958
+#: src/modules/Kdump.rb:972
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/zh_CN/po/mail.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/mail.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/mail.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-10-30 17:33+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <kde-i18n-doc(a)kde.org>\n"
@@ -308,69 +308,76 @@
#. Translators: dialog caption
#. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
msgid "Outgoing Mail"
msgstr "外发的邮件"
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+#, fuzzy
+#| msgid "You cannot define local domains for the mail server."
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr "您不能为该邮件服务器定义本地域。"
+
#. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
msgid "TLS encryption"
msgstr "TLS 加密"
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
msgid "No"
msgstr "否"
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
msgid "Use"
msgstr "使用"
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
msgid "Enforce"
msgstr "强制"
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
msgid "&Masquerading"
msgstr "掩蔽(&M)"
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
msgid "&Authentication"
msgstr "身份验证(&A)"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
msgid "Incoming Mail"
msgstr "进来的邮件"
#. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
msgid "&Details..."
msgstr "细节(&D)..."
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
msgid "Start &fetchmail"
msgstr "启动 &fetchmail"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
msgid "manual"
msgstr "手动"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
msgid "daemon"
msgstr "守护进程"
#. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
msgid "&Downloading"
msgstr "下载(&D)"
#. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
msgid "&Aliases..."
msgstr "别名(&A)..."
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
msgid "&Virtual domains..."
msgstr "虚拟域(&V)..."
@@ -378,7 +385,7 @@
#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
#. %2: file name (eg. /etc/sysconfig/postfix)
#. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
msgid ""
"To be able to deliver mail to your local MTA,\n"
"the value of %1 in %2 will be set to\n"
@@ -392,7 +399,7 @@
#. correct and complete. The login name may contain only
#. certain characters and must begin with a letter.
#. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
msgid ""
"The user login may contain only\n"
"lower case letters, digits, \"-\" and \"_\"\n"
@@ -405,39 +412,39 @@
"请重试。\n"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
msgid "Sender address rewriting"
msgstr "寄件人地址重写"
#. Translators: text entry label
#. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
#: src/include/mail/widgets.rb:269
msgid "&Local user"
msgstr "本地用户(&L)"
#. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
msgid "&Display as"
msgstr "显示为(&D)"
#. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
msgid "The address for this user is already defined."
msgstr "已定义此用户的地址。"
#. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
msgid "The mail address format is incorrect."
msgstr "邮件地址格式不正确。"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
msgid "Masquerading"
msgstr "掩蔽(Masquerading)"
#. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
msgid "Masquerade &local domains"
msgstr "掩蔽本地域(&L)"
@@ -447,23 +454,23 @@
#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
#. ),
#. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
msgid "Ma&squerade other domains"
msgstr "掩蔽其它域(&S)"
#. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
msgid "Do&mains to masquerade"
msgstr "要掩蔽的域(&M)"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
msgid "Local user"
msgstr "本地用户"
#. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
msgid "Display as"
msgstr "显示为"
@@ -472,23 +479,23 @@
#. ["holly", "jane", "tarzan"])),
#. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly(a)red.dwarf"))
#. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
msgid "A&dd"
msgstr "添加(&D)"
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
msgid "&Edit"
msgstr "编辑(&E)"
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
msgid "Dele&te"
msgstr "删除(&T)"
#. Translators: error popup
#. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
msgid "The domain name is incorrect"
msgstr "域名不正确"
@@ -496,106 +503,106 @@
#. list<string> lmod = [];
#. list<map> mu = Mail::masquerade_users;
#. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
msgid "Outgoing Server Authentication"
msgstr "外发服务器身份验证"
#. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
msgid "Outgoing &Server"
msgstr "外发服务器(&S)"
#. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
msgid "&User name"
msgstr "用户名(&U)"
#. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
msgid "&Password"
msgstr "密码(&P)"
#. Translators: popup dialog heading
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
msgid "Mail downloading"
msgstr "邮件下载"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
msgid "Server"
msgstr "服务器"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
msgid "Protocol"
msgstr "协议"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
msgid "User"
msgstr "用户"
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
msgid "De&lete"
msgstr "删除(&L)"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
msgid "Incoming mail redirection"
msgstr "进来的邮件重定向"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
msgid "&Alias"
msgstr "别名(&A)"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
msgid "&Destinations"
msgstr "目标(&D)"
#. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
msgid "The alias format is incorrect."
msgstr "别名格式不正确。"
#. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
msgid "The destinations for this alias are already defined."
msgstr "已定义此别名的目标。"
#. Translators: dialog caption
#. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
msgid "Aliases"
msgstr "别名"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
msgid "Alias"
msgstr "别名"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
msgid "Destinations"
msgstr "目标"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
msgid "Virtual domains"
msgstr "虚拟域"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
msgid "Mail configuration"
msgstr "邮件配置"
#. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
msgid "Initializing..."
msgstr "正在初始化..."
@@ -870,12 +877,12 @@
msgstr "到 IMAP 服务器"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr "将安装 AMaViS,它是一种病毒扫描程序。\n"
#. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
msgid ""
"AMaViS needs a virus scanner such as ClamAV\n"
"to do the actual scanning, but ClamAV was not found.\n"
@@ -885,56 +892,56 @@
"请手动配置一个扫描程序。"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr "将安装 Fetchmail,它是一种邮件下载工具。\n"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
msgid "Dovecot IMAP server, will be installed.\n"
msgstr "将安装 Dovecot IMAP 服务器。\n"
#. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
msgid "Initializing mail configuration"
msgstr "正在初始化邮件配置"
#. Translators: progress label
#. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
msgid "Determining Mail Transport Agent (MTA)"
msgstr "正在确定邮件传输代理 (MTA)"
#. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
msgid "Reading general settings"
msgstr "正在读取一般设置"
#. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
msgid "Reading masquerading settings"
msgstr "正在读取掩蔽设置"
#. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
msgid "Reading downloading settings"
msgstr "正在读取下载设置"
#. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
msgid "Reading alias tables"
msgstr "正在读取别名表"
#. Translators: progress label
#. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
msgid "Reading authentication settings..."
msgstr "正在读取身份验证设置..."
#. Translators: error message,
#. %1 is a file name,
#. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
msgid ""
"Error reading file %1. The file must have\n"
"a fixed format to be readable by YaST. For details, see\n"
@@ -945,161 +952,161 @@
"%2"
#. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
msgid "Error writing the fetchmail configuration."
msgstr "写入 fetchmail 配置时出错。"
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
msgid "Error writing file %1"
msgstr "写入文件 %1 时出错"
#. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
msgid "Error running config.postfix"
msgstr "运行 config.postfix 时出错"
#. Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
msgid "Error starting service %1."
msgstr "启动服务 %1 时出错。"
#. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
msgid "Writing general settings"
msgstr "正在写入一般设置"
#. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
msgid "Writing masquerading settings"
msgstr "正在写入掩蔽设置"
#. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
msgid "Writing alias tables"
msgstr "正在写入别名表"
#. Write them unconditionally, because it is now possible to
#. enter them also in the Permanent mode. Bug #17417.
#. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
msgid "Writing downloading settings"
msgstr "正在写入下载设置"
#. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
msgid "Writing authentication settings..."
msgstr "正在写入身份验证设置..."
#. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
msgid "Finishing writing configuration files"
msgstr "正在完成写入配置文件"
#. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
msgid "Running Config Postfix"
msgstr "正在运行 Postfix 配置"
#. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
msgid "Restarting services"
msgstr "正在重启动服务"
#. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
msgid "Saving mail configuration"
msgstr "正在保存邮件配置"
#. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
msgid "Other"
msgstr "其它"
#. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
msgid "Permanent"
msgstr "永久"
#. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
msgid "Dial-up"
msgstr "拨号"
#. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
msgid "None"
msgstr "无"
#. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
msgid "MTA"
msgstr "邮件传输代理"
#. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
msgid "Connection Type"
msgstr "连接类型"
#. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
msgid "Outgoing Mail Server"
msgstr "外发邮件服务器"
#. summary header; the "From: foo(a)bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
msgid "From Header"
msgstr "寄件人标头"
#. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
msgid "Local Domains"
msgstr "本地域"
#. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
msgid "Masquerade Other Domains"
msgstr "掩蔽其它域"
#. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
msgid "Masquerade Users"
msgstr "掩蔽用户"
#. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
msgid "Accept remote SMTP connections"
msgstr "接受远程 SMTP 连接"
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
msgid "Yes"
msgstr "是"
#. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
msgid "Use AMaViS"
msgstr "使用 AMaViS"
#. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
msgid "Use DKIM"
msgstr "使用 DKIM"
#. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
msgid "Fetchmail"
msgstr "Fetchmail"
#. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
msgid "Virtual Users"
msgstr "虚拟用户"
#. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
msgid "Authentication"
msgstr "身份验证"
@@ -1572,9 +1579,6 @@
#~ "密码不匹配。\n"
#~ "请重试。"
-#~ msgid "You cannot define local domains for the mail server."
-#~ msgstr "您不能为该邮件服务器定义本地域。"
-
#~ msgid "Defined Domains"
#~ msgstr "定义的域"
Modified: trunk/yast/zh_CN/po/network.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/network.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/network.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-03-02 22:27+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -128,10 +128,8 @@
#: src/clients/firewall_stage1_proposal.rb:195
msgid ""
"<p><b><big>Firewall and SSH</big></b><br>\n"
-"Firewall is a defensive mechanism that protects your computer from network "
-"attacks.\n"
-"SSH is a service that allows logging into this computer remotely via "
-"dedicated\n"
+"Firewall is a defensive mechanism that protects your computer from network attacks.\n"
+"SSH is a service that allows logging into this computer remotely via dedicated\n"
"SSH client</p>"
msgstr ""
"<p><b><big>防火墙和 SSH</big></b><br />\n"
@@ -140,21 +138,17 @@
#: src/clients/firewall_stage1_proposal.rb:201
msgid ""
-"<p>Here you can choose whether the firewall will be enabled or disabled "
-"after\n"
+"<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 "<p>在此您可以选择在安装后启用或禁用防火墙。推荐保持启用。</p>"
#: 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"
+"<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"
"will be started on computer boot).</p>"
msgstr ""
-"<p>若启用了防火墙,您可以决定是否为 SSH 服务打开防火墙端口并允许远程 SSH 登"
-"入。\n"
+"<p>若启用了防火墙,您可以决定是否为 SSH 服务打开防火墙端口并允许远程 SSH 登入。\n"
"另外您也可以决定是否启用 SSH 服务(即,它将在计算机引导时启动)。</p>"
#. TRANSLATORS: help text
@@ -339,13 +333,13 @@
msgstr "安装下载好的版本资讯失败。"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
msgid "Opening of Connection"
msgstr "打开连接"
#. popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
@@ -354,22 +348,19 @@
"细节请查看日志。\n"
#. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
-msgid ""
-"No URL for the release notes defined. Internet test cannot be performed."
+#: src/clients/inst_do_net_test.rb:870
+msgid "No URL for the release notes defined. Internet test cannot be performed."
msgstr "未定义版本资讯的 URL。无法执行互联网测试。"
#. popup informing user about the failure to retrieve release notes
#. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
msgid ""
"Download of latest release notes failed due to server-side error. \n"
"This does not necessarily imply a faulty network configuration.\n"
"\n"
-"Click 'Continue' to proceed to the next installation step. To skip any "
-"steps\n"
-"requiring an internet connection or to get back to your network "
-"configuration,\n"
+"Click 'Continue' to proceed to the next installation step. To skip any steps\n"
+"requiring an internet connection or to get back to your network configuration,\n"
"click 'Cancel'.\n"
msgstr ""
"由于服务器端错误,下载最新的版本资讯失败。\n"
@@ -380,7 +371,7 @@
"请点击 '取消'。\n"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
msgid ""
"Download of latest release notes failed. View\n"
"the logs for details."
@@ -389,12 +380,12 @@
"细节请查看日志。"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
msgid "Check for Patches"
msgstr "检查补丁"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
@@ -403,7 +394,7 @@
"细节请查看日志。\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
msgid "Closing of Connection"
msgstr "关闭连接"
@@ -578,7 +569,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
msgid "Routing Configuration"
msgstr "路由配置"
@@ -664,7 +655,7 @@
msgstr "网关"
#. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
msgid "Netmask"
msgstr "网络掩码"
@@ -682,78 +673,76 @@
#. Handler for action "list"
#. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
msgid "No entry for destination '%1' in routing table"
msgstr "路由表中无目的地 '%1' 项"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
msgid "%s forwarding is enabled"
msgstr "已启用 %s 转发"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
msgid "%s forwarding is disabled"
msgstr "已禁用 %s 转发"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
msgid "Enabling %s forwarding..."
msgstr "正在启用 %s 转发..."
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
msgid "Disabling %s forwarding..."
msgstr "正在禁用 %s 转发..."
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
msgid "IPv4 Forwarding:"
msgstr "IPv4 转发:"
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
msgid "IPv6 Forwarding:"
msgstr "IPv6 转发:"
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
msgid "IPv4 and IPv6 Forwarding:"
msgstr "IPv4 和 IPv6 转发:"
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
msgid "At least destination and gateway IP addresses must be specified."
msgstr "必须至少指定目的地和网关 IP 地址。"
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
msgid "Adding '%1' destination to routing table ..."
msgstr "正在将目的地 '%1' 添加到路由表中..."
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
msgid "Destination IP address must be specified."
msgstr "必须指定目的地 IP 地址。"
-#: src/clients/routing.rb:348
-msgid ""
-"At least one of the following parameters (gateway, netmask, device, options) "
-"must be specified"
+#: src/clients/routing.rb:349
+msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
msgstr "必须指定至少一个以下参数 (网关、网络掩码、设备、选项)"
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
msgid "Updating '%1' destination in routing table ..."
msgstr "正在更新路由表中的目的地 '%1'..."
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
msgid "Deleting '%1' destination from routing table ..."
msgstr "正在从路由表中删除目的地 '%1'..."
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
msgid "Warning: no encryption is used."
msgstr "警告:未使用加密。"
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
msgid "Change."
msgstr "修改。"
@@ -854,70 +843,70 @@
msgstr "USB 无线网卡"
#. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
msgid "Unknown Network Device"
msgstr "未知网络设备"
#. Modem status (%1 is device)
#. ISDN device status (%1 is device)
#. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
msgid "Configured as %1"
msgstr "已配置为 %1"
#. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
msgid "Configured as %1 with provider %2"
msgstr "已配置为 %1,服务提供商 %2"
#. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
msgid "Configured as %1 with provider %2 (protocol %3)"
msgstr "已配置为%1,服务提供商 %2 (协议 %3)"
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
msgid "Configured without address (NONE)"
msgstr "已配置为不带地址 (NONE)"
#. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
msgid "Configured without an address"
msgstr "已配置为不带地址"
#. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
msgid "Configured with address %1"
msgstr "已配置为地址 %1"
#. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
msgid "Configured with address %1 (remote %2)"
msgstr "已配置为地址 %1 (远程 %2)"
#. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
msgid "Configured with %1"
msgstr "已配置为 %1"
#. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
msgid "Configured as %1 with address %2"
msgstr "已配置为 %1,地址 %2"
#. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
msgid "Configured as %1 with address %2 (remote %3)"
msgstr "已配置为 %1,地址 %2 (远程 %3)"
#. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
msgid "Configured as %1 with %2"
msgstr "已配置为 %1, %2"
#. Abbreviation for "The interface is Managed by NetworkManager"
#. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
msgid "Managed"
msgstr "受管"
@@ -1044,18 +1033,18 @@
msgstr "选择日志(&S):"
#. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
msgid "Additional Addresses"
msgstr "附加地址"
#. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
msgid "IPv4 Address Label"
msgstr "IPv4 地址标签"
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "IP 地址"
@@ -1063,7 +1052,7 @@
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:106
+#: src/include/network/lan/address.rb:108
#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
@@ -1073,7 +1062,7 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:108
+#: src/include/network/lan/address.rb:110
#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
@@ -1084,156 +1073,156 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:110
+#: src/include/network/lan/address.rb:112
#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
msgstr "删除(&L)"
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
msgid "&Name of Interface"
msgstr "接口名称(&N)"
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
msgid "<p>TODO kind of vague!</p>"
msgstr "<p>要执行的操作不明确!</p>"
#. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
msgid "Assign Interface to Firewall &Zone"
msgstr "将接口指派到防火墙区域(&Z)"
#. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
msgid "&Mandatory Interface"
msgstr "必备接口(&M)"
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
#: src/include/network/lan/hardware.rb:351
msgid "&Device Type"
msgstr "设备类型(&D)"
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
#: src/include/network/lan/hardware.rb:337
msgid "&Configuration Name"
msgstr "配置名称(&C)"
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
msgid "Tunnel owner"
msgstr "隧道所有者"
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
msgid "Tunnel group"
msgstr "隧道组"
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1315
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
msgid "Bridged Devices"
msgstr "桥接设备"
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
msgid "Real Interface for &VLAN"
msgstr "虚拟局域网的真实接口(&V)"
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
msgid "VLAN ID"
msgstr "虚拟局域网 ID"
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
msgid "Bond Slaves and Order"
msgstr "绑定从属和顺序"
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
msgid "Up"
msgstr "向上"
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
msgid "Down"
msgstr "向下"
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
msgid "Bond &Slaves"
msgstr "绑定从属(&S)"
#. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
msgid "&Bond Driver Options"
msgstr "绑定驱动选项(&B)"
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr "<p>选择绑定驱动选项并在需要时加以编辑。</p>"
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:816
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr "无链接和 IP 设置 (绑定从属)"
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
msgid "Use iBFT Values"
msgstr "使用 iBFT 值"
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
msgid "Dynamic Address"
msgstr "动态地址"
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
msgid "DHCP both version 4 and 6"
msgstr "DHCP 版本 4 和 6"
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
msgid "DHCP version 4 only"
msgstr "仅 DHCP 版本 4"
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
msgid "DHCP version 6 only"
msgstr "仅 DHCP 版本 6"
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
msgid "Statically Assigned IP Address"
msgstr "静态指派的 IP 地址"
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:334
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
msgid "&IP Address"
msgstr "&IP 地址"
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
msgid "&Subnet Mask"
msgstr "子网掩码(&S)"
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
msgid "&Hostname"
msgstr "主机名(&H)"
#. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
msgid "R&emote IP Address"
msgstr "远程 IP 地址(&E)"
#. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
msgid "The remote IP address is invalid."
msgstr "远程 IP 地址无效。"
#. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
msgid "&S/390"
msgstr "&S/390"
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1036
+#: src/include/network/lan/address.rb:1030
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1243,13 +1232,13 @@
"这只有在您知道检测有误时才有意义。"
#. Popup text
-#: src/include/network/lan/address.rb:1056
+#: src/include/network/lan/address.rb:1050
msgid "Configuration %1 already present."
msgstr "配置 %1 已存在。"
#. 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:1080
+#: src/include/network/lan/address.rb:1074
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1263,20 +1252,20 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1100
+#: src/include/network/lan/address.rb:1094
msgid "No valid IP address."
msgstr "无效的 IP 地址。"
-#: src/include/network/lan/address.rb:1107
+#: src/include/network/lan/address.rb:1101
msgid "No valid netmask or prefix length."
msgstr "无效的网络掩码或前缀长度。"
-#: src/include/network/lan/address.rb:1115
+#: src/include/network/lan/address.rb:1109
msgid "Invalid hostname."
msgstr "无效的主机名。"
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1123
+#: src/include/network/lan/address.rb:1116
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1290,7 +1279,7 @@
"真的要把主机名留空吗?\n"
#. Popup text
-#: src/include/network/lan/address.rb:1142
+#: src/include/network/lan/address.rb:1134
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1300,82 +1289,88 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1195
+#: src/include/network/lan/address.rb:1187
msgid "&General"
msgstr "常规(&G)"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1206
+#: src/include/network/lan/address.rb:1198
msgid "Device Activation"
msgstr "设备激活"
-#: src/include/network/lan/address.rb:1210
+#: src/include/network/lan/address.rb:1202
msgid "Firewall Zone"
msgstr "防火墙区域"
-#: src/include/network/lan/address.rb:1215
+#: src/include/network/lan/address.rb:1207
msgid "Maximum Transfer Unit (MTU)"
msgstr "最大传输单元 (MTU)"
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1225
+#: src/include/network/lan/address.rb:1217
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>在此配置详细网卡设置。</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1284
msgid "&Address"
msgstr "地址(&A)"
#. Address tab help
-#: src/include/network/lan/address.rb:1295
+#: src/include/network/lan/address.rb:1287
msgid "<p>Configure your IP address.</p>"
msgstr "<p>配置您的 IP 地址。</p>"
-#: src/include/network/lan/address.rb:1301
+#: src/include/network/lan/address.rb:1293
msgid "&Hardware"
msgstr "硬件(&H)"
-#: src/include/network/lan/address.rb:1308
+#: src/include/network/lan/address.rb:1300
msgid "&Bond Slaves"
msgstr "绑定从属(&B)"
-#: src/include/network/lan/address.rb:1322
+#: src/include/network/lan/address.rb:1314
msgid "&Wireless"
msgstr "无线(&W)"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1406
+#: src/include/network/lan/address.rb:1398
msgid "Ifplugd Priority"
msgstr "Ifplugd 优先级"
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1412
+#: src/include/network/lan/address.rb:1404
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"
-" used mutually exclusive. If more then one of these interfaces is <b>On "
-"Cable Connection</b>\n"
-" then we need a way to decide which interface to take up. Therefore we have "
-"to\n"
+"<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n"
+" used mutually exclusive. If more then one of these interfaces is <b>On Cable Connection</b>\n"
+" then we need a way to decide which interface to take up. Therefore we have to\n"
" set the priority of each interface. </p>\n"
msgstr ""
"<p><b><big>IFPLUGD 优先级</big></b></p>\n"
-"<p>全部配置为<b>在网线连接时</b>和 IFPLUGD_PRIORITY != 0 的接口都将是互斥"
-"的。\n"
-"若大于一个这样的接口是<b>在网线连接时</b>那么我们需要一种方法决定激活哪个接"
-"口。\n"
+"<p>全部配置为<b>在网线连接时</b>和 IFPLUGD_PRIORITY != 0 的接口都将是互斥的。\n"
+"若大于一个这样的接口是<b>在网线连接时</b>那么我们需要一种方法决定激活哪个接口。\n"
"因此我们需要设置每个接口的优先级。</p>\n"
#. Address dialog caption
-#: src/include/network/lan/address.rb:1494
+#: src/include/network/lan/address.rb:1486
msgid "Network Card Setup"
msgstr "网卡设置"
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
#. remove all aliases (bnc#590167)
#: src/include/network/lan/bridge.rb:86
msgid ""
@@ -1566,32 +1561,30 @@
msgstr "使用 \"id\" 选项确定设备。"
#: src/include/network/lan/cmdline.rb:98
-msgid ""
-"Value of \"id\" is out of range. Use \"list\" option to check max. value of "
-"\"id\"."
+msgid "Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"."
msgstr "\"id\" 的值超出范围。请使用 \"list\" 选项检查 \"id\" 的最大值。"
#. Handler for action "add"
#. @param [Hash{String => String}] options action options
#. Handler for action "edit"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
msgid "Impossible value for bootproto."
msgstr "bootproto 的值非法。"
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
msgid "Impossible value for startmode."
msgstr "startmode 的值非法。"
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
msgid "For static configuration, the \"ip\" option is needed."
msgstr "静态配置需要 \"ip\" 选项。"
#. Handler for action "delete"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
msgid "The device was deleted."
msgstr "该设备已删除。"
@@ -1652,7 +1645,7 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
msgid ""
"Firmware is needed. Install it from \n"
"the add-on CD.\n"
@@ -1662,7 +1655,7 @@
"需要固件。请从附加 CD 安装之。\n"
"首先将附加 CD 添加到 YaST 软件源,然后返回此配置对话框。\n"
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
msgid ""
"The device needs a firmware to function properly. Usually, it can be\n"
"downloaded from your driver vendor's Web page. \n"
@@ -1678,23 +1671,20 @@
#. - kernel modules (InstallKernel): before loaded
#. - wlan firmware: here, just because it is copied from modems
#. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
msgid "Installing firmware"
msgstr "正在安装固件"
-#: 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 ""
-"为了顺利安装固件,需要执行 'install_bcm43xx_firmware' 脚本。现在执行它吗?"
+#: src/include/network/lan/complex.rb:232
+msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
+msgstr "为了顺利安装固件,需要执行 'install_bcm43xx_firmware' 脚本。现在执行它吗?"
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
msgid "An error occurred during firmware installation."
msgstr "固件安装时出错。"
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -1708,12 +1698,12 @@
"该接口将不再由 NetworkManager 管理。\n"
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:454
+#: src/include/network/lan/complex.rb:453
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr "您选择的设备有 STARTMODE=nfsroot。真的删除吗?"
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
msgid "Network Setup Method"
msgstr "网络设置方法"
@@ -1722,7 +1712,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:517
+#: src/include/network/lan/complex.rb:515
msgid "Network Settings"
msgstr "网络设置"
@@ -1766,8 +1756,7 @@
#: 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"
+"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 ""
"<p><b>Udev 规则</b> 是内核设备管理器的规则,\n"
@@ -1776,25 +1765,20 @@
#: 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"
+"<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"
"</p>"
msgstr ""
"<p><b>显示可见端口标识</b>允许您物理识别现在正配置的 NIC。\n"
-"设置适宜的时间,点击<b>闪烁</b>然后您 NIC 上的 LED 二极管将每隔所选时间就闪烁"
-"一次。\n"
+"设置适宜的时间,点击<b>闪烁</b>然后您 NIC 上的 LED 二极管将每隔所选时间就闪烁一次。\n"
"</p>"
#. Manual network card setup help 2/4
#: 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"
-"your device in the drop-down list. If necessary, choose a driver from the "
-"list, but usually the default value works.</p>\n"
+"for your network device here. If the device is already configured, see if there is more than one driver available for\n"
+"your device in the drop-down list. If necessary, choose a driver from the list, but usually the default value works.</p>\n"
msgstr ""
"<p><b>内核模块</b>。在此为您的网络设备输入内核模块 (驱动) 名称。\n"
"若设备已经配置过了,请在下拉列表中查看是否有多个驱动可用于您的设备。\n"
@@ -1804,23 +1788,16 @@
#: src/include/network/lan/hardware.rb:125
msgid ""
"<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
-"format: <i>option</i>=<i>value</i>. Each entry should be space-separated, "
-"for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
-"configured with the same module name, the options will be merged while "
-"saving.</p>\n"
+"format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
+"configured with the same module name, the options will be merged while saving.</p>\n"
msgstr ""
"<p>另外,也可以指定内核模块的<b>选项</b>。 \n"
-"使用此格式:<i>选项</i>=<i>值</i>。每项之间以空格分隔,例如 <i>io=0x300 "
-"irq=5</i>。\n"
+"使用此格式:<i>选项</i>=<i>值</i>。每项之间以空格分隔,例如 <i>io=0x300 irq=5</i>。\n"
"<b>注意:</b>若用同一个模块名称配置了两块网卡,则保存时将合并这些选项。</p>\n"
#: 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 ""
-"<p>若您通过 <b>Ethtool 选项</b>指定了选项,ifup 将使用这些选项调用 ethtool。"
-"</p>\n"
+msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n"
+msgstr "<p>若您通过 <b>Ethtool 选项</b>指定了选项,ifup 将使用这些选项调用 ethtool。</p>\n"
#. Manual dialog help 4/4
#: src/include/network/lan/hardware.rb:140
@@ -1837,17 +1814,14 @@
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"
-msgstr ""
-"<p>在此设置您的联网设备。这些值将被写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/"
-"chandev.conf</i>。</p>\n"
+msgstr "<p>在此设置您的联网设备。这些值将被写入 <i>/etc/modprobe.conf</i> 或 <i>/etc/chandev.conf</i>。</p>\n"
#. Manual dialog help 6/4
#: 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>"
-msgstr ""
-"<p>模块选项应遵照 <b>IBM 设备驱动和安装命令</b>手册中指定的格式填写。</p>"
+msgstr "<p>模块选项应遵照 <b>IBM 设备驱动和安装命令</b>手册中指定的格式填写。</p>"
#. CheckBox label
#: src/include/network/lan/hardware.rb:281
@@ -1914,7 +1888,7 @@
#. Selection box label
#. Selection box title
#: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
msgid "&Network Card"
msgstr "网卡(&N)"
@@ -1924,7 +1898,7 @@
msgstr "搜索(&S)"
#. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
msgid ""
"Configuration name %1 already exists.\n"
"Choose a different one."
@@ -1933,7 +1907,7 @@
"请选择一个不同的名称。"
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
msgid "S/390 Network Card Configuration"
msgstr "S/390 网卡配置"
@@ -1941,139 +1915,131 @@
#. Frame label
#. Frame label
#. Frame label
-#: 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
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
msgid "S/390 Device Settings"
msgstr "S/390 设备设置"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
msgid "&Port Name"
msgstr "端口名称(&P)"
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
msgid "Port Number"
msgstr "端口号"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
msgid "&Enable IPA Takeover"
msgstr "启用 IPA 接管(&E)"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
msgid "Enable &Layer 2 Support"
msgstr "启用第 2 层支持(&L)"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
msgid "Layer2 &MAC Address"
msgstr "第 2 层 MAC 地址(&M)"
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
msgid "Read Channel"
msgstr "读取通道"
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
msgid "Write Channel"
msgstr "写入通道"
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
msgid "Control Channel"
msgstr "控制通道"
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr "<p>输入此接口的<b>端口名称</b>(大小写敏感)。</p>"
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
-msgid ""
-"<p>Enter any additional <b>Options</b> for this interface (separated by "
-"spaces).</p>"
+#: src/include/network/lan/hardware.rb:950
+msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
msgstr "<p>输入此接口的任何附加<b>选项</b> (以空格分隔)。</p>"
-#: 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>"
+#: src/include/network/lan/hardware.rb:953
+msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
msgstr "<p>若应为此接口启用 IP 地址接管,请选择<b>启用 IPA 接管</b>。</p>"
-#: 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>"
+#: src/include/network/lan/hardware.rb:956
+msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>若此卡已配置了第 2 层支持,请选择<b>启用第 2 层支持</b>。</p>"
-#: 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>"
+#: src/include/network/lan/hardware.rb:959
+msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>若此卡已配置了第 2 层支持,请输入<b>第 2 层 MAC 地址</b>。</p>"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
msgid "&Port Number"
msgstr "端口号(&P)"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
msgid "&LANCMD Time-Out"
msgstr "&LANCMD 超时"
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr "<p>选择此接口的<b>端口号</b>。</p>"
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr "<p>为此接口指定 <b>LANCMD 超时</b>。</p>"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
msgid "Compatibility Mode"
msgstr "兼容模式"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
msgid "Extended Mode"
msgstr "扩展模式"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr "基于 CTC 的控制台 (Linux 到 Linux 连接)"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr "OS/390 和 z/OS 兼容模式"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
msgid "&Protocol"
msgstr "协议(&P)"
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr "<p>选择此接口的<b>协议</b>。</p>"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
msgid "&Peer Name"
msgstr "对等点名称(&P)"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
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"
@@ -2081,8 +2047,7 @@
"<p>请输入 IUCV 对等点的名称,\n"
"例如,要连接的 z/VM 用户名 (大小写敏感)。</p>\n"
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
msgid ""
"An error occurred while creating device.\n"
"See YaST log for details."
@@ -2092,7 +2057,7 @@
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
msgid "Hardware Dialog"
msgstr "硬件对话框"
@@ -2200,8 +2165,7 @@
"<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
"It is possible to use IPv6 together with IPv4. This is the default option.\n"
"To disable IPv6, uncheck this option. This will blacklist the kernel \n"
-"module for ipv6. If the IPv6 protocol is not used on your network, the "
-"response \n"
+"module for ipv6. If the IPv6 protocol is not used on your network, the response \n"
"time can be faster.</p>\n"
msgstr ""
"<p><b><big>IPv6 协议设置</big></b></p>\n"
@@ -2232,8 +2196,7 @@
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"
-"the device through which the traffic to the defined network will be routed."
-"\"-\" is an alias for any interface.</p>\n"
+"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n"
msgstr ""
"<p>请为每条路由输入目的地网络的 IP 地址、网关地址和网络掩码。\n"
"要忽略这些值中的任何一个,请使用破折号 \"-\"。\n"
@@ -2245,9 +2208,7 @@
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 ""
-"<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网"
-"络)。\n"
+msgstr "<p>若此系统是一个路由器则请启用<b>IPv4 转发</b> (转发外部网络的数据包到内部网络)。\n"
#: src/include/network/lan/help.rb:109
msgid ""
@@ -2256,14 +2217,12 @@
"<b>Warning:</b> IPv6 forwarding disables IPv6 stateless address\n"
"autoconfiguration (SLAAC)."
msgstr ""
-"<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网"
-"络)。\n"
+"<p>若此系统是一个路由器则请启用<b>IPv6 转发</b>(转发外部网络的数据包到内部网络)。\n"
"<b>警告:</b>IPv6 转发将禁用自动配置 IPv6 无状态地址(SLAAC)。"
#: src/include/network/lan/help.rb:115
msgid ""
-"<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone "
-"is not enough. \n"
+"<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 ""
@@ -2274,16 +2233,12 @@
#: src/include/network/lan/help.rb:121
msgid ""
"<p>If you are using DHCP to get an IP address, check whether you get\n"
-"also a hostname via DHCP. The hostname will be set automatically by the "
-"DHCP client.\n"
-"However, changing the hostname at runtime may confuse the graphical "
-"desktop. \n"
-"Therefore, disable this option if you connect to different networks that "
-"assign \n"
+"also a hostname via DHCP. The hostname will be set automatically by the DHCP client.\n"
+"However, changing the hostname at runtime may confuse the graphical desktop. \n"
+"Therefore, disable this option if you connect to different networks that assign \n"
"different hostnames.</p> "
msgstr ""
-"<p>若您正在使用 DHCP 获得 IP 地址,请检查您是否也能通过 DHCP 获得一个主机"
-"名。\n"
+"<p>若您正在使用 DHCP 获得 IP 地址,请检查您是否也能通过 DHCP 获得一个主机名。\n"
"主机名将被 DHCP 客户端自动设置。\n"
"然而,运行时修改主机名可能会让图形桌面无所适从。\n"
"因此,若您要连接到指派了不同主机名的不同网络,请禁用此选项。\n"
@@ -2292,18 +2247,13 @@
#: 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"
-"useful option if you want to have the hostname resolvable at all times, "
-"even \n"
-"without an active network. In all other cases, use it carefully, "
-"especially \n"
+"the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
+"useful option if you want to have the hostname resolvable at all times, even \n"
+"without an active network. In all other cases, use it carefully, especially \n"
"if this computer provides some network services.</p>\n"
msgstr ""
-"<p><b>指派主机名到回路 IP</b> 在 <tt>/etc/hosts</tt> 中将您的主机名和 IP 地"
-"址 <tt>127.0.0.2</tt> 关联了起来,这种行为就叫回路。\n"
-"若您想要在任何情况下都能解析主机名,即使在没有活动网络的情况下也能,那么这是"
-"一个有用的选项。\n"
+"<p><b>指派主机名到回路 IP</b> 在 <tt>/etc/hosts</tt> 中将您的主机名和 IP 地址 <tt>127.0.0.2</tt> 关联了起来,这种行为就叫回路。\n"
+"若您想要在任何情况下都能解析主机名,即使在没有活动网络的情况下也能,那么这是一个有用的选项。\n"
"在其它任何情况下,请谨慎使用之,尤其是当此计算机提供了一些网络服务时。</p>\n"
#: src/include/network/lan/help.rb:137
@@ -2330,8 +2280,7 @@
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"
-"your computer (for example, suse.de). There may be additional search "
-"domains\n"
+"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"
msgstr ""
"<p>搜索域是开始主机名搜索时搜索的域名称。\n"
@@ -2340,34 +2289,25 @@
#: 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"
-"computer is a mail server. You can view the hostname of you computer using "
-"the <i>hostname</i> \n"
+"<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"
+"computer is a mail server. You can view the hostname of you computer using the <i>hostname</i> \n"
"command.</p>"
msgstr ""
-"<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 "
-"<i>marguerite.su</i>)。\n"
-"若此计算机是一个邮件服务器,那么域尤其关键。您可以使用 <i>hostname</i> 命令查"
-"看您计算机的主机名。</p>"
+"<p>请输入此计算机的短名称 (例如 <i>甜软萌的壳酱</i>) 和它所属的 DNS 域 (例如 <i>marguerite.su</i>)。\n"
+"若此计算机是一个邮件服务器,那么域尤其关键。您可以使用 <i>hostname</i> 命令查看您计算机的主机名。</p>"
#: 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"
+"search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
"by the <i>netconfig</i> script, which merges statically defined data with\n"
"dynamically obtained data (e.g. from the DHCP client, NetworkManager,\n"
-"etc.). This is the default. <b>Use Default Policy</b> is sufficient for "
-"most\n"
+"etc.). This is the default. <b>Use Default Policy</b> is sufficient for most\n"
"configurations.</p>\n"
msgstr ""
-"<p>选择修改 DNS 配置的方式 (名称服务器,搜索列表,<i>/etc/resolv.conf</i> 内"
-"容)。\n"
-"通常由 <i>netconfig</i> 脚本处理,该脚本会合并静态定义的数据和动态获得的数据 "
-"(例如,从 DHCP 客户端、NetworkManager 等)。\n"
+"<p>选择修改 DNS 配置的方式 (名称服务器,搜索列表,<i>/etc/resolv.conf</i> 内容)。\n"
+"通常由 <i>netconfig</i> 脚本处理,该脚本会合并静态定义的数据和动态获得的数据 (例如,从 DHCP 客户端、NetworkManager 等)。\n"
"这是默认设置。<b>使用默认策略</b>可以满足大多数配置的需要。</p>\n"
#: src/include/network/lan/help.rb:169
@@ -2381,22 +2321,17 @@
"Leaving the field blank is the same as using the <b> Only Manually</b>\n"
"policy.</p>\n"
msgstr ""
-"<p>若选择<b>仅手动</b>,<i>netconfig</i> 将不再允许修改 <i>/etc/resolv.conf</"
-"i>。\n"
-"但您可以手动编辑该文件。若选择<b>使用自定义策略</b>,您可以指定一个自定义策略"
-"字符串,\n"
-"其由一个以逗号分隔的接口名列表组成,可包括通配符以及 STATIC 和 "
-"STATIC_FALLBACK 预定义特殊值。\n"
-"更多信息请参考 <i>netconfig</i> 手册页。注意:该处留空等同于使用<b>仅手动</b>"
-"策略。</p>\n"
+"<p>若选择<b>仅手动</b>,<i>netconfig</i> 将不再允许修改 <i>/etc/resolv.conf</i>。\n"
+"但您可以手动编辑该文件。若选择<b>使用自定义策略</b>,您可以指定一个自定义策略字符串,\n"
+"其由一个以逗号分隔的接口名列表组成,可包括通配符以及 STATIC 和 STATIC_FALLBACK 预定义特殊值。\n"
+"更多信息请参考 <i>netconfig</i> 手册页。注意:该处留空等同于使用<b>仅手动</b>策略。</p>\n"
#. Address dialog help 1-6/8: dynamic address preferred
#. Address dialog help 1/8
#: src/include/network/lan/help.rb:181
msgid ""
"<p><b><big>Address Setup</big></b></p>\n"
-"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address "
-"to this device.\n"
+"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
"This is particularly useful for bonding ethernet devices.</p>\n"
msgstr ""
"<p><b><big>地址设置</big></b></p>\n"
@@ -2404,9 +2339,7 @@
"这在绑定以太网设备时特别有用。</p>\n"
#: 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"
+msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n"
msgstr "<p>若您想要保留在 BIOS 中配置的网络,请勾选 <b>iBFT</b>。</p>\n"
#. Address dialog help 2/8
@@ -2414,9 +2347,7 @@
msgid ""
"<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
"assigned by the system administrator or your Internet provider.</p>\n"
-msgstr ""
-"<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址,请选择<b>动态地址"
-"</b>。</p>\n"
+msgstr "<p>若您没有系统管理员或互联网服务提供商指派的静态 IP 地址,请选择<b>动态地址</b>。</p>\n"
#. Address dialog help 3/8
#: src/include/network/lan/help.rb:194
@@ -2433,10 +2364,8 @@
#: src/include/network/lan/help.rb:200
msgid ""
"<p>To search for an IP address and assign it statically, select \n"
-"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + "
-"Zeroconf\n"
-"</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.</"
-"p>\n"
+"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
+"</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.</p>\n"
msgstr ""
"<p>要搜索并静态指派 IP 地址,请选择<b>Zeroconf</b>。\n"
"要使用 DHCP,不行再回到 zeroconf,请选择 <b>DHCP + Zeroconf</b>。\n"
@@ -2445,8 +2374,7 @@
#. Address dialog help 5/8
#: src/include/network/lan/help.rb:207
msgid ""
-"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for "
-"your computer, and the \n"
+"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
" <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
"for your peer.</p>\n"
msgstr ""
@@ -2456,17 +2384,12 @@
#. Address dialog help 6/8
#: src/include/network/lan/help.rb:214
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"
-"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix "
-"<tt>/24</tt>).Optionally, you can enter\n"
-"a fully qualified hostname for this IP address. The hostname will be written "
-"to <tt>/etc/hosts</tt>.</p>\n"
+"<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"
+"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
+"a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>\n"
msgstr ""
-"<p>对于<b>静态地址设置</b>, 请输入您计算机的静态 IP 地址 (例如,"
-"<tt>192.168.100.99</tt>) 和\n"
-"网络掩码 (通常是 <tt>255.255.255.0</tt>或前缀长度 <tt>/24</tt>)。此外,您还可"
-"以为此 IP 地址\n"
+"<p>对于<b>静态地址设置</b>, 请输入您计算机的静态 IP 地址 (例如,<tt>192.168.100.99</tt>) 和\n"
+"网络掩码 (通常是 <tt>255.255.255.0</tt>或前缀长度 <tt>/24</tt>)。此外,您还可以为此 IP 地址\n"
"输入一个完全限定主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n"
#. Address dialog help 8/8
@@ -2503,11 +2426,8 @@
"则将禁用防火墙。</p>"
#: 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>必备接口</b>指定了若引导时接口未能启动,网络服务是否报告失败。</p>"
+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>必备接口</b>指定了若引导时接口未能启动,网络服务是否报告失败。</p>"
#: src/include/network/lan/help.rb:242
msgid ""
@@ -2515,21 +2435,18 @@
"<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
"transferred over the network in one frame. Usually, you do not need to\n"
"set a MTU, but using lower MTU values may improve the network performance,\n"
-"especially on slow dial-up connections. Either select one of the "
-"recommended\n"
+"especially on slow dial-up connections. Either select one of the recommended\n"
"values or define another one.</p>\n"
msgstr ""
"<p><b><big>最大传输单元</big></b></p>\n"
"<p>最大传输单元 (<b>MTU</b>) 是网络中一帧能够传输的数据包最大大小。\n"
-"通常,您不需要设置 MTU,但使用较小的 MTU 或许会改善网络性能,尤其是在慢速拨号"
-"连接下。\n"
+"通常,您不需要设置 MTU,但使用较小的 MTU 或许会改善网络性能,尤其是在慢速拨号连接下。\n"
"您可从推荐值中择一,或定义另一个值。</p>\n"
#: src/include/network/lan/help.rb:251
msgid ""
"<p>Select the slave devices for the bond device.\n"
-"Only devices with the device activation set to <b>Never</b> and with <b>No "
-"Address Setup</b> are available.</p>"
+"Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
msgstr ""
"<p>请选择绑定设备的从属设备。\n"
"只有设备激活设为<b>从不</b>和设置了<b>无地址设置</b>的设备才可用。</p>"
@@ -2543,8 +2460,7 @@
#: 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"
+"the hardware address of the network interface. It must be different for each\n"
"DHCP client on a single network. Therefore, specify a unique free-form\n"
"identifier here if you have several (virtual) machines using the same\n"
"network interface and thus the same hardware address.</p>"
@@ -2558,25 +2474,18 @@
#: src/include/network/lan/help.rb:265
msgid ""
"<p>The <b>Hostname to Send</b> specifies a string used for the\n"
-"hostname option field when the DHCP client sends messages to the DHCP "
-"server. Some \n"
+"hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
"DHCP servers update name server zones (forward and reverse records) \n"
"according to this hostname (dynamic DNS).</p>\n"
"Some DHCP servers require the <b>Hostname to Send</b> option field to\n"
-"contain a specific string in the DHCP messages from clients. Leave <b>AUTO</"
-"b>\n"
-"to send the current hostname (for example, the one defined in <tt>/etc/"
-"HOSTNAME</tt>). \n"
+"contain a specific string in the DHCP messages from clients. Leave <b>AUTO</b>\n"
+"to send the current hostname (for example, the one defined in <tt>/etc/HOSTNAME</tt>). \n"
"If you do not want to send a hostname, leave the field empty.</p>\n"
msgstr ""
-"<p><b>要发送的主机名</b>指定了 DHCP 客户端发送消息到 DHCP 服务器时主机名选项"
-"字段所用的字符串。\n"
-"某些 DHCP 服务器 (动态 DNS) 会根据此主机名来更新名称服务器区域 (转发和反向记"
-"录)。</p>\n"
-"某些 DHCP 服务器则要求客户端发来的 DHCP 消息中的<b>要发送的主机名</b>选项字段"
-"包含某个指定字符串。\n"
-"保持<b>自动</b>则会发送当前主机名 (例如 <tt>/etc/HOSTNAME</tt> 中定义的主机"
-"名)。\n"
+"<p><b>要发送的主机名</b>指定了 DHCP 客户端发送消息到 DHCP 服务器时主机名选项字段所用的字符串。\n"
+"某些 DHCP 服务器 (动态 DNS) 会根据此主机名来更新名称服务器区域 (转发和反向记录)。</p>\n"
+"某些 DHCP 服务器则要求客户端发来的 DHCP 消息中的<b>要发送的主机名</b>选项字段包含某个指定字符串。\n"
+"保持<b>自动</b>则会发送当前主机名 (例如 <tt>/etc/HOSTNAME</tt> 中定义的主机名)。\n"
"若您不想要发送主机名,请将该字段留空。</p>\n"
#. Aliases dialog help 1/4
@@ -2593,32 +2502,22 @@
msgid ""
"<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
"the <b>Netmask</b>.</p>"
-msgstr ""
-"<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。</"
-"p>"
+msgstr "<p>请输入一个 <b>IPv4 地址标签</b>、一个 <b>IP 地址</b>和<b>网络掩码</b>。</p>"
#. Aliases dialog help 3/4
#: 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"
+"<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. The obsolete ifconfig utility truncates it after 9 "
-"characters.</p>"
+"limited to 15 characters. The obsolete ifconfig utility truncates it after 9 characters.</p>"
msgstr ""
-"<p><b>IPv4 地址标签</b>,之前叫做别名,是可选的,并且使用别名是很久以前的事"
-"了。\n"
-"接口名全长 (包括冒号和标签) 的限制为 15 个字符,并且过时的 ifconfig 工具会把"
-"它截断为 9 个字符。</p>"
+"<p><b>IPv4 地址标签</b>,之前叫做别名,是可选的,并且使用别名是很久以前的事了。\n"
+"接口名全长 (包括冒号和标签) 的限制为 15 个字符,并且过时的 ifconfig 工具会把它截断为 9 个字符。</p>"
#. Aliases dialog help 3/4, #83766
#: src/include/network/lan/help.rb:290
-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>不要在标签中包含接口名称。例如,请输入 <b>foo</b> 而不是 <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>不要在标签中包含接口名称。例如,请输入 <b>foo</b> 而不是 <b>eth0:foo</b>。</p>"
#. shared between WirelessDialog and WirelessKeyPopup
#. this is suited to the button-switched key typing
@@ -2674,8 +2573,7 @@
"<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"
"wireless LAN need the same ESSID to communicate with each other. If\n"
-"you choose the operation mode <b>Managed</b> and no <b>WPA</b> "
-"authentication mode,\n"
+"you choose the operation mode <b>Managed</b> and no <b>WPA</b> authentication mode,\n"
"you can leave this field empty or set it to <tt>any</tt>. In this\n"
"case, your WLAN card associates with the access point with the best\n"
"signal strength.</p>\n"
@@ -2699,8 +2597,7 @@
"NOTE: Shared key authentication makes it easier for a\n"
"potential attacker to break into your network. Unless you have\n"
"specific needs for shared key authentication, use the <b>Open</b>\n"
-"mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected "
-"Access)\n"
+"mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected Access)\n"
"was defined to close its security holes, but not all hardware supports\n"
"WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the\n"
"authentication mode. This is only possible in the operation mode\n"
@@ -2710,8 +2607,7 @@
"认证模式取决于所用的保护技术是 WEP 还是 WPA。<b>WEP</b>\n"
"(有线等效隐私,Wired Equivalent Privacy) 是一种基于所用的加密密钥\n"
"使用可选认证来加密无线网络流量的系统。\n"
-"在大多数使用 WEP 的情况下,选择 <b>WEP 开放式</b>模式 (根本无需认证) 就可"
-"以。\n"
+"在大多数使用 WEP 的情况下,选择 <b>WEP 开放式</b>模式 (根本无需认证) 就可以。\n"
"这并不意味着您没有使用 WEP 加密 (那种情况请用<b>无加密</b>)。\n"
"某些网络可能要求 <b>WEP 共享密钥</b> 认证。\n"
"注意:共享密钥认证使得潜在攻击者更加容易侵入您的网络。\n"
@@ -2729,8 +2625,7 @@
"supported by all devices. Of these keys, 24 bits\n"
"are dynamically generated, so you only need to enter 40 to 232 bits.</p>\n"
msgstr ""
-"<p>要使用 WEP,请输入要使用的 WEP 加密密钥。密钥长度可以为 64、128、156 或 "
-"256 位,但并非全部设备都支持全部长度。\n"
+"<p>要使用 WEP,请输入要使用的 WEP 加密密钥。密钥长度可以为 64、128、156 或 256 位,但并非全部设备都支持全部长度。\n"
"在这些密钥中,有 24 位是动态生成的,所以您只需输入 40 到 232 位。</p>\n"
#. Wireless dialog help
@@ -2761,8 +2656,7 @@
msgid ""
"<p>These values will be written to the interface configuration file\n"
"'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
-"add them manually. Refer to the file 'wireless' in the same directory for "
-"all\n"
+"add them manually. Refer to the file 'wireless' in the same directory for all\n"
"available options.</p>"
msgstr ""
"<p>这些值将被写入 '/etc/sysconfig/network' 中的接口配置文件 \"ifcfg-*\"。\n"
@@ -2770,29 +2664,29 @@
"全部可用选项请参考同名文件夹中的 'wireless' 文件。</p>"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
msgid "IPv4 &Address Label"
msgstr "IPv4 地址标签(&A)"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
msgid "Net&mask"
msgstr "网络掩码(&M)"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
msgid "Label is too long."
msgstr "标签太长。"
#. Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:379
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
msgid "The IP address is invalid."
msgstr "IP 地址无效。"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
msgid "The subnet mask is invalid."
msgstr "子网掩码无效。"
@@ -2858,8 +2752,7 @@
"<p>For TTLS and PEAP, enter your <b>Identity</b>\n"
"and <b>Password</b> as configured on the server.\n"
"If you have special requirements to set the username used as\n"
-"<b>Anonymous Identity</b>, you may set it here. This is usually not needed.</"
-"p>\n"
+"<b>Anonymous Identity</b>, you may set it here. This is usually not needed.</p>\n"
msgstr ""
"<p>对 TTLS 和 PEAP,请按服务器上的配置输入您的<b>身份</b>和<b>密码</b>。\n"
"若您有特殊需要,要把使用的用户名设为<b>匿名身份</b>,您可以在这里设置。\n"
@@ -2884,8 +2777,7 @@
#: 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"
+"password combination for authentication. It uses a public and private key pair\n"
"to encrypt negotiation communication, therefore you will additionally need\n"
"a <b>Client Key</b> file that contains your private key and\n"
"the appropriate <b>Client Key Password</b> for that file.</p>\n"
@@ -2930,8 +2822,7 @@
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"
-msgstr ""
-"若您不知道您的 ID 和密码,或者没有证书或密钥文件,请垂询您的系统管理员。\n"
+msgstr "若您不知道您的 ID 和密码,或者没有证书或密钥文件,请垂询您的系统管理员。\n"
#. combo box label
#: src/include/network/lan/wireless.rb:238
@@ -2970,127 +2861,127 @@
#. Wireless authentication modes:
#. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
msgid "No Encryption"
msgstr "无加密"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
msgid "WEP - Open"
msgstr "WEP - 开放式"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
msgid "WEP - Shared Key"
msgstr "WEP - 共享密钥"
#. ComboBox item
#. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
msgid "WPA-PSK (WPA version 1 or 2)"
msgstr "WPA-PSK (WPA 版本 1 或 2)"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
msgid "WPA-EAP (WPA version 1 or 2)"
msgstr "WPA-EAP (WPA 版本 1 或 2)"
#. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
msgid "Wireless Network Card Configuration"
msgstr "无线网卡配置"
#. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
msgid "Wireless Device Settings"
msgstr "无线设备设置"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
msgid "O&perating Mode"
msgstr "运行模式(&P)"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
msgid "Ad-Hoc"
msgstr "点对点 (Ad-Hoc)"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
msgid "Master"
msgstr "主控"
#. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
msgid "Ne&twork Name (ESSID)"
msgstr "网络名称 (ESSID)(&T)"
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
msgid "Scan Network"
msgstr "扫描网络"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
msgid "&Authentication Mode"
msgstr "认证模式(&A)"
#. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
msgid "&Encryption Key"
msgstr "加密密钥(&E)"
#. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
msgid "E&xpert Settings"
msgstr "专家设置(&X)"
#. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
msgid "&WEP Keys"
msgstr "&WEP 密钥"
#. Popup text
-#: src/include/network/lan/wireless.rb:561
+#: src/include/network/lan/wireless.rb:558
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr "WPA 认证模式只能在受管运行模式下使用。"
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:572
+#: src/include/network/lan/wireless.rb:569
msgid "Specify the network name for this mode."
msgstr "请指定此模式的网络名称。"
#. Popup text
-#: src/include/network/lan/wireless.rb:579
+#: src/include/network/lan/wireless.rb:576
msgid "The network name must be shorter than 32 characters."
msgstr "网络名称必须短于 32 个字符。"
#. Error popup
-#: src/include/network/lan/wireless.rb:599
+#: src/include/network/lan/wireless.rb:596
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "密码短语的长度必须在 8 到 63 (包括两者) 个字符之间。"
#. Error popup
-#: src/include/network/lan/wireless.rb:610
+#: src/include/network/lan/wireless.rb:607
msgid "The key must have %1 hexadecimal digits."
msgstr "密钥必须有 %1 个十六进制数字。"
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:622
+#: src/include/network/lan/wireless.rb:619
#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "加密密钥无效。"
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:630
+#: src/include/network/lan/wireless.rb:627
msgid "The encryption key must be specified for this authentication mode."
msgstr "必须为此认证模式指定加密密钥。"
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:637
+#: src/include/network/lan/wireless.rb:634
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3100,33 +2991,31 @@
#. Wireless expert dialog caption
#. Frame label
-#: src/include/network/lan/wireless.rb:695
-#: src/include/network/lan/wireless.rb:776
+#: src/include/network/lan/wireless.rb:694
+#: src/include/network/lan/wireless.rb:775
msgid "Wireless Expert Settings"
msgstr "无线专家设置"
#. Wireless expert dialog help 1/5
-#: src/include/network/lan/wireless.rb:698
+#: src/include/network/lan/wireless.rb:697
msgid ""
"<p>Here, set additional configuration parameters\n"
"(rarely needed).</p>"
msgstr "<p>在此设置额外配置参数 (极少需要)。</p>"
#. Wireless expert dialog help 2/5
-#: src/include/network/lan/wireless.rb:702
+#: 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"
-"for managed mode--the card will hop through the channels searching for "
-"access\n"
+"for managed mode--the card will hop through the channels searching for access\n"
"points in that case.</p>\n"
msgstr ""
-"<p>要以主控或点对点模式使用您的无线局域网卡,请在此设置该卡应使用的<b>通道</"
-"b>。\n"
+"<p>要以主控或点对点模式使用您的无线局域网卡,请在此设置该卡应使用的<b>通道</b>。\n"
"受管模式下无需这样做 -- 该模式下该卡将在各通道间跳跃以搜索访问点。</p>\n"
#. Wireless expert dialog help 3/5
-#: src/include/network/lan/wireless.rb:709
+#: 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>"
@@ -3135,53 +3024,50 @@
"默认值为传输得越快越好。</p>"
#. Wireless expert dialog help 4/5
-#: src/include/network/lan/wireless.rb:713
+#: 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>"
-msgstr ""
-"<p>在有多个<b>访问点</b>的环境中,您可能想要通过输入访问点的 MAC 地址定义要连"
-"接的访问点。</p>"
+msgstr "<p>在有多个<b>访问点</b>的环境中,您可能想要通过输入访问点的 MAC 地址定义要连接的访问点。</p>"
#. Wireless expert dialog help 5/5
-#: src/include/network/lan/wireless.rb:717
+#: 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"
"be disconnected from AC power.</p>\n"
msgstr ""
"<p><b>使用电源管理</b>可启用省电机制。\n"
-"这通常是一个好主意,尤其是当您正在使用便携式计算机且可能未连接交流电源供电"
-"时。</p>\n"
+"这通常是一个好主意,尤其是当您正在使用便携式计算机且可能未连接交流电源供电时。</p>\n"
#. Combobox item
#. Combobox item
-#: src/include/network/lan/wireless.rb:745
-#: src/include/network/lan/wireless.rb:767
+#: src/include/network/lan/wireless.rb:744
+#: src/include/network/lan/wireless.rb:766
msgid "Automatic"
msgstr "自动"
#. Combobox label
-#: src/include/network/lan/wireless.rb:782
+#: src/include/network/lan/wireless.rb:781
msgid "&Channel"
msgstr "通道(&C)"
#. Combobox label
-#: src/include/network/lan/wireless.rb:785
+#: src/include/network/lan/wireless.rb:784
msgid "B&it Rate"
msgstr "比特率(&I)"
#. Text entry label
-#: src/include/network/lan/wireless.rb:791
+#: src/include/network/lan/wireless.rb:790
msgid "&Access Point"
msgstr "访问点(&A)"
#. CheckBox label
-#: src/include/network/lan/wireless.rb:799
+#: src/include/network/lan/wireless.rb:798
msgid "Use &Power Management"
msgstr "使用电源管理(&P)"
-#: src/include/network/lan/wireless.rb:808
+#: src/include/network/lan/wireless.rb:807
msgid "AP ScanMode"
msgstr "访问点扫描模式"
@@ -3209,8 +3095,7 @@
#: src/include/network/lan/wireless.rb:979
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"
+"to encrypt your data before it is transmitted. You can have up to four keys,\n"
"although only one key is used to encrypt the data. This is the default key.\n"
"The other keys can be used to decrypt data. Usually you have only\n"
"one key.</p>"
@@ -3265,69 +3150,66 @@
msgstr "设为默认(&S)"
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1213
+#: src/include/network/lan/wireless.rb:1214
msgid "Choose a Certificate"
msgstr "选择证书"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1258
+#: src/include/network/lan/wireless.rb:1257
msgid ""
-"Not using a Certificate Authority (CA) certificate can result in "
-"connections\n"
+"Not using a Certificate Authority (CA) certificate can result in connections\n"
"to insecure, rogue wireless networks. Continue without CA ?"
-msgstr ""
-"不使用数字证书认证机构 (CA) 证书可能导致连接到不安全、流氓的无线网络。不使用 "
-"CA 继续吗?"
+msgstr "不使用数字证书认证机构 (CA) 证书可能导致连接到不安全、流氓的无线网络。不使用 CA 继续吗?"
#. error popup text
-#: src/include/network/lan/wireless.rb:1286
+#: src/include/network/lan/wireless.rb:1285
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
msgstr "请输入身份和密码或客户证书。"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1332
+#: src/include/network/lan/wireless.rb:1331
msgid "WPA-EAP"
msgstr "WPA-EAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1354
+#: src/include/network/lan/wireless.rb:1353
msgid "Any"
msgstr "任意"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1358
+#: src/include/network/lan/wireless.rb:1357
msgid "MD5"
msgstr "MD5"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1360
+#: src/include/network/lan/wireless.rb:1359
msgid "GTC"
msgstr "GTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1362
+#: src/include/network/lan/wireless.rb:1361
msgid "CHAP"
msgstr "CHAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1364
+#: src/include/network/lan/wireless.rb:1363
msgid "PAP"
msgstr "PAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1366
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv1"
msgstr "MSCHAPv1"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1370
+#: src/include/network/lan/wireless.rb:1369
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1393
+#: src/include/network/lan/wireless.rb:1392
msgid "WPA-EAP Details"
msgstr "WPA-EAP 细节"
@@ -3342,35 +3224,53 @@
#. RadioButton label
#: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
msgstr "允许远程管理(&A)"
#. RadioButton label
#: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "允许远程管理(&A)"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
msgid "&Do Not Allow Remote Administration"
msgstr "不允许远程管理(&D)"
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Remote Administration Settings</big></b></p>\n"
+#| "<p>If this feature is enabled, you can\n"
+#| "administer this machine remotely from another machine. Use a VNC\n"
+#| "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
+#| "a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
+#| "This form of remote administration is less secure than using SSH.</p>\n"
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
"administer this machine remotely from another machine. Use a VNC\n"
"client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</"
-"tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
msgstr ""
"<p><b><big>远程管理设置</big></b></p>\n"
"<p>若启用了此功能,您将可以从另一台计算机远程管理这台计算机。\n"
"可以使用 VNC 客户端管理,例如 krdc (连接到 <i><hostname>:%1</i>),\n"
-"或者使用支持 Java 的网络浏览器管理 (连接到 <i>http://<hostname>:%2/</"
-"i>)。\n"
+"或者使用支持 Java 的网络浏览器管理 (连接到 <i>http://<hostname>:%2/</i>)。\n"
"与使用 SSH 相比,使用这种形式的远程管理安全性较差。</p>\n"
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
msgid "Remote Administration Settings"
msgstr "远程管理设置"
@@ -3413,7 +3313,7 @@
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:807
+#: src/include/network/routines.rb:829
msgid ""
"Network is currently handled by NetworkManager\n"
"or completely disabled. YaST is unable to configure some options."
@@ -3422,33 +3322,33 @@
"YaST 无法配置某些选项。"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:867
+#: src/include/network/routines.rb:889
msgid "Network Cards"
msgstr "网卡"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:871
+#: src/include/network/routines.rb:893
msgid "Modems"
msgstr "调制解调器"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:875
+#: src/include/network/routines.rb:897
msgid "ISDN Cards"
msgstr "ISDN 卡"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:879
+#: src/include/network/routines.rb:901
msgid "DSL Devices"
msgstr "DSL 设备"
-#: src/include/network/routines.rb:884
+#: src/include/network/routines.rb:906
msgid "All Network Devices"
msgstr "全部网络设备"
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:391
+#: src/include/network/services/host.rb:387
msgid "The hostname is invalid."
msgstr "主机名无效。"
@@ -3548,9 +3448,7 @@
#. @param [Hash] event the event being handled
#. @return whether valid
#: src/include/network/services/dns.rb:495
-msgid ""
-"It's not recommended to use .local as domainname due to Multicast DNS. Use "
-"it at your own risk?"
+msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
msgstr "由于多播 DNS 的原因,不推荐使用 .local 作为域名。风险自担吗?"
#. Popup::Error text
@@ -3599,9 +3497,7 @@
msgid ""
"<p>Enter a host <b>IP Address</b>, a <b>Hostname</b>, and optional\n"
"<b>Host Aliases</b>, separated by spaces.</p>\n"
-msgstr ""
-"<p>输入一个主机 <b>IP 地址</b>、<b>主机名</b>和可选的<b>主机别名</b>,以空格"
-"分隔。</p>\n"
+msgstr "<p>输入一个主机 <b>IP 地址</b>、<b>主机名</b>和可选的<b>主机别名</b>,以空格分隔。</p>\n"
#. Frame label
#: src/include/network/services/host.rb:119
@@ -3619,12 +3515,12 @@
msgstr "主机别名"
#. TextEntry label
-#: src/include/network/services/host.rb:344
+#: src/include/network/services/host.rb:340
msgid "Hos&t Aliases"
msgstr "主机别名(&T)"
#. Popup::Error text
-#: src/include/network/services/host.rb:407
+#: src/include/network/services/host.rb:403
msgid "Alias name \"%1\" is invalid."
msgstr "别名 \"%1\" 无效。"
@@ -3664,36 +3560,36 @@
msgid "&Destination"
msgstr "目的地(&D)"
-#: src/include/network/services/routing.rb:172
+#: src/include/network/services/routing.rb:171
msgid "Ge&nmask"
msgstr "网络掩码(&N)"
-#: src/include/network/services/routing.rb:182
+#: src/include/network/services/routing.rb:180
msgid "&Gateway"
msgstr "网关(&G)"
-#: src/include/network/services/routing.rb:191
+#: src/include/network/services/routing.rb:188
msgid "De&vice"
msgstr "设备(&V)"
#. Popup::Error text
-#: src/include/network/services/routing.rb:252
+#: src/include/network/services/routing.rb:247
msgid "Destination is invalid."
msgstr "目的地无效。"
#. Popup::Error text
-#: src/include/network/services/routing.rb:260
+#: src/include/network/services/routing.rb:255
msgid "Gateway IP address is invalid."
msgstr "网关 IP 地址无效。"
#. Popup::Error text
-#: src/include/network/services/routing.rb:268
+#: src/include/network/services/routing.rb:263
msgid "Subnetmask is invalid."
msgstr "子网掩码无效。"
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:426
+#: src/include/network/services/routing.rb:422
msgid "The default gateway is invalid."
msgstr "默认网关无效。"
@@ -3726,8 +3622,7 @@
#: 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"
+"change the dial prefix in KInternet provided that it matches the expression.\n"
"A recommended value is <tt>[09]?</tt>, allowing <tt>0</tt>, <tt>9</tt>,\n"
"and the empty prefix. If the expression is empty, users are not allowed\n"
"to change the prefix.</p>\n"
@@ -3778,8 +3673,7 @@
msgid ""
"<b>By NetworkManager</b>: a desktop applet\n"
"controls the interface. There is no need to set it up in YaST."
-msgstr ""
-"<b>由 NetworkManager</b>:由一个桌面小程序来控制接口。无需在 YaST 中设置它。"
+msgstr "<b>由 NetworkManager</b>:由一个桌面小程序来控制接口。无需在 YaST 中设置它。"
#. Combo box option for Device Activation
#: src/include/network/widgets.rb:117
@@ -3836,10 +3730,8 @@
#. help text for Device Activation
#: src/include/network/widgets.rb:151
msgid ""
-"Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this "
-"startmode will never\n"
-"be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still "
-"available.\n"
+"Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this startmode will never\n"
+"be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still available.\n"
"Use this if you have an NFS or iSCSI root filesystem.\n"
msgstr ""
"使用<b>在 NFSroot 时</b>与使用<tt>自动</tt>相似。\n"
@@ -3857,8 +3749,7 @@
#: src/include/network/widgets.rb:190
msgid ""
"<p><b><big>Device Activation</big></b></p> \n"
-"<p>Choose when to bring up the network interface. <b>At Boot Time</b> "
-"activates it during system boot, \n"
+"<p>Choose when to bring up the network interface. <b>At Boot Time</b> activates it during system boot, \n"
"<b>Never</b> does not start the device.\n"
"%1</p>\n"
msgstr ""
@@ -3939,35 +3830,35 @@
"NetworkManager 由桌面小挂件 (KDE 是 Plasma 挂件,GNOME 是 nm-applet) 控制。\n"
"请确保该挂件正在运行,若未运行请手动启动之。"
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
msgid "General Network Settings"
msgstr "常规网络设置"
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
msgid "IPv6 Protocol Settings"
msgstr "IPn6 协议设置"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
msgid "Enable IPv6"
msgstr "启用 IPv6"
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
msgid "Unknown device"
msgstr "未知设备"
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
msgid "DHCP address"
msgstr "DHCP 地址"
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
msgid "No IP address assigned"
msgstr "未指派 IP 地址"
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
msgid ""
"%1 \n"
"%2 - %3"
@@ -3976,12 +3867,12 @@
"%2 - %3"
#. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
msgid "&Change Device"
msgstr "修改设备(&C)"
#. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
msgid "Network Device Select"
msgstr "网络设备选择"
@@ -3990,7 +3881,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
msgid "configured"
msgstr "已配置"
@@ -4002,9 +3893,7 @@
msgstr "确认重启网络"
#: src/lib/network/confirm_virt_proposal.rb:24
-msgid ""
-"Because of the bridged network, YaST2 needs to restart the network to apply "
-"the settings."
+msgid "Because of the bridged network, YaST2 needs to restart the network to apply the settings."
msgstr "由于是桥接网络,YaST2 需要重启网络以应用设置。"
#. Opens dialog for editing NIC name
@@ -4041,7 +3930,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:533
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
msgid "Update configuration"
msgstr "更新配置"
@@ -4064,7 +3953,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:621
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
msgid "Updating configuration..."
msgstr "正在更新配置..."
@@ -4114,62 +4003,62 @@
msgstr "正在更新 /etc/hosts ..."
#. Read dialog caption
-#: src/modules/Lan.rb:271
+#: src/modules/Lan.rb:276
msgid "Initializing Network Configuration"
msgstr "正在初始化网络配置"
#. Progress stage 1/9
-#: src/modules/Lan.rb:284
+#: src/modules/Lan.rb:289
msgid "Detect network devices"
msgstr "检测网络设备"
#. Progress stage 2/9
-#: src/modules/Lan.rb:286
+#: src/modules/Lan.rb:291
msgid "Read driver information"
msgstr "读取驱动信息"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:293
msgid "Read device configuration"
msgstr "读取设备配置"
#. Progress stage 4/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:295
msgid "Read network configuration"
msgstr "读取网络配置"
#. Progress stage 5/9
-#: src/modules/Lan.rb:292
+#: src/modules/Lan.rb:297
msgid "Read firewall settings"
msgstr "读取防火墙设置"
#. Progress stage 6/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:299
msgid "Read hostname and DNS configuration"
msgstr "读取主机名和 DNS 配置"
#. Progress stage 7/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:301
msgid "Read installation information"
msgstr "读取安装信息"
#. Progress stage 8/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:303
msgid "Read routing configuration"
msgstr "读取路由配置"
#. Progress stage 9/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:305
msgid "Detect current status"
msgstr "检测当前状态"
#. Progress step 1/9
-#: src/modules/Lan.rb:314
+#: src/modules/Lan.rb:319
msgid "Detecting ndiswrapper..."
msgstr "正在检测 ndiswrapper..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:333
+#: src/modules/Lan.rb:338
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
@@ -4179,7 +4068,7 @@
"但内核模块尚未加载。\n"
"您想要加载 ndiswrapper 模块吗?\n"
-#: src/modules/Lan.rb:341
+#: src/modules/Lan.rb:346
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
@@ -4188,296 +4077,291 @@
"请手动检查配置。\n"
#. Progress step 2/9
-#: src/modules/Lan.rb:355
+#: src/modules/Lan.rb:360
msgid "Detecting network devices..."
msgstr "正在检测网络设备..."
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:363
+#: src/modules/Lan.rb:368
msgid "Reading device configuration..."
msgstr "正在读取设备配置..."
#. Progress step 4/9
-#: src/modules/Lan.rb:369
+#: src/modules/Lan.rb:374
msgid "Reading network configuration..."
msgstr "正在读取网络配置..."
#. Progress step 5/9
-#: src/modules/Lan.rb:378
+#: src/modules/Lan.rb:383
msgid "Reading firewall settings..."
msgstr "正在读取防火墙设置..."
#. Progress step 6/9
-#: src/modules/Lan.rb:386
+#: src/modules/Lan.rb:391
msgid "Reading hostname and DNS configuration..."
msgstr "正在读取主机名和 DNS 配置..."
#. Progress step 7/9
-#: src/modules/Lan.rb:393
+#: src/modules/Lan.rb:398
msgid "Reading installation information..."
msgstr "正在读取安装信息..."
#. Progress step 8/9
-#: src/modules/Lan.rb:399
+#: src/modules/Lan.rb:404
msgid "Reading routing configuration..."
msgstr "正在读取路由配置..."
#. Progress step 9/9
-#: src/modules/Lan.rb:405
+#: src/modules/Lan.rb:410
msgid "Detecting current status..."
msgstr "正在检测当前状态..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:411 src/modules/Lan.rb:642
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
msgid "Finished"
msgstr "已完成"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:437
+#: src/modules/Lan.rb:441
msgid "To apply this change, a reboot is needed."
msgstr "要应用此改动,需要重启。"
#. Write dialog caption
-#: src/modules/Lan.rb:505
+#: src/modules/Lan.rb:509
msgid "Saving Network Configuration"
msgstr "正在保存网络配置"
#. Progress stage 2
-#: src/modules/Lan.rb:512
+#: src/modules/Lan.rb:516
msgid "Write drivers information"
msgstr "写入驱动信息"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:514
+#: src/modules/Lan.rb:518
msgid "Write device configuration"
msgstr "写入设备配置"
#. Progress stage 4
-#: src/modules/Lan.rb:516
+#: src/modules/Lan.rb:520
msgid "Write network configuration"
msgstr "写入网络配置"
#. Progress stage 5
-#: src/modules/Lan.rb:518
+#: src/modules/Lan.rb:522
msgid "Write routing configuration"
msgstr "写入路由配置"
#. Progress stage 6
-#: src/modules/Lan.rb:520
+#: src/modules/Lan.rb:524
msgid "Write hostname and DNS configuration"
msgstr "写入主机名和 DNS 配置"
#. Progress stage 7
-#: src/modules/Lan.rb:522
+#: src/modules/Lan.rb:526
msgid "Set up network services"
msgstr "设置网络服务"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:526 src/modules/Remote.rb:197
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr "写入防火墙设置"
#. Progress stage 9
-#: src/modules/Lan.rb:530
+#: src/modules/Lan.rb:534
msgid "Activate network services"
msgstr "激活网络服务"
#. Progress step 2
-#: src/modules/Lan.rb:546
+#: src/modules/Lan.rb:550
msgid "Writing /etc/modprobe.conf..."
msgstr "正在写入 /etc/modprobe.conf..."
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:551
+#: src/modules/Lan.rb:555
msgid "Writing device configuration..."
msgstr "正在写入设备配置..."
#. Progress step 4
-#: src/modules/Lan.rb:557
+#: src/modules/Lan.rb:561
msgid "Writing network configuration..."
msgstr "正在写入网络配置..."
#. Progress step 5
-#: src/modules/Lan.rb:563
+#: src/modules/Lan.rb:567
msgid "Writing routing configuration..."
msgstr "正在写入路由配置..."
#. Progress step 6
-#: src/modules/Lan.rb:571
+#: src/modules/Lan.rb:575
msgid "Writing hostname and DNS configuration..."
msgstr "正在写入主机名和 DNS 配置..."
#. Progress step 7
-#: src/modules/Lan.rb:584
+#: src/modules/Lan.rb:588
msgid "Setting up network services..."
msgstr "正在设置网络服务..."
#. Progress step 8
-#: src/modules/Lan.rb:592 src/modules/Remote.rb:211
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr "正在写入防火墙设置..."
#. Progress step 9
-#: src/modules/Lan.rb:602
+#: src/modules/Lan.rb:606
msgid "Activating network services..."
msgstr "正在激活网络服务..."
-#: src/modules/Lan.rb:638
+#: src/modules/Lan.rb:642
msgid "No network running"
msgstr "无网络运行"
#. Create a textual summary for the general network settings
#. proposal (NetworkManager + ipv6)
#. @return [rich text, links]
-#: src/modules/Lan.rb:755
+#: src/modules/Lan.rb:759
msgid "Network Mode"
msgstr "网络模式"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:760
+#: src/modules/Lan.rb:764
msgid "Interfaces controlled by NetworkManager"
msgstr "由 NetworkManager 控制的接口"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:762
+#: src/modules/Lan.rb:766
msgid "Disable NetworkManager"
msgstr "禁用 NetworkManager"
#. network mode
-#: src/modules/Lan.rb:766
+#: src/modules/Lan.rb:770
msgid "Traditional network setup with NetControl - ifup"
msgstr "使用 NetControl 的传统网络设置 - ifup"
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:769
+#: src/modules/Lan.rb:773
msgid "Enable NetworkManager"
msgstr "启用 NetworkManager"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:775
+#: src/modules/Lan.rb:779
msgid "Support for IPv6 protocol is enabled"
msgstr "已启用 IPv6 协议支持"
#. disable ipv6 support
-#: src/modules/Lan.rb:777
+#: src/modules/Lan.rb:781
msgid "Disable IPv6"
msgstr "禁用 IPv6"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:781
+#: src/modules/Lan.rb:785
msgid "Support for IPv6 protocol is disabled"
msgstr "禁用了对 IPv6 协议的支持"
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:199
+#: src/modules/LanItems.rb:198
msgid "connected"
msgstr "已连接"
-#: src/modules/LanItems.rb:200
+#: src/modules/LanItems.rb:199
msgid "datagram"
msgstr "数据报"
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
msgid "Started automatically at boot"
msgstr "引导时自动启动"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1280
msgid "Started automatically on cable connection"
msgstr "连接网线时自动启动"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1284
msgid "Managed by NetworkManager"
msgstr "由 NetworkManager 管理"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1284
+#: src/modules/LanItems.rb:1288
msgid "Will not be started at all"
msgstr "根本不会启动"
-#: src/modules/LanItems.rb:1290
+#: src/modules/LanItems.rb:1294
msgid "Started manually"
msgstr "手动启动"
#. do nothing
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1306
msgid "IP address assigned using"
msgstr "IP 地址指派自"
-#: src/modules/LanItems.rb:1306
+#: src/modules/LanItems.rb:1310
msgid "IP address: %s/%s"
msgstr "IP 地址:%s/%s"
-#: src/modules/LanItems.rb:1309
+#: src/modules/LanItems.rb:1313
msgid "IP address: %s, subnet mask %s"
msgstr "IP 地址:%s,子网掩码 %s"
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1333
+#: src/modules/LanItems.rb:1337
msgid "Not configured"
msgstr "未配置"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
msgid "Device Name: %s"
msgstr "设备名称:%s"
-#: src/modules/LanItems.rb:1376
+#: src/modules/LanItems.rb:1380
msgid "Bonding slaves"
msgstr "绑定从属"
-#: src/modules/LanItems.rb:1390
+#: src/modules/LanItems.rb:1394
msgid "enslaved in %s"
msgstr "从属于 %s"
-#: src/modules/LanItems.rb:1391
+#: src/modules/LanItems.rb:1395
msgid "Bonding master"
msgstr "绑定主体"
-#: src/modules/LanItems.rb:1405
+#: src/modules/LanItems.rb:1409
msgid "Not connected"
msgstr "未连接"
-#: src/modules/LanItems.rb:1406
+#: src/modules/LanItems.rb:1410
msgid "No hwinfo"
msgstr "无硬件信息"
-#: src/modules/LanItems.rb:1421
-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 ""
-"由于没有内核设备 (eth0, wlan0),无法配置网卡。这大多是缺少固件 (对于 wlan 设"
-"备) 造成的。细节请参考 dmesg 输出。"
-
#: src/modules/LanItems.rb:1427
+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 "由于没有内核设备 (eth0, wlan0),无法配置网卡。这大多是缺少固件 (对于 wlan 设备) 造成的。细节请参考 dmesg 输出。"
+
+#: src/modules/LanItems.rb:1433
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
msgstr "设备尚未配置。请按<b>编辑</b>配置。\n"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1440
msgid "Needed firmware"
msgstr "所需固件"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1440
msgid "unknown"
msgstr "未知"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:159
+#: src/modules/Remote.rb:158
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
@@ -4486,35 +4370,40 @@
"将禁用防火墙设置。"
#. Progress stage 2
-#: src/modules/Remote.rb:199
+#: src/modules/Remote.rb:203
msgid "Configure display manager"
msgstr "配置显示管理器"
#. Progress stage 3
-#: src/modules/Remote.rb:204
+#: src/modules/Remote.rb:208
msgid "Restart the services"
msgstr "重启服务"
-#: src/modules/Remote.rb:207
+#: src/modules/Remote.rb:211
msgid "Saving Remote Administration Configuration"
msgstr "正在保存远程管理配置"
-#: src/modules/Remote.rb:216
+#: src/modules/Remote.rb:220
msgid "Configuring display manager..."
msgstr "正在配置显示管理器..."
-#: src/modules/Remote.rb:220
+#: src/modules/Remote.rb:224
msgid "Restarting the service..."
msgstr "正在重启服务..."
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:246 src/modules/Remote.rb:254
+#. Install required packages
+#: src/modules/Remote.rb:261
msgid "Enabling service %{service} has failed"
msgstr "启动服务 %{service} 失败"
+#: src/modules/Remote.rb:267
+#, fuzzy
+#| msgid "Enabling service %{service} has failed"
+msgid "Disabling service %{service} has failed"
+msgstr "启动服务 %{service} 失败"
+
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:281
+#: src/modules/Remote.rb:295
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4525,11 +4414,11 @@
"请手动重启显示管理器或重新登录。"
#. description in proposal
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:332
msgid "Remote administration is enabled."
msgstr "已启用远程管理。"
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:332
msgid "Remote administration is disabled."
msgstr "已禁用远程管理。"
@@ -4627,9 +4516,7 @@
#~ msgid "Run configuration of %1?"
#~ msgstr "运行 %1 的配置吗?"
-#~ msgid ""
-#~ "AutoYaST setting networking/managed: NetworkManager is not available, "
-#~ "Wicked will be used."
+#~ msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
#~ msgstr "AutoYaST 设置网络/受管:NetworkManager 不可用,将使用 Wicked。"
#~ msgid "Device boot protocol"
@@ -4656,8 +4543,7 @@
#~ msgstr "拔出"
#~ msgid ""
-#~ "Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this "
-#~ "startmode will never\n"
+#~ "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 ""
@@ -4675,20 +4561,15 @@
#~ msgstr ""
#~ "网络目前由 NetworkManager 控制,它的设置不能被 YaST 编辑。\n"
#~ "\n"
-#~ "要编辑设置,请使用 NetworkManager 连接编辑器或切换网络设置方法为传统的 "
-#~ "ifup 方法。\n"
+#~ "要编辑设置,请使用 NetworkManager 连接编辑器或切换网络设置方法为传统的 ifup 方法。\n"
#~ msgid "Device name:"
#~ msgstr "设备名称:"
-#~ msgid ""
-#~ "SSH service will be enabled, SSH port will be open (<a href="
-#~ "\"%1\">disable and close</a>)"
+#~ msgid "SSH service will be enabled, SSH port will be open (<a href=\"%1\">disable and close</a>)"
#~ msgstr "将启用 SSH 服务并打开 SSH 端口 (<a href=\"%1\">禁用并关闭</a>)"
-#~ msgid ""
-#~ "SSH service will be disabled, SSH port will be blocked (<a href="
-#~ "\"%1\">enable and open</a>)"
+#~ msgid "SSH service will be disabled, SSH port will be blocked (<a href=\"%1\">enable and open</a>)"
#~ msgstr "将禁用 SSH 服务并屏蔽 SSH 端口 (<a href=\"%1\">启用并打开</a>)"
#~ msgid "General &Network Settings"
@@ -4784,8 +4665,7 @@
#~ msgid "Bond slaves"
#~ msgstr "绑定从属"
-#~ msgid ""
-#~ "<p>The device is not configured. Press <b>Edit</b> for configuration.</p>"
+#~ msgid "<p>The device is not configured. Press <b>Edit</b> for configuration.</p>"
#~ msgstr "<p>设备尚未配置。请按<b>编辑</b>进行配置。</p>"
#~ msgid ""
@@ -4874,18 +4754,14 @@
#~ "<p>First, choose your <b>PPP mode</b>. This is either\n"
#~ "<i>PPP over Ethernet</i> (PPPoE), <i>PPP over ATM</i> (PPPoATM),\n"
#~ "<i>CAPI for ADSL</i> or <i>Point to Point Tunneling Protocol</i> (PPTP).\n"
-#~ "Use <i>PPP over Ethernet</i> if your DSL modem is connected via ethernet "
-#~ "to your computer.\n"
-#~ "Use <i>Point to Point Tunneling Protocol</i> if you want to connect to a "
-#~ "VPN server.\n"
+#~ "Use <i>PPP over Ethernet</i> if your DSL modem is connected via ethernet to your computer.\n"
+#~ "Use <i>Point to Point Tunneling Protocol</i> if you want to connect to a VPN server.\n"
#~ "If you are not sure which mode to use, ask your provider. </p>"
#~ msgstr ""
#~ "<p>首先,请选择您的 <b>PPP 模式</b>。\n"
-#~ "这可以是 <i>PPP over Ethernet</i> (PPPoE),<i>PPP over ATM</i> "
-#~ "(PPPoATM),\n"
+#~ "这可以是 <i>PPP over Ethernet</i> (PPPoE),<i>PPP over ATM</i> (PPPoATM),\n"
#~ "<i>用于 ADSL 的 CAPI</i> 或者<i>点对点隧道协议</i> (PPTP)。\n"
-#~ "若您的 DSL 调制解调器通过以太网与计算机连接,请用 <i>PPP over Ethernet</"
-#~ "i>。\n"
+#~ "若您的 DSL 调制解调器通过以太网与计算机连接,请用 <i>PPP over Ethernet</i>。\n"
#~ "若您想要连接到一个 VPN 服务器,请用<i>点对点隧道协议</i>。\n"
#~ "若您不确定使用哪种模式,请垂询您的服务提供商。</p>"
@@ -4895,10 +4771,8 @@
#~ msgstr "<p>若您正在使用 <i>PPP over Ethernet</i>,则请先配置以太网卡。</p>"
#~ msgid ""
-#~ "<p>The <b>PPP Mode-Dependent Settings</b> are settings required to set "
-#~ "up\n"
-#~ "your DSL connection. <b>VPI/VCI</b> makes sense only for <i>PPP over ATM</"
-#~ "i>\n"
+#~ "<p>The <b>PPP Mode-Dependent Settings</b> are settings required to set up\n"
+#~ "your DSL connection. <b>VPI/VCI</b> makes sense only for <i>PPP over ATM</i>\n"
#~ "connections, <b>Ethernet Card</b> is needed for <i>PPP over Ethernet</i>\n"
#~ "connections.</p>\n"
#~ msgstr ""
@@ -5045,8 +4919,7 @@
#~ msgid ""
#~ "<P><B><BIG>Adding an ISDN Connection:</BIG></B><BR>\n"
-#~ "If you press <B>Add</B>, you can configure an ISDN dial-up connection.</"
-#~ "P>\n"
+#~ "If you press <B>Add</B>, you can configure an ISDN dial-up connection.</P>\n"
#~ msgstr ""
#~ "<P><B><BIG>添加 ISDN 连接:</BIG></B><BR>\n"
#~ "按<B>添加</B>可以配置 ISDN 拨号连接。</P>\n"
@@ -5073,11 +4946,9 @@
#~ msgstr "ISDN 细节设置"
#~ msgid ""
-#~ "<p>The <b>Remote Phone Number List</b> controls which remote machines "
-#~ "are\n"
+#~ "<p>The <b>Remote Phone Number List</b> controls which remote machines are\n"
#~ "allowed to connect to this interface.</p>\n"
-#~ msgstr ""
-#~ "<p><b>远程电话号码列表</b>控制了允许哪些远程计算机连接到此接口。</p>\n"
+#~ msgstr "<p><b>远程电话号码列表</b>控制了允许哪些远程计算机连接到此接口。</p>\n"
#~ msgid ""
#~ "<p>Deselect <b>Only Listed Numbers Allowed</b> \n"
@@ -5085,36 +4956,26 @@
#~ msgstr "<p>反选<b>只允许列出的号码</b>可允许全部来电 ID。</p>\n"
#~ msgid ""
-#~ "<p>If the callback mode is <b>off</b>, calls are handled normally "
-#~ "without special \n"
+#~ "<p>If the callback mode is <b>off</b>, calls are handled normally without special \n"
#~ "processing.</p>\n"
-#~ msgstr ""
-#~ "<p>若回拨模式为<b>关闭</b>,则将以正常方式处理呼叫,而不进行特殊处理。</"
-#~ "p>\n"
+#~ msgstr "<p>若回拨模式为<b>关闭</b>,则将以正常方式处理呼叫,而不进行特殊处理。</p>\n"
#~ msgid ""
-#~ "<p>If the callback mode is <b>server</b>, after getting an incoming call, "
-#~ "a callback \n"
+#~ "<p>If the callback mode is <b>server</b>, after getting an incoming call, a callback \n"
#~ "is triggered.</p>\n"
#~ msgstr "<p>若回拨模式为<b>服务器</b>,则将在收到来电后触发回拨。</p>\n"
#~ msgid ""
-#~ "<p>If the callback mode is <b>client</b>, the local system does the "
-#~ "initial call then \n"
+#~ "<p>If the callback mode is <b>client</b>, the local system does the initial call then \n"
#~ "waits for callback from the remote machine.</p>\n"
-#~ msgstr ""
-#~ "<p>若回拨模式为<b>客户端</b>,则本地系统将进行初始呼叫,然后等待来自远程计"
-#~ "算机的回拨。</p>\n"
+#~ msgstr "<p>若回拨模式为<b>客户端</b>,则本地系统将进行初始呼叫,然后等待来自远程计算机的回拨。</p>\n"
#~ msgid ""
-#~ "<p><b>Callback Delay</b> is the number of seconds between the initial "
-#~ "call and the\n"
-#~ "callback (server) or the hang-up (client). It should be greater on the "
-#~ "server than on\n"
+#~ "<p><b>Callback Delay</b> is the number of seconds between the initial call and the\n"
+#~ "callback (server) or the hang-up (client). It should be greater on the server than on\n"
#~ "the client.</p>\n"
#~ msgstr ""
-#~ "<p><b>回拨延迟</b>是指在初始呼叫和回拨 (服务器) 或挂断 (客户端) 之间的秒"
-#~ "数。\n"
+#~ "<p><b>回拨延迟</b>是指在初始呼叫和回拨 (服务器) 或挂断 (客户端) 之间的秒数。\n"
#~ "这段时间在服务器上比在客户端上要长。</p>\n"
#~ msgid ""
@@ -5152,13 +5013,11 @@
#~ msgstr "ISDN 服务选择"
#~ msgid ""
-#~ "<p>If you have a combined ISDN and DSL CAPI controller, configure your "
-#~ "DSL\n"
+#~ "<p>If you have a combined ISDN and DSL CAPI controller, configure your DSL\n"
#~ "connection via <b>Add DSL CAPI Interface</b>. You can also do this later\n"
#~ "in the DSL configuration dialog.</p>\n"
#~ msgstr ""
-#~ "<p>若您有一个组合式 ISDN 和 DSL CAPI 控制器,请通过<b>添加 DSL CAPI 接口</"
-#~ "b>配置您的 DSL 连接。\n"
+#~ "<p>若您有一个组合式 ISDN 和 DSL CAPI 控制器,请通过<b>添加 DSL CAPI 接口</b>配置您的 DSL 连接。\n"
#~ "您也可以稍后在 DSL 配置对话框中这么做。</p>\n"
#~ msgid ""
@@ -5167,17 +5026,14 @@
#~ "the default for all common Internet providers.</p>\n"
#~ msgstr ""
#~ "<p>通过 ISDN 上网有两种类型的接口:<b>RawIP</b> 和 <b>SyncPPP</b>。\n"
-#~ "大多数情况下使用 SyncPPP。全部常见互联网服务提供商默认均使用 SyncPPP。</"
-#~ "p>\n"
+#~ "大多数情况下使用 SyncPPP。全部常见互联网服务提供商默认均使用 SyncPPP。</p>\n"
#~ msgid ""
#~ "<p>To switch between various Internet providers, an\n"
-#~ "interface for each provider is not required. Simply add multiple "
-#~ "providers to the\n"
+#~ "interface for each provider is not required. Simply add multiple providers to the\n"
#~ "same interface.</p>\n"
#~ msgstr ""
-#~ "<p>要在多个互联网服务提供商间切换,不需要为每个服务提供商都指定一个接"
-#~ "口。\n"
+#~ "<p>要在多个互联网服务提供商间切换,不需要为每个服务提供商都指定一个接口。\n"
#~ "只需要将多个服务提供商添加到同一接口即可。</p>\n"
#~ msgid ""
@@ -5219,19 +5075,14 @@
#~ msgid ""
#~ "<p>My phone number -- As your own telephone number (MSN), put in your \n"
-#~ "telephone number (without area code) if your ISDN card is connected "
-#~ "directly\n"
-#~ "to the phone company-provided socket. If it is connected to a PBX, put in "
-#~ "the\n"
-#~ "MSN stored in the PBX (e.g., your phone extension or the last digit or "
-#~ "digits\n"
-#~ "of your phone extension) . If this fails, try using 0, which normally "
-#~ "means\n"
+#~ "telephone number (without area code) if your ISDN card is connected directly\n"
+#~ "to the phone company-provided socket. If it is connected to a PBX, put in the\n"
+#~ "MSN stored in the PBX (e.g., your phone extension or the last digit or digits\n"
+#~ "of your phone extension) . If this fails, try using 0, which normally means\n"
#~ "the default MSN is actually used.</p>"
#~ msgstr ""
#~ "<p>我的电话号码 -- 作为您自己的电话号码 (MSN),\n"
-#~ "若您的 ISDN 卡直接与电话公司提供的插口相连,则请输入您的电话号码 (不带区"
-#~ "号)。\n"
+#~ "若您的 ISDN 卡直接与电话公司提供的插口相连,则请输入您的电话号码 (不带区号)。\n"
#~ "若您的 ISDN 卡与 PBX 相连,则请输入存储在 PBX 中的 MSN (例如,您的分机或\n"
#~ "分机的最后一位或几位数字)。\n"
#~ "若这么做失败了,可尝试使用 0,其通常表示使用默认的 MSN。</p>"
@@ -5246,8 +5097,7 @@
#~ "</tt>\n"
#~ "Note: ippp0 is an example</p>"
#~ msgstr ""
-#~ "<p>若您选择了手动方式,可以发出以下命令启动和停止服务 (当以 'root' 登入"
-#~ "时):\n"
+#~ "<p>若您选择了手动方式,可以发出以下命令启动和停止服务 (当以 'root' 登入时):\n"
#~ "<tt>\n"
#~ " <br> <b>启动:</b>ifup ippp0\n"
#~ " <br> <b>停止:</b>ifdown ippp0\n"
@@ -5257,18 +5107,15 @@
#~ msgid ""
#~ "<p>Selecting <b>channel bundling</b> sets up a 128-kBit connection\n"
-#~ "also known as Multilink PPP. To activate or deactivate the second "
-#~ "channel,\n"
+#~ "also known as Multilink PPP. To activate or deactivate the second channel,\n"
#~ "use the following commands:\n"
#~ "<tt>\n"
#~ " <br> isdnctrl addlink ippp0\n"
#~ " <br> isdnctrl removelink ippp0\n"
#~ " <br>\n"
#~ "</tt>\n"
-#~ "You can also install the package <b>xibod</b> to have this happen "
-#~ "automatically. If\n"
-#~ "there is a demand for more bandwidth, it adds a channel. If the traffic "
-#~ "goes down, it \n"
+#~ "You can also install the package <b>xibod</b> to have this happen automatically. If\n"
+#~ "there is a demand for more bandwidth, it adds a channel. If the traffic goes down, it \n"
#~ "removes a channel.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -5288,8 +5135,7 @@
#~ "<p>Selecting\n"
#~ "<b>External Firewall Interface</b> activates the firewall\n"
#~ "and sets this interface as external.\n"
-#~ "<b>Restart Firewall</b> restarts the firewall if a connection is "
-#~ "established.\n"
+#~ "<b>Restart Firewall</b> restarts the firewall if a connection is established.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>选择<b>外部防火墙接口</b>可激活防火墙并将此接口设为外部接口。\n"
@@ -5326,9 +5172,7 @@
#~ msgid ""
#~ "<p>Enter the IP addresses if you received a fixed IP address\n"
#~ "from your provider for syncppp or you use raw IP.</p>\n"
-#~ msgstr ""
-#~ "<p>若您从服务提供商处收到了一个用于 syncppp 的固定 IP 地址或您使用裸 IP 请"
-#~ "输入 IP 地址。</p>\n"
+#~ msgstr "<p>若您从服务提供商处收到了一个用于 syncppp 的固定 IP 地址或您使用裸 IP 请输入 IP 地址。</p>\n"
#~ msgid ""
#~ "<p>Check <b>Dynamic IP Address</b> if your provider\n"
@@ -5337,8 +5181,7 @@
#~ "This is the default with most providers.\n"
#~ "</p>\n"
#~ msgstr ""
-#~ "<p>若服务提供商在每次连接时为您指派一个临时地址则请勾选<b>动态 IP 地址</"
-#~ "b>。\n"
+#~ "<p>若服务提供商在每次连接时为您指派一个临时地址则请勾选<b>动态 IP 地址</b>。\n"
#~ "在这种情况下,外发地址直到链接建立前的那个时刻前都是未知的。\n"
#~ "这时多数服务提供商的默认设置。\n"
#~ "</p>\n"
@@ -5410,11 +5253,9 @@
#~ msgid ""
#~ "<p>If you have an old legacy ISA card, you can enter values for\n"
#~ "IO port or memory addresses and the used interrupt.\n"
-#~ "For the correct values, check with your technical manual or contact your "
-#~ "salesman.</p>\n"
+#~ "For the correct values, check with your technical manual or contact your salesman.</p>\n"
#~ msgstr ""
-#~ "<p>若您有一块旧版 ISA 卡,您可以输入 IO 端口号或内存地址以及所用中断的"
-#~ "值。\n"
+#~ "<p>若您有一块旧版 ISA 卡,您可以输入 IO 端口号或内存地址以及所用中断的值。\n"
#~ "要获得正确的值,请阅读您 ISA 卡的技术手册或与销售商联系。</p>\n"
#~ msgid ""
@@ -5435,28 +5276,22 @@
#~ "<p>您的 ISDN 卡存在多个驱动。\n"
#~ "请从列表中选择一个。</p>\n"
-#~ msgid ""
-#~ "<p><b>ISDN Protocol: </b>In most cases, the protocol is Euro-ISDN.</p>"
+#~ msgid "<p><b>ISDN Protocol: </b>In most cases, the protocol is Euro-ISDN.</p>"
#~ msgstr "<p><b>ISDN 协议:</b>在多数情况下,此协议为 Euro-ISDN。</p>"
#~ msgid ""
#~ "<p><b>Area Code: </b> Enter your local area code for the ISDN\n"
#~ "line here, without a leading zero and without a country prefix.</p>\n"
-#~ msgstr ""
-#~ "<p><b>区号:</b>在此输入 ISDN 线路的本地区号,不包括最前面的 0 和国家/地区"
-#~ "前缀。</p>\n"
+#~ msgstr "<p><b>区号:</b>在此输入 ISDN 线路的本地区号,不包括最前面的 0 和国家/地区前缀。</p>\n"
#~ msgid ""
#~ "<p><b>Dial Prefix: </b> If you need a prefix to get an public line, \n"
-#~ "enter it here. This is only used on a internal S0 bus and the most common "
-#~ "one is \"0\".</p>\n"
+#~ "enter it here. This is only used on a internal S0 bus and the most common one is \"0\".</p>\n"
#~ msgstr ""
#~ "<p><b>拨号前缀:</b>若您需要前缀以获取公用线路,请在此输入。\n"
#~ "此前缀仅在内部 S0 总线上使用,最常见的是 \"0\"。</p>\n"
-#~ msgid ""
-#~ "<p>If you do not want to log all your ISDN traffic, uncheck <b>Start ISDN "
-#~ "Log</b>.</p>"
+#~ msgid "<p>If you do not want to log all your ISDN traffic, uncheck <b>Start ISDN Log</b>.</p>"
#~ msgstr "<p>若您不想要记录全部 ISDN 流量,请反选<b>启动 ISDN 日志</b>。</p>"
#~ msgid "ISDN Protocol"
@@ -5652,10 +5487,8 @@
#~ msgstr "<p>请输入全部调制解调器配置值。</p>"
#~ msgid ""
-#~ "<p><b>Modem Device</b> specifies to which port your modem is connected. "
-#~ "ttyS0,\n"
-#~ "ttyS1, etc., refer to serial ports and usually correspond to COM1, COM2, "
-#~ "etc.,\n"
+#~ "<p><b>Modem Device</b> specifies to which port your modem is connected. ttyS0,\n"
+#~ "ttyS1, etc., refer to serial ports and usually correspond to COM1, COM2, etc.,\n"
#~ "in DOS/Windows. ttyACM0 and ttyACM1 refer to USB ports.</p>"
#~ msgstr ""
#~ "<p><b>调制解调器设备</b>指定了您调制解调器连接的端口。\n"
@@ -5665,18 +5498,13 @@
#~ msgid ""
#~ "<p>If you are on a PBX, you probably need to enter a <b>Dial Prefix</b>.\n"
#~ "Often, this is <i>9</i> or <i>0</i>.</p>\n"
-#~ msgstr ""
-#~ "<p>若您位于 PBX 上,您可能需要输入一个<b>拨号前缀</b>,通常是 <i>9</i> 或 "
-#~ "<i>0</i>。</p>\n"
+#~ msgstr "<p>若您位于 PBX 上,您可能需要输入一个<b>拨号前缀</b>,通常是 <i>9</i> 或 <i>0</i>。</p>\n"
#~ msgid ""
#~ "<p>Choose <b>Dial Mode</b> according to your phone link. Most telephone\n"
-#~ "companies use <i>Tone Dial</i> as the <b>Dial Mode</b>. Check the "
-#~ "additional\n"
-#~ "check boxes to turn on your modem speaker (<i>Speaker On</i>) or for "
-#~ "your\n"
-#~ "modem to wait until it detects a dial tone (<i>Detect Dial Tone</i>).</"
-#~ "p>\n"
+#~ "companies use <i>Tone Dial</i> as the <b>Dial Mode</b>. Check the additional\n"
+#~ "check boxes to turn on your modem speaker (<i>Speaker On</i>) or for your\n"
+#~ "modem to wait until it detects a dial tone (<i>Detect Dial Tone</i>).</p>\n"
#~ msgstr ""
#~ "<p>根据您的电话连接方式选择<b>拨号模式</b>。\n"
#~ "大多数电话公司使用<i>音频拨号</i>作为<b>拨号模式</b>。\n"
@@ -5728,8 +5556,7 @@
#~ msgid ""
#~ "<p>All the relevant information about <b>Init Strings</b>\n"
#~ "should be in your modem manual.</p>\n"
-#~ msgstr ""
-#~ "<p><b>初始化字符串</b>的全部相关信息应该在您的调制解调器手册中。</p>\n"
+#~ msgstr "<p><b>初始化字符串</b>的全部相关信息应该在您的调制解调器手册中。</p>\n"
#~ msgid "B&aud Rate"
#~ msgstr "波特率(&A)"
@@ -5772,12 +5599,9 @@
#~ msgid ""
#~ "<p><b>Dial on Demand</b> means that the Internet\n"
-#~ "connection will be established automatically when data from the Internet "
-#~ "is\n"
-#~ "requested. To use this feature, specify at least one <i>name server</i>. "
-#~ "Use\n"
-#~ "this feature only if your Internet connection is inexpensive, because "
-#~ "there are\n"
+#~ "connection will be established automatically when data from the Internet is\n"
+#~ "requested. To use this feature, specify at least one <i>name server</i>. Use\n"
+#~ "this feature only if your Internet connection is inexpensive, because there are\n"
#~ "programs that periodically request data from the Internet.</p>"
#~ msgstr ""
#~ "<p><b>按需拨号</b>意味着当请求来自互联网的数据时自动建立互联网连接。\n"
@@ -5788,9 +5612,7 @@
#~ msgid ""
#~ "<p>When <b>Modify DNS</b> is enabled, the <i>name server</i> will be\n"
#~ "changed automatically when connected to the Internet.</p>"
-#~ msgstr ""
-#~ "<p>若启用了<b>修改 DNS</b>,则会在连接到互联网时自动修改<i>名称服务器</"
-#~ "i>。</p>"
+#~ msgstr "<p>若启用了<b>修改 DNS</b>,则会在连接到互联网时自动修改<i>名称服务器</i>。</p>"
#~ msgid ""
#~ "<p>If the provider does not transmit its domain name server (DNS)\n"
@@ -5802,8 +5624,7 @@
#~ msgid ""
#~ "<p><b>Name Servers</b> are required to convert hostnames\n"
-#~ "(such as www.suse.com) to IP addresses (for example, 213.95.15.200). You "
-#~ "only\n"
+#~ "(such as www.suse.com) to IP addresses (for example, 213.95.15.200). You only\n"
#~ "need to specify the name servers if you enable dial on demand or\n"
#~ "disable <b>DNS Modification</b> when connected.</p>\n"
#~ msgstr ""
@@ -5813,10 +5634,8 @@
#~ "则只需指定名称服务器。</p>\n"
#~ msgid ""
-#~ "<p><b>Ignore Prompts</b> disables the detection of any prompts from the "
-#~ "dial-up\n"
-#~ "server. If the connection build-up is slow or does not work at all, try "
-#~ "this\n"
+#~ "<p><b>Ignore Prompts</b> disables the detection of any prompts from the dial-up\n"
+#~ "server. If the connection build-up is slow or does not work at all, try this\n"
#~ "option.</p>\n"
#~ msgstr ""
#~ "<p><b>忽略提示</b>禁用了对来自拨号服务器的任何提示的检测。\n"
@@ -5833,11 +5652,8 @@
#~ msgid ""
#~ "<p>The <b>Idle Time-Out</b> specifies the time after which an idle\n"
-#~ "connection will be shut down (0 means the connection will not time-out).</"
-#~ "p>\n"
-#~ msgstr ""
-#~ "<p><b>空闲超时</b>指定了在多长时间后将关闭空闲连接 (0 意味着连接永不超"
-#~ "时)。</p>\n"
+#~ "connection will be shut down (0 means the connection will not time-out).</p>\n"
+#~ msgstr "<p><b>空闲超时</b>指定了在多长时间后将关闭空闲连接 (0 意味着连接永不超时)。</p>\n"
#~ msgid "min"
#~ msgstr "分钟"
@@ -5900,23 +5716,18 @@
#~ msgid ""
#~ "<p>Check <b>Dynamic IP Address</b>\n"
-#~ "if your provider assigns one temporary address per connection. In this "
-#~ "case,\n"
-#~ "the outgoing address is unknown until the moment the link is "
-#~ "established.\n"
+#~ "if your provider assigns one temporary address per connection. In this case,\n"
+#~ "the outgoing address is unknown until the moment the link is established.\n"
#~ "This is the default with most providers.</p>"
#~ msgstr ""
-#~ "<p>若您的服务提供商在每次连接时都指派一个临时地址,则请勾选<b>动态 IP 地址"
-#~ "</b>。\n"
+#~ "<p>若您的服务提供商在每次连接时都指派一个临时地址,则请勾选<b>动态 IP 地址</b>。\n"
#~ "在这种情况下,外发地址直到连接建立前都是未知的。\n"
#~ "这是大多数服务提供商的默认设置。</p>"
#~ msgid ""
#~ "<p>Check <b>Use Peer DNS</b> to change\n"
-#~ "your domain name servers after the connection is made. This replaces your "
-#~ "static\n"
-#~ "DNS configuration with the obtained DNS server IP addresses. Today, "
-#~ "almost all\n"
+#~ "your domain name servers after the connection is made. This replaces your static\n"
+#~ "DNS configuration with the obtained DNS server IP addresses. Today, almost all\n"
#~ "providers support <b>Use Peer DNS</b>.</p>\n"
#~ msgstr ""
#~ "<p>连接后,勾选<b>使用对等点 DNS</b> 来修改您的域名服务器。\n"
@@ -5924,28 +5735,23 @@
#~ "现在几乎全部服务提供商都支持<b>使用对等点 DNS</b>。</p>\n"
#~ msgid ""
-#~ "<p>If callback mode is off, calls are handled normally without "
-#~ "special \n"
+#~ "<p>If callback mode is off, calls are handled normally without special \n"
#~ "processing.</p>"
#~ msgstr "<p>若回拨模式为关,则将正常处理呼叫不作特殊处理。</p>"
#~ msgid ""
-#~ "<p>If callback mode is server, after getting an incoming call, a "
-#~ "callback \n"
+#~ "<p>If callback mode is server, after getting an incoming call, a callback \n"
#~ "is triggered.</p>"
#~ msgstr "<p>若回拨模式为服务器,则将在收到来电后触发回拨。</p>"
#~ msgid ""
#~ "If callback mode is client, the local system does the initial call then \n"
#~ "waits for callback from the remote machine.\n"
-#~ msgstr ""
-#~ "若回拨模式为客户端,则本地系统将进行初始呼叫,然后等待来自远程计算机的回"
-#~ "拨。\n"
+#~ msgstr "若回拨模式为客户端,则本地系统将进行初始呼叫,然后等待来自远程计算机的回拨。\n"
#~ msgid ""
#~ "<p>Check <b>Default Route</b> to set the default\n"
-#~ "route for this provider. This is most likely correct unless you want to "
-#~ "reach\n"
+#~ "route for this provider. This is most likely correct unless you want to reach\n"
#~ "single machines or subnetworks through this provider.</p>"
#~ msgstr ""
#~ "<p>勾选<b>默认路由</b>为此服务提供商设置默认路由。\n"
@@ -6076,8 +5882,7 @@
#~ msgid ""
#~ "<p>To register for <b>%1</b> and find the best\n"
#~ "dialing number, call the hot line <b>%2</b>.</p>\n"
-#~ msgstr ""
-#~ "<p>要注册 <b>%1</b> 并找到最佳拨号号码,请拨打热线 <b>%2</b>。</p>\n"
+#~ msgstr "<p>要注册 <b>%1</b> 并找到最佳拨号号码,请拨打热线 <b>%2</b>。</p>\n"
#~ msgid "Provider Parameters"
#~ msgstr "服务提供商参数"
@@ -6093,17 +5898,13 @@
#~ msgstr "<p>请为服务提供商输入一个<b>服务提供商名称</b>。</p>"
#~ msgid ""
-#~ "<p>Enter a <b>Provider Name</b> for the provider and a <b>Phone Number</"
-#~ "b>\n"
+#~ "<p>Enter a <b>Provider Name</b> for the provider and a <b>Phone Number</b>\n"
#~ "to access your provider.</p>"
-#~ msgstr ""
-#~ "<p>请为服务提供商输入一个<b>服务提供商名称</b>和一个<b>电话号码</b>以访问"
-#~ "您的服务提供商。</p>"
+#~ msgstr "<p>请为服务提供商输入一个<b>服务提供商名称</b>和一个<b>电话号码</b>以访问您的服务提供商。</p>"
#~ msgid ""
#~ "<p>Select the type of packet encapsulation.\n"
-#~ "<b>RawIP</b> means that MAC headers are stripped. <b>SyncPPP</b> stands "
-#~ "for\n"
+#~ "<b>RawIP</b> means that MAC headers are stripped. <b>SyncPPP</b> stands for\n"
#~ "Synchronous PPP.</p>"
#~ msgstr ""
#~ "<p>选择包封装类型。\n"
@@ -6123,22 +5924,18 @@
#~ msgid ""
#~ "<p>Enter the <b>User Name</b> and the\n"
#~ "<b>Password</b> to use as the login (ask your provider if unsure).</p>"
-#~ msgstr ""
-#~ "<p>请输入登入时所用的<b>用户名</b>和<b>密码</b> (若不确定请垂询您的服务提"
-#~ "供商)。</p>"
+#~ msgstr "<p>请输入登入时所用的<b>用户名</b>和<b>密码</b> (若不确定请垂询您的服务提供商)。</p>"
#~ msgid ""
#~ "<p>The <b>User Name</b> will be extended\n"
-#~ "with the <i>t-online-com/</i> at the start and with <i>@t-online-com.de</"
-#~ "i>\n"
+#~ "with the <i>t-online-com/</i> at the start and with <i>@t-online-com.de</i>\n"
#~ "at the end.</p>"
#~ msgstr ""
#~ "<p><b>用户名</b>开头将扩展为 <i>t-online-com/</i>,\n"
#~ "结尾将扩展为 <i>@t-online-com.de</i>。</p>"
#~ msgid ""
-#~ "<p>Check <b>Always Ask for Password</b> to be asked for the password "
-#~ "every time.\n"
+#~ "<p>Check <b>Always Ask for Password</b> to be asked for the password every time.\n"
#~ "Your\n"
#~ "Internet service provider might not allow passwords to be saved on\n"
#~ "disk. If you enter the password here, it is saved in clear text on disk\n"
@@ -6221,8 +6018,7 @@
#~ "请使用 KInternet (不用 NetworkManager),或将密码保存在系统上。\n"
#~ msgid ""
-#~ "You have entered some characters that are not numbers in the phone "
-#~ "field.\n"
+#~ "You have entered some characters that are not numbers in the phone field.\n"
#~ "\n"
#~ "Continue?"
#~ msgstr ""
@@ -6236,47 +6032,38 @@
#~ msgid ""
#~ "<p>In the <b>User Name</b> field, replace the blank space\n"
#~ "(after the <b>/</b>) with your Kamp login. Then enter your password\n"
-#~ "and click <b>Next</b>. Contact your provider if you have difficulties.</"
-#~ "p>\n"
+#~ "and click <b>Next</b>. Contact your provider if you have difficulties.</p>\n"
#~ msgstr ""
#~ "<p>在<b>用户名</b>字段中,用您的 Kamp 登录名替换空格 (<b>/</b> 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</"
-#~ "p>\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
#~ msgid "<p>Access AOL-DSL.</p>"
#~ msgstr "<p>AOL-DSL 连接</p>"
#~ msgid ""
#~ "<p>In the <b>User Name</b> field, replace the blank space (before\n"
-#~ "the <b>@</b>) with your AOL login. Then enter your password and click "
-#~ "<b>Next</b>.\n"
-#~ "If you are a new AOL customer and want to dial up for the first time, you "
-#~ "need\n"
-#~ "to enter your AOL PIN number once. If you have a Windows system, you can "
-#~ "enter\n"
-#~ "the PIN in the AOL dial-up software. If not, call the AOL hot line and "
-#~ "request\n"
+#~ "the <b>@</b>) with your AOL login. Then enter your password and click <b>Next</b>.\n"
+#~ "If you are a new AOL customer and want to dial up for the first time, you need\n"
+#~ "to enter your AOL PIN number once. If you have a Windows system, you can enter\n"
+#~ "the PIN in the AOL dial-up software. If not, call the AOL hot line and request\n"
#~ "the AOL staff to enter the PIN number for you.</p>\n"
#~ msgstr ""
#~ "<p>在<b>用户名</b>字段中,用您的 AOL 登录名替换空格 (<b>@</b> 前面)。\n"
#~ "然后您的输入密码并点击<b>下一步</b>。\n"
#~ "您若是 AOL 新客户并想要进行首次拨号,则需要输入一次您的 AOL PIN 号码。\n"
#~ "您若有 Windows 系统,则可在 AOL 拨号软件中输入 PIN。\n"
-#~ "若没有 Windows 系统,则可拨打 AOL 热线并请求 AOL 工作人员为您输入 PIN 号"
-#~ "码。</p>\n"
+#~ "若没有 Windows 系统,则可拨打 AOL 热线并请求 AOL 工作人员为您输入 PIN 号码。</p>\n"
#~ msgid "<p>Access to Kamp 1&1 DSL.</p>"
#~ msgstr "<p>Kamp 1&1 DSL 连接</p>"
#~ msgid ""
#~ "<p>In the <b>User Name</b> field, replace the blank space (after\n"
-#~ "the <b>/</b>) with your 1&1 login. Then enter your password and click "
-#~ "<b>Next</b>.\n"
+#~ "the <b>/</b>) with your 1&1 login. Then enter your password and click <b>Next</b>.\n"
#~ "Contact your provider if you have difficulties.</p>\n"
#~ msgstr ""
#~ "<p>在<b>用户名</b>字段中,用您的 1&1 登录名替换空格 (<b>/</b> 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</"
-#~ "p>\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
#~ msgid "<p>Access to Kamp Eggenet DSL.</p>"
#~ msgstr "<p>Kamp Eggenet DSL 连接</p>"
@@ -6293,14 +6080,11 @@
#~ msgid ""
#~ "<p>In the <b>User Name</b> field, replace the blank space (after\n"
-#~ "the <b>/</b>) with your T-Online Business login. Then enter your password "
-#~ "and\n"
+#~ "the <b>/</b>) with your T-Online Business login. Then enter your password and\n"
#~ "click <b>Next</b>. Contact your provider if you have difficulties.</p>\n"
#~ msgstr ""
-#~ "<p>在<b>用户名</b>字段中,用您的 T-Online Business 登录名替换空格 (<b>/</"
-#~ "b> 后面)。\n"
-#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</"
-#~ "p>\n"
+#~ "<p>在<b>用户名</b>字段中,用您的 T-Online Business 登录名替换空格 (<b>/</b> 后面)。\n"
+#~ "然后输入您的密码并点击<b>下一步</b>。若遇到困难请垂询您的服务提供商。</p>\n"
#~ msgid "Provider Configuration"
#~ msgstr "服务提供商配置"
@@ -6311,17 +6095,14 @@
#~ msgid ""
#~ "<p><b><big>Device Control</big></b></p>\n"
#~ "<p>Usually, only the system administrator is allowed to activate and\n"
-#~ "deactivate a network interface. With <b>Enable Device Control for Non-"
-#~ "root User\n"
-#~ "Via QInternet</b>, any user may control the interface via QInternet.This "
-#~ "will require\n"
+#~ "deactivate a network interface. With <b>Enable Device Control for Non-root User\n"
+#~ "Via QInternet</b>, any user may control the interface via QInternet.This will require\n"
#~ "<b>smpppd</b> installed and running.</p>\n"
#~ msgstr ""
#~ "<p><b><big>设备控制</big></b></p>\n"
#~ "<p>通常只允许系统管理员激活和取消激活网络接口。\n"
#~ "启用<b>通过 QInternet 为非 root 用户启用设备控制</b>后,\n"
-#~ "任何用户都可以通过 QInternet 控制接口。这需要安装和运行 <b>smpppd</b>。</"
-#~ "p>\n"
+#~ "任何用户都可以通过 QInternet 控制接口。这需要安装和运行 <b>smpppd</b>。</p>\n"
#~ msgid "Initializing DSL Configuration"
#~ msgstr "正在初始化 DSL 配置"
@@ -6664,8 +6445,7 @@
#~ "万维网 (WWW) 的代理服务器的名称。</p>\n"
#~ msgid ""
-#~ "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your "
-#~ "secured access\n"
+#~ "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured access\n"
#~ "to the World Wide Web (WWW).</p>\n"
#~ msgstr ""
#~ "<p><b>HTTP 代理 URL</b> 是代理服务器的名称,\n"
@@ -6683,8 +6463,7 @@
#, fuzzy
#~| msgid ""
-#~| "<p>If you have the <b>Use the Same Proxy for All Protocols</b> option "
-#~| "checked, it is\n"
+#~| "<p>If you have the <b>Use the Same Proxy for All Protocols</b> option checked, it is\n"
#~| "enough to fill in the HTTP proxy URL. It will be used for all protocols\n"
#~| "(HTTP, HTTPS and FTP).\n"
#~ msgid ""
@@ -6709,13 +6488,11 @@
#~| msgid ""
#~| "<p>If you are using a proxy server with authorization, enter\n"
#~| "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-#~| "consists of printable ASCII characters (except for quotation marks) only."
-#~| "</p>\n"
+#~| "consists of printable ASCII characters (except for quotation marks) only.</p>\n"
#~ msgid ""
#~ "<p>If you are using a proxy server with authorization, enter\n"
#~ "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-#~ "consists of printable ASCII characters only (except for quotation marks)."
-#~ "</p>\n"
+#~ "consists of printable ASCII characters only (except for quotation marks).</p>\n"
#~ msgstr ""
#~ "<p>如果使用的代理服务器需要授权,则输入\n"
#~ "<b>代理用户名</b>和<b>代理口令</b>。有效用户名\n"
@@ -6800,8 +6577,7 @@
#, fuzzy
#~ msgid ""
#~ "<p><b>Udev Rules</b> are rules for the Kernel device manager that allow\n"
-#~ "associating MAC address or BusID of the network device with its name (for "
-#~ "example,\n"
+#~ "associating MAC address or BusID of the network device with its name (for example,\n"
#~ "eth1, wlan0 ) and assures a persistent device name upon reboot.\n"
#~ msgstr ""
#~ "<p><b>Udev 规则</b> 用于内核设备管理器的规则,这允许\n"
@@ -6813,16 +6589,11 @@
#, 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"
-#~ "the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix "
-#~ "<tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0</"
-#~ "tt> and <tt>/32</tt>.Optionally, you can enter\n"
-#~ "a fully qualified hostname for this IP address. The hostname will be "
-#~ "written to <tt>/etc/hosts</tt>.</p>\n"
+#~ "<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"
+#~ "the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix <tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0</tt> and <tt>/32</tt>.Optionally, you can enter\n"
+#~ "a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>\n"
#~ msgstr ""
-#~ "<p>对于<b>静态地址设置</b>, 请输入您的计算机的 IP 地址(例如,"
-#~ "<tt>192.168.100.99</tt>)、\n"
+#~ "<p>对于<b>静态地址设置</b>, 请输入您的计算机的 IP 地址(例如,<tt>192.168.100.99</tt>)、\n"
#~ "网络掩码(通常是 <tt>255.255.255.0</tt>)。此外,您可以为这个 IP 地址\n"
#~ "输入一个合格的主机名。主机名将被写入<tt>/etc/hosts</tt>。</p>\n"
@@ -6843,16 +6614,13 @@
#~ msgstr "网络掩码(&N)"
#, fuzzy
-#~ msgid ""
-#~ "<p>Enable <b>IP Forwarding</b> if the system is a router. This will apply "
-#~ "on both IPv4 and IPv6.</p>"
+#~ msgid "<p>Enable <b>IP Forwarding</b> if the system is a router. This will apply on both IPv4 and IPv6.</p>"
#~ msgstr "<p>如果系统是路由器,请启用 <b>IP 转发</b>。</p>"
#, fuzzy
#~ msgid ""
#~ "<p>Your hostname will be written to <tt>/etc/hosts</tt> and will be \n"
-#~ "resolvable as <tt>127.0.0.2</tt> IP address. To disable this "
-#~ "modification, \n"
+#~ "resolvable as <tt>127.0.0.2</tt> IP address. To disable this modification, \n"
#~ "uncheck <b>Write Hostname to /etc/hosts</b> box. In that case your \n"
#~ "hostname will not be resolvable without an active network.\n"
#~ "</p> \n"
@@ -6890,8 +6658,7 @@
#~ msgid ""
#~ "<p>Configure your Internet proxy (caching) settings here.</p>\n"
-#~ "<p><b>Note:</b> In some cases you may need to relogin for the settings to "
-#~ "take effect</p>"
+#~ "<p><b>Note:</b> In some cases you may need to relogin for the settings to take effect</p>"
#~ msgstr ""
#~ "<p>在此设置互联网代理(缓存)。</p>\n"
#~ "<p><b>注意:</b>在某些情况下,您需要重新登录才能让设置生效</p>"
@@ -6912,11 +6679,8 @@
#~ msgstr "正在运行 KInternet..."
#, fuzzy
-#~ msgid ""
-#~ "<p>The <b>%1</b> packages must be installed because device control for "
-#~ "non-root users has been established.</p>"
-#~ msgstr ""
-#~ "<p>由于要让非 root 用户也能够控制设备,必须安装 <b>%1</b> 软件包。</p>"
+#~ msgid "<p>The <b>%1</b> packages must be installed because device control for non-root users has been established.</p>"
+#~ msgstr "<p>由于要让非 root 用户也能够控制设备,必须安装 <b>%1</b> 软件包。</p>"
#~ msgid "<p>Do you want to install it now?</p>"
#~ msgstr "<p>是否要立即安装?</p>"
@@ -6926,10 +6690,8 @@
#~ "Download of latest release notes failed due to server-side error. \n"
#~ "This does not necessarily mean misconfigured network.\n"
#~ "\n"
-#~ "Click <b>Continue</b> to proceed to the next installation step. To skip "
-#~ "any steps\n"
-#~ "requiring internet connection or to get back to your network "
-#~ "configuration,\n"
+#~ "Click <b>Continue</b> to proceed to the next installation step. To skip any steps\n"
+#~ "requiring internet connection or to get back to your network configuration,\n"
#~ "click <b>Cancel</b>."
#~ msgstr ""
#~ "由于服务器方面的错误,下载最新的发行说明失败。\n"
@@ -6951,8 +6713,7 @@
#~ msgid ""
#~ "<p>If you plan to use a dial-up Internet connection and have set up your\n"
-#~ "connection to use dynamic DNS assignment, these values will be "
-#~ "temporarily\n"
+#~ "connection to use dynamic DNS assignment, these values will be temporarily\n"
#~ "disabled during the connection.</p>"
#~ msgstr ""
#~ "<p>如果要使用拨号因特网连接并已建立连接来使用\n"
@@ -6978,8 +6739,7 @@
#~ msgid ""
#~ "<p>Modify the current version of the file.</p>\n"
-#~ "<p>Press <b>Accept</b> and continue editing other data. You are able to "
-#~ "return to this dialog at a later time, \n"
+#~ "<p>Press <b>Accept</b> and continue editing other data. You are able to return to this dialog at a later time, \n"
#~ "when the above service has terminated.</p>\n"
#~ msgstr ""
#~ "<p>修改文件的当前版本。</p>\n"
@@ -6992,14 +6752,10 @@
#~ msgid "Search List: Set by DHCP"
#~ msgstr "搜索列表:由 DHCP 设置"
-#~ msgid ""
-#~ "<p>Enter the name for this computer and the DNS domain that it belongs to."
-#~ "</p>"
+#~ msgid "<p>Enter the name for this computer and the DNS domain that it belongs to.</p>"
#~ msgstr "<p>输入此计算机的名称以及所属的 DNS 域。</p>"
-#~ msgid ""
-#~ "<p>The domain is especially important if this computer is a mail server.</"
-#~ "p>"
+#~ msgid "<p>The domain is especially important if this computer is a mail server.</p>"
#~ msgstr "<p>如果此计算机是邮件服务器,则该域特别重要。</p>"
#~ msgid "&Change /etc/resolv.conf manually"
Modified: trunk/yast/zh_CN/po/nfs.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nfs.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/nfs.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: nfs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-19 17:47+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -138,14 +138,14 @@
"有效的域名:%3"
#. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
msgid ""
"fstab already contains an entry\n"
"with mount point '%1'."
msgstr "fstab 已经包含一个带有挂载点 '%1' 的项。"
#. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
msgid ""
"The path entered is invalid.\n"
"It must be shorter than 70 characters\n"
@@ -374,12 +374,12 @@
msgstr "网络文件系统客户端配置"
#. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
msgid "Unable to create directory '%1'."
msgstr "无法创建目录 '%1'。"
#. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
msgid ""
"Unable to write to /etc/fstab.\n"
"No changes will be made to the\n"
@@ -389,52 +389,52 @@
"将不会修改网络文件系统客户端配置。\n"
#. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
msgid "Writing NFS Configuration"
msgstr "正在写入网络文件系统配置"
#. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
msgid "Stop services"
msgstr "停止服务"
#. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
msgid "Start services"
msgstr "启动服务"
#. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
msgid "Stopping services..."
msgstr "正在停止服务..."
#. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
msgid "Starting services..."
msgstr "正在启动服务..."
#. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
msgid "Finished"
msgstr "已完成"
#. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
msgid "Writing NFS client settings. Please wait..."
msgstr "正在写入网络文件系统客户端设置。请稍候..."
#. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr "无法在 /etc/fstab 中挂载网络文件系统项。"
#. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
msgid "NFS Entries"
msgstr "网络文件系统项"
#. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
msgid "%1 entries configured"
msgstr "已配置 %1 项"
Modified: trunk/yast/zh_CN/po/nfs_server.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nfs_server.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/nfs_server.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: nfs server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2016-06-05 16:56+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -66,9 +66,7 @@
msgstr "导出选项 (参见 'man exports')"
#: src/clients/nfs_server.rb:113
-msgid ""
-"Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc."
-"com' etc."
+msgid "Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc.com' etc."
msgstr "第四版网络文件系统 ID 映射的域名规格,如 'localdomain' 或者 'abc.com' 等。"
#: src/clients/nfs_server.rb:119
@@ -80,27 +78,27 @@
msgstr "启用/禁用安全网络文件系统的是/否选项。"
#. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
msgid "NFS server is enabled"
msgstr "已启用网络文件系统服务器"
#. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
msgid "NFS server is disabled"
msgstr "已禁用网络文件系统服务器"
#. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
msgid "Required packages (%1) are not installed."
msgstr "未安装必需的软件包 (%1)。"
#. error
#. error
-#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
+#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
msgid "No mount point specified."
msgstr "未指定挂载点。"
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
msgid ""
"The exports table already\n"
"contains this directory."
@@ -109,18 +107,13 @@
#. CLI action handler.
#. @param [Hash] options command options
#. @return whether successful
-#: src/clients/nfs_server.rb:325
-msgid ""
-"Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
+#: src/clients/nfs_server.rb:319
+msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
msgstr "未启用第四版网络文件系统不能设置域。请使用 'set enablev4' 命令。"
-#: src/clients/nfs_server.rb:336
-msgid ""
-"Command 'set' must be used in the form 'set option=value'. Use 'set help' to "
-"get information about available options."
-msgstr ""
-"命令 'set' 必须以 'set 选项=值' 格式使用。请使用 'set help' 获知可用选项信"
-"息。"
+#: src/clients/nfs_server.rb:330
+msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
+msgstr "命令 'set' 必须以 'set 选项=值' 格式使用。请使用 'set help' 获知可用选项信息。"
#. Then no need to check for conflict.
#: src/include/nfs_server/routines.rb:205
@@ -128,9 +121,7 @@
msgid ""
"%3 and %4 are both exported with the option fsid=0\n"
"for the same client '%1' (contained in '%2')"
-msgstr ""
-"同一客户端 '%1' 中 (包含在 '%2' 中),%3 和 %4 均使用了选项 fsid=0 导出。这是"
-"不允许的。"
+msgstr "同一客户端 '%1' 中 (包含在 '%2' 中),%3 和 %4 均使用了选项 fsid=0 导出。这是不允许的。"
#. selection box label
#: src/include/nfs_server/routines.rb:313
@@ -177,65 +168,55 @@
"配置文件中也可能有伪空格。\n"
#. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
msgid "&Directory to Export"
msgstr "要导出的目录(&D)"
#. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
msgid "&Browse..."
msgstr "浏览(&B)..."
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
msgid "Enter a non-empty export path. For example, /exports."
msgstr "请输入非空导出路径。 如: /exports。"
#. error popup message
-#: src/include/nfs_server/ui.rb:105
+#: src/include/nfs_server/ui.rb:95
msgid "The exports table already contains this directory."
msgstr "导出表已包含此目录。"
-#. message popup; %1, %2 are package names
-#: src/include/nfs_server/ui.rb:113
-msgid ""
-"The user mode NFS server (%1) cannot export directories\n"
-"with spaces in their names.\n"
-"Use the kernel-based server (%2) to do that."
-msgstr ""
-"用户模式网络文件系统服务器 (%1) 无法导出名称中包含空格的目录。\n"
-"请使用基于内核的服务器 (%2) 完成本操作。"
-
#. the dir does not exist
-#: src/include/nfs_server/ui.rb:126
+#: src/include/nfs_server/ui.rb:101
msgid "The directory does not exist. Create it?"
msgstr "该目录不存在。创建它吗?"
#. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:136
+#: src/include/nfs_server/ui.rb:111
msgid "Select the Directory to Export"
msgstr "选择要导出的目录"
#. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
msgid "&Host Wild Card"
msgstr "主机通配符(&H)"
#. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
msgid "O&ptions"
msgstr "选项(&P)"
#. check to see if user has changed options entry in the dialogue
#. thrown due to a "Add Hosts" (as opposed to editing existing ones).
#. If yes, suggest the user with a suitable default option set.
-#: src/include/nfs_server/ui.rb:250
+#: src/include/nfs_server/ui.rb:222
msgid ""
"'fsid=0' is not a valid option unless \n"
"NFSv4 is enabled (previous page).\n"
msgstr "启用第四版网络文件系统 (见前页) 后 'fsid=0' 才是有效的选项。\n"
#. error popup message
-#: src/include/nfs_server/ui.rb:268
+#: src/include/nfs_server/ui.rb:240
msgid ""
"Options for this wild card\n"
"are already set."
@@ -243,14 +224,12 @@
#. Opening NFS server dialog
#. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
-msgid ""
-"Unable to read the /etc/idmapd.conf file. Setting the default setting for "
-"the domain to 'localdomain'."
+#: src/include/nfs_server/ui.rb:272
+msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
msgstr "无法读取 /etc/idmapd.conf 文件。正在将域默认设置设为 'localdomain'。"
#. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:323
+#: src/include/nfs_server/ui.rb:295
msgid ""
"<P>Here, choose whether to start an NFS server on your computer\n"
"and export some of your directories to others.</P>"
@@ -259,7 +238,7 @@
"并且将某些目录导出到其它目录中。</P>"
#. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:330
+#: src/include/nfs_server/ui.rb:302
msgid ""
"<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
"a configuration dialog in which to specify the directories to export.</P>"
@@ -267,70 +246,64 @@
"<P>若您选择了<B>启动网络文件系统服务器</B>,点击<B>下一步</B>将打开一个\n"
"配置对话框,在其中可指定要导出的目录。</P>"
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
msgid ""
"<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
-"and fill in the NFSv4 domain name you want the ID mapping daemon to use. "
-"Leave\n"
-"it as localdomain or refer to the man page for idmapd and idmapd.conf if you "
-"are not sure.</P>\n"
+"and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave\n"
+"it as localdomain or refer to the man page for idmapd and idmapd.conf if you are not sure.</P>\n"
msgstr ""
-"<P>若服务器需要处理网络文件系统第四版客户端,请勾选<B>启用第四版网络文件系统"
-"</B>,\n"
-"并填写供 ID 映射守护精灵使用的第四版网络文件系统域名。若不确定要填的域名,请"
-"保留为\n"
+"<P>若服务器需要处理网络文件系统第四版客户端,请勾选<B>启用第四版网络文件系统</B>,\n"
+"并填写供 ID 映射守护精灵使用的第四版网络文件系统域名。若不确定要填的域名,请保留为\n"
"'localdomain' 或参考 idmapd 和 idmapd.conf 的帮助手册。</P>\n"
#. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:349
+#: src/include/nfs_server/ui.rb:321
msgid ""
"<P>If the server and client must authenticate using GSS library, check the\n"
-"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have "
-"Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
+"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
msgstr ""
"<P>若服务器和客户端必须使用 GSS 库认证,请勾选<B>启用 GSS 安全</B>\n"
-"复选框。要使用 GSS API,当前系统上必须装有 kerberos 和 gssapi (nfs-utils > "
-"1.0.7)。</P>\n"
+"复选框。要使用 GSS API,当前系统上必须装有 kerberos 和 gssapi (nfs-utils > 1.0.7)。</P>\n"
#. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
msgid "NFS Server"
msgstr "网络文件系统服务器"
#. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
msgid "&Start"
msgstr "启动(&S)"
#. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
msgid "Do &Not Start"
msgstr "不启动(&N)"
#. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
msgid "Enable NFSv4"
msgstr "启用第四版网络文件系统"
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
msgid "Enable NFS&v4"
msgstr "启用第四版网络文件系统(&V)"
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
msgid "Enter NFSv4 do&main name:"
msgstr "输入第四版网络文件系统域名(&M):"
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
msgid "Enable &GSS Security"
msgstr "启用 &GSS 安全"
#. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
msgid "NFS Server Configuration"
msgstr "网络文件系统服务器配置"
#. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:515
+#: src/include/nfs_server/ui.rb:487
msgid ""
"<P>The upper box contains all the directories to export.\n"
"If a directory is selected, the lower box shows the hosts allowed to\n"
@@ -341,79 +314,72 @@
"允许挂载该目录的主机。</P>\n"
#. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:495
msgid ""
-"<P><b>Host Wild Card</b> sets which hosts can access the selected "
-"directory.\n"
+"<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
"It can be a single host, groups, wild cards, or\n"
"IP networks.</P>\n"
msgstr ""
"<P><b>主机通配符</b>设置可访问所选目录的主机。\n"
"它可以是单个主机、组、通配符或 IP 网络。</P>\n"
-#. Help, part 3 of 4, variant for kernel space server
-#: src/include/nfs_server/ui.rb:536
-msgid ""
-"<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
+#. Help, part 3 of 4
+#: src/include/nfs_server/ui.rb:503
+msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
msgstr "<p>输入星号 (<tt>*</tt>) 而不是名称可指定全部主机。</p>"
-#. Help, part 3 of 4, variant for user space server
-#: src/include/nfs_server/ui.rb:544
-msgid "<p>Leave the field empty to specify all hosts.</p>"
-msgstr "<p>留空字段来指定全部主机。</p>"
-
#. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:551
+#: src/include/nfs_server/ui.rb:509
msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
msgstr "<P>更多信息请参考 <tt>man exports</tt>。</P>\n"
#. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
msgid "Add &Directory"
msgstr "添加目录(&D)"
#. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
msgid "&Edit"
msgstr "编辑(&E)"
#. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
msgid "De&lete"
msgstr "删除(&L)"
#. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
msgid "Host Wild Card"
msgstr "主机通配符"
#. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
msgid "Options"
msgstr "选项"
#. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
msgid "Add &Host"
msgstr "添加主机(&H)"
#. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
msgid "Ed&it"
msgstr "编辑(&I)"
#. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
msgid "Dele&te"
msgstr "删除(&T)"
#. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
msgid "Directories to Export"
msgstr "要导出的目录"
#. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:181
+#: src/modules/NfsServer.rb:158
msgid ""
"Unable to create a missing directory:\n"
"%1"
@@ -422,7 +388,7 @@
"%1"
#. error popup message
-#: src/modules/NfsServer.rb:193
+#: src/modules/NfsServer.rb:170
msgid ""
"Unable to write to /etc/exports.\n"
"No changes will be made to the\n"
@@ -432,74 +398,60 @@
"将不会修改导出目录。\n"
#. dialog label
-#: src/modules/NfsServer.rb:228
+#: src/modules/NfsServer.rb:192
msgid "Writing NFS Server Configuration"
msgstr "正在写入网络文件系统服务器配置"
#. progress stage label
-#: src/modules/NfsServer.rb:233
+#: src/modules/NfsServer.rb:197
msgid "Save /etc/exports"
msgstr "保存 /etc/exports"
#. progress stage label
-#: src/modules/NfsServer.rb:235
+#: src/modules/NfsServer.rb:199
msgid "Restart services"
msgstr "重启服务"
#. progress step label
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:203
msgid "Saving /etc/exports..."
msgstr "正在保存 /etc/exports..."
#. progress step label
-#: src/modules/NfsServer.rb:241
+#: src/modules/NfsServer.rb:205
msgid "Restarting services..."
msgstr "正在重启服务..."
#. final progress step label
-#: src/modules/NfsServer.rb:243
+#: src/modules/NfsServer.rb:207
msgid "Finished"
msgstr "已完成"
#. help text
-#: src/modules/NfsServer.rb:251
+#: src/modules/NfsServer.rb:215
msgid "Writing NFS server settings. Please wait..."
msgstr "正在写入网络文件系统服务器设置。请稍候..."
#. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:265
+#: src/modules/NfsServer.rb:229
msgid "Unable to write to idmapd.conf."
msgstr "无法写入 idmapd.conf。"
-#: src/modules/NfsServer.rb:314
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr "无法启动 idmapd。请检查您的域设置。"
-
-#: src/modules/NfsServer.rb:321
-msgid "Unable to restart idmapd."
-msgstr "无法重启 idmapd。"
-
-#: src/modules/NfsServer.rb:328
-msgid "Unable to stop idmapd."
-msgstr "无法停止 idmapd。"
-
#. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:339
-msgid ""
-"Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup "
-"is correct."
+#: src/modules/NfsServer.rb:266
+msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
msgstr "无法启动 svcgssd。请确保 kerberos 和 gssapi (nfs-utils) 设置正确。"
-#: src/modules/NfsServer.rb:349
-msgid "'svcgssd' is already running. Unable to restart it."
-msgstr "'svcgssd' 已在运行。无法重启它。"
+#: src/modules/NfsServer.rb:275
+msgid "Unable to restart 'svcgssd' service."
+msgstr "无法重启 'svcgssd' 服务。"
-#: src/modules/NfsServer.rb:357
+#: src/modules/NfsServer.rb:283
msgid "'svcgssd' is running. Unable to stop it."
msgstr "'svcgssd' 正在运行。无法停止它。"
#. error popup message
-#: src/modules/NfsServer.rb:376
+#: src/modules/NfsServer.rb:299
msgid ""
"Unable to restart the NFS server.\n"
"Your changes will be active after reboot.\n"
@@ -508,18 +460,38 @@
"您的修改将在重引导后生效。\n"
#. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:399
+#: src/modules/NfsServer.rb:322
msgid "NFS Exports"
msgstr "网络文件系统导出表"
#. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:417
+#: src/modules/NfsServer.rb:340
msgid "The NFSv4 domain for idmapping is %1."
msgstr "用于 ID 映射的第四版网络文件系统域是 %1 。"
-#~ msgid "Unable to restart 'svcgssd' service."
-#~ msgstr "无法重启 'svcgssd' 服务。"
+#~ msgid ""
+#~ "The user mode NFS server (%1) cannot export directories\n"
+#~ "with spaces in their names.\n"
+#~ "Use the kernel-based server (%2) to do that."
+#~ msgstr ""
+#~ "用户模式网络文件系统服务器 (%1) 无法导出名称中包含空格的目录。\n"
+#~ "请使用基于内核的服务器 (%2) 完成本操作。"
+#~ msgid "<p>Leave the field empty to specify all hosts.</p>"
+#~ msgstr "<p>留空字段来指定全部主机。</p>"
+
+#~ msgid "Unable to start idmapd. Check your domain setting."
+#~ msgstr "无法启动 idmapd。请检查您的域设置。"
+
+#~ msgid "Unable to restart idmapd."
+#~ msgstr "无法重启 idmapd。"
+
+#~ msgid "Unable to stop idmapd."
+#~ msgstr "无法停止 idmapd。"
+
+#~ msgid "'svcgssd' is already running. Unable to restart it."
+#~ msgstr "'svcgssd' 已在运行。无法重启它。"
+
#~ msgid "Directories"
#~ msgstr "目录"
@@ -529,27 +501,20 @@
#~ msgid "Firewall"
#~ msgstr "防火墙"
-#~ msgid ""
-#~ "<p>NFSv4 is enabled. Make sure that only one exported filesystem is "
-#~ "marked with the fsid=0 option for a particular client.</p>"
-#~ msgstr ""
-#~ "<p>已启用第四版网络文件系统。请确保对于一个特定客户端,只有一个导出的文件"
-#~ "系统标记有 fsid=0 选项。</p>"
+#~ msgid "<p>NFSv4 is enabled. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client.</p>"
+#~ msgstr "<p>已启用第四版网络文件系统。请确保对于一个特定客户端,只有一个导出的文件系统标记有 fsid=0 选项。</p>"
#~ msgid ""
#~ "<p>In case of multiple exports to a NFSv4 client,\n"
-#~ "you need to bind the exported paths with no fsid=0 to the one with "
-#~ "fsid=0.\n"
+#~ "you need to bind the exported paths with no fsid=0 to the one with fsid=0.\n"
#~ "To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as\n"
#~ "<tt>/</tt> and <tt>/husband</tt>, respectively, use<br />\n"
#~ "<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...)\n"
#~ "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>\n"
#~ "</p>"
#~ msgstr ""
-#~ "<p>若网络文件系统第四版客户端有多个导出表,您需要将不带 fsid=0 选项的导出"
-#~ "路径绑定到带有 fsid=0 选项的导出路径。\n"
-#~ "要将服务器路径 <tt>/Eve</tt> 和 <tt>/Adam</tt> 导出为 <tt>/</tt> 和 <tt>/"
-#~ "husband</tt>,相应地,可使用<br/>\n"
+#~ "<p>若网络文件系统第四版客户端有多个导出表,您需要将不带 fsid=0 选项的导出路径绑定到带有 fsid=0 选项的导出路径。\n"
+#~ "要将服务器路径 <tt>/Eve</tt> 和 <tt>/Adam</tt> 导出为 <tt>/</tt> 和 <tt>/husband</tt>,相应地,可使用<br/>\n"
#~ "<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...)\n"
#~ "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>\n"
#~ "</p>"
Modified: trunk/yast/zh_CN/po/nis.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/nis.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/nis.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: Nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-02-04 15:48+0800\n"
"Last-Translator: 玛格丽特 · 苏 <i(a)marguerite.su>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -258,9 +258,10 @@
msgstr "NIS 服务器地址(&A)"
#. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "广播(&O)"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "广播(&B)"
#. pushbutton label, find nis servers
#. Shortcut must not conflict with Finish and Next (#29960)
@@ -373,11 +374,6 @@
msgstr "服务器(用空格或逗号分隔)(&S)"
#. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "广播(&B)"
-
-#. checkbox label
#: src/include/nis/ui.rb:859
msgid "&SLP"
msgstr "&SLP"
@@ -586,6 +582,9 @@
msgid "NIS server not found."
msgstr "未找到 NIS 服务器。"
+#~ msgid "Br&oadcast"
+#~ msgstr "广播(&O)"
+
#~ msgid "<p>If you are using <b>DHCP</b> and the server provides the NIS domain name or servers, you can enable their use here. DHCP itself can be set up in the network module.</p>"
#~ msgstr "<p>如果您正在使用 <b>DHCP</b> 并且服务器提供 NIS 域名或服务器,则可以在此使用它们。DHCP 本身可以在网络模块中进行设置。</p>"
Modified: trunk/yast/zh_CN/po/ntp-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/ntp-client.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/ntp-client.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: Ntp Client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-09-04 14:05+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -29,7 +29,7 @@
msgstr "正在写入 NTP 配置..."
#. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
msgstr "<p>按<b>立即同步</b>用所选 NTP 服务器校正您的系统时间。若您想要永久使用 NTP, 请启用<b>保存 NTP 配置</b>选项。</p>"
@@ -38,66 +38,66 @@
msgstr "<p>若启用了<b>以守护进程方式运行 NTP</b>选项,NTP 服务将作为守护进程启动。否则将定时同步系统时间。默认同步周期为 15 分钟。您可在安装完成后通过 <b>yast2 ntp-client 模块</b>修改同步周期。</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
msgstr "<p>用<b>配置</b>按钮打开高级 NTP 配置。</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
msgstr "<p>只有在网络已经配置好的情况下才能与 NTP 服务器同步。</p>"
#. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
msgid "Invalid NTP server hostname %1"
msgstr "无效的 NTP 服务器主机名 %1"
#. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
msgid "&NTP Server Address"
msgstr "&NTP 服务器地址"
#. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
msgid "&Run NTP as daemon"
msgstr "以守护进程方式运行 NTP(&R)"
#. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
msgid "&Save NTP Configuration"
msgstr "保存 NTP 配置(&S)"
#. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
msgid "S&ynchronize now"
msgstr "立即同步(&Y)"
#. push button label
#. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
msgid "&Configure..."
msgstr "配置(&C)..."
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
msgstr "未安装软件包 %1,无法与 NTP 服务器同步。"
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
msgid "Synchronizing with NTP server..."
msgstr "正在与 NTP 服务器同步..."
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
msgid "Connection to selected NTP server failed."
msgstr "连接至所选 NTP 服务器失败。"
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
msgid ""
"Test query to server '%1' failed.\n"
"If server is not yet accessible or network is not configured\n"
@@ -305,273 +305,267 @@
msgstr "JJY 接收器"
#. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
msgid "NTP client configuration module."
msgstr "NTP 客户端配置模块。"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
msgid "Print the status of the NTP daemon"
msgstr "输出 NTP 守护进程的状态"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
msgid "Print all configured synchronization relationships"
msgstr "输出全部已配置同步关系"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
msgid "Enable the NTP daemon"
msgstr "启用 NTP 守护进程"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
msgid "Disable the NTP daemon"
msgstr "禁用 NTP 守护进程"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
msgid "Add new synchronization relationship"
msgstr "添加新的同步关系"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
msgid "Edit existing synchronization relationship"
msgstr "编辑已有的同步关系"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
msgid "Delete a synchronization relationship"
msgstr "删除同步关系"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
msgid "The address of the server"
msgstr "服务器地址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
msgid "The address of the peer"
msgstr "对等点地址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
msgid "The address to which to broadcast"
msgstr "发送广播的地址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
msgid "The address from which to accept broadcasts"
msgstr "接受广播的地址"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
msgid "The options of the relationship"
msgstr "关系选项"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
msgid "Options for clock driver calibration"
msgstr "时钟驱动校准选项"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
msgid "Use the server for initial synchronization"
msgstr "将服务器用于初始同步"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
msgid "Do not use the server for initial synchronization"
msgstr "不将服务器用于初始同步"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
msgid "The synchronization peer not specified."
msgstr "未指定同步对等点。"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
msgid "Specified synchronization peer not found."
msgstr "未找到指定的同步对等点。"
#. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is enabled."
msgstr "已启用 NTP 守护进程。"
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is disabled."
msgstr "已禁用 NTP 守护进程。"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
msgid "Server"
msgstr "服务器"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
msgid "Peer"
msgstr "对等点"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
msgid "Broadcast"
msgstr "广播"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
msgid "Accepting Broadcasts"
msgstr "接受广播"
#. table cell, %1 is integer 0-3
#. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
msgid "Unit Number: %1"
msgstr "单元编号:%1"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
msgid "Local Radio Clock"
msgstr "本地无线电时钟"
#. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
msgid "Reading the settings failed."
msgstr "读取设置失败。"
#. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
msgid "NTP Server Configuration"
msgstr "NTP 服务器配置"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
msgid "NTP Configuration"
msgstr "NTP 配置"
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "防火墙设置"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
msgid "General Settings"
msgstr "常规设置"
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
msgid "Security Settings"
msgstr "安全设置"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
msgid "Advanced NTP Configuration"
msgstr "高级 NTP 配置"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
msgid "New Synchronization"
msgstr "新同步"
#. Server editing dialog
#. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
msgid "Server Settings"
msgstr "服务器设置"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
msgid "NTP Server"
msgstr "NTP 服务器"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
msgid "Local NTP Server"
msgstr "本地 NTP 服务器"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
msgid "Public NTP Server"
msgstr "公共 NTP 服务器"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
msgid "NTP Peer"
msgstr "NTP 对等点"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
msgid "Local Reference Clock"
msgstr "本地参考时钟"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
msgid "Outgoing Broadcast"
msgstr "出站广播"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
msgid "Incoming Broadcast"
msgstr "进站广播"
#. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
msgid "&Reference ID"
msgstr "参考 ID(&R)"
#. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
msgid "&Stratum"
msgstr "层(&S)"
#. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
msgid "Calibration Offset 1"
msgstr "校准偏移 1"
#. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
msgid "Calibration Offset 2"
msgstr "校准偏移 2"
#. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
msgid "Flag &1"
msgstr "旗标 &1"
#. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
msgid "Flag &2"
msgstr "旗标 &2"
#. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
msgid "Flag &3"
msgstr "旗标 &3"
#. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
msgid "Flag &4"
msgstr "旗标 &4"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
msgid "Clock Driver Calibration"
msgstr "时钟驱动校准"
#. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
msgid ""
"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -580,7 +574,7 @@
"请稍候...<br></p>"
#. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
msgid ""
"<p><b><big>Aborting Initialization:</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -589,7 +583,7 @@
"现在按<b>中止</b>安全地中止配置工具。</p>"
#. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
msgid ""
"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -598,7 +592,7 @@
"请稍候...<br></p>"
#. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -608,16 +602,23 @@
"按<b>中止</b>中止保存过程。\n"
"另一个对话框将告之您这样做是否安全。</p>"
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Start NTP Daemon</big></b><br>\n"
+#| "Select whether to start the NTP daemon now and on every system boot. \n"
+#| "The NTP daemon resolves host names when initializing. Your\n"
+#| "network connection must be started before the NTP daemon starts.</p>\n"
+#| "Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
+#| "The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
+#| " You can change this when the system was set up."
msgid ""
"<p><b><big>Start NTP Daemon</big></b><br>\n"
"Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
msgstr ""
"<p><b><big>启动 NTP 守护进程</big></b><br>\n"
"选择是否立即以及在每次系统引导时启动 NTP 守护进程。\n"
@@ -652,7 +653,7 @@
"访问控制旗标可以在服务器概览表中优化调整。在通过 DHCP 配置 NTP 时此选项不可用。</p>\n"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
msgid ""
"<p><b><big>Configuring via DHCP</big></b><br>\n"
"To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -666,7 +667,7 @@
"请垂询您的网络管理员看 DHCP 服务器是否提供了有关 NTP 服务器的信息。</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
msgid ""
"<p><b><big>Configured Servers</big></b><br>\n"
"To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -680,7 +681,7 @@
"要删除已有的同步对等点,请选择该对等点并点击<b>删除</b>。</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
msgid ""
"<p><b><big>Display Log</big></b></p>\n"
"<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
@@ -689,7 +690,7 @@
"要查看 NTP 守护进程的日志,请点击<b>显示日志</b>。</p>\n"
#. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
msgid ""
"<p><b><big>Advanced configuration</big></b><br>\n"
"To configure this host to synchronize against multiple remote hosts or against\n"
@@ -699,7 +700,7 @@
"要配置该主机与多个远程主机或本地连接的时钟同步,请使用<b>高级配置</b>。"
#. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
msgid ""
"<p><b><big>Clock Type</big></b><br>\n"
"Select the driver for the clock to configure.</p>"
@@ -708,7 +709,7 @@
"请选择要配置的时钟的驱动。</p>"
#. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
msgid ""
"<p><b><big>Unit Number</big></b><br>\n"
"If you have multiple clocks of the same type, you must set\n"
@@ -718,7 +719,7 @@
"若您有多个相同类型的时钟,则必须设定<b>单元编号</b>。</p>"
#. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
msgid ""
"<p><b><big>Device</big></b><br>\n"
"To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -736,7 +737,7 @@
"</p> "
#. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
msgid ""
"<p><b><big>Driver Calibration</big></b><br>\n"
"To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -745,7 +746,7 @@
"要校准时钟驱动,请点击<b>驱动校准</b>。</p>"
#. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
msgid ""
"<p><b><big>Address of the NTP Server</big></b><br>\n"
"To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -757,7 +758,7 @@
"要查找 NTP 服务器,请垂询您的网络管理员或互联网服务提供商。</p>"
#. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
msgid ""
"<p><b><big>Selecting a Server</big></b><br>\n"
"To select an NTP server from those found in the local network\n"
@@ -769,7 +770,7 @@
"请点击<b>选择</b>并在<b>本地 NTP 服务器</b>和<b>公共 NTP 服务器</b>间进行选择。</p>"
#. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
msgid ""
"<p><b><big>Testing Server Accessibility</big></b><br>\n"
"To test if the selected server is up and responds properly,\n"
@@ -779,7 +780,7 @@
"要测试所选服务器是否当值并能正常响应,请点击<b>测试</b>。</p>"
#. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address of the host with which to synchronize mutually,\n"
@@ -789,7 +790,7 @@
"要设定与之彼此同步的主机的地址,请使用<b>地址</b>。</p>"
#. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -799,7 +800,7 @@
"要设定用于广播的地址,请使用<b>地址</b>文本字段。</p>"
#. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address from which to accept broadcast packets, use \n"
@@ -810,7 +811,7 @@
#. help text 2/4, was removed
#. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
msgid ""
"<p><b><big>Options</big></b><br>\n"
"To fine-tune the synchronization source, enter the respective options in the\n"
@@ -821,7 +822,7 @@
"要优化调整同步来源,请将相关选项输入<b>选项</b>文本字段。\n"
"细节请参阅 <i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>。</p>\n"
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
msgid ""
"<p><b><big>Access Control Options</big></b><br>\n"
"Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -837,7 +838,7 @@
"此选项仅在您在<b>安全设置</b>中勾选了<b>限制 NTP 服务到配置过的服务器</b>选项后方可用。</p>\n"
#. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
msgid ""
"<p><b><big>Synchronization Peer Type</big></b><br>\n"
"Select the kind of synchronization peer to add here.</p>"
@@ -846,42 +847,42 @@
"选择要添加到此的同步对等点的类型。</p>"
#. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
msgid ""
"<p>To add an NTP server to which to synchronize,\n"
"select <b>Server</b>.</p>"
msgstr "<p>要添加与之同步的 NTP 服务器,请选择<b>服务器</b>。</p>"
#. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
msgid ""
"<p>To add an NTP peer to synchronize mutually, select\n"
"<b>Peer</b>.</p>"
msgstr "<p>要添加彼此同步的 NTP 对等点,请选择<b>对等点</b>。</p>"
#. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
msgid ""
"<p>To configure a local clock connected directly to your computer,\n"
"select <b>Radio Clock</b>.</p>"
msgstr "<p>要配置直接连接到您的计算机的本地时钟,请选择<b>无线电时钟</b>。</p>"
#. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
msgid ""
"<p>To broadcast time information through your network, select\n"
"<b>Outgoing Broadcast</b>.</p>"
msgstr "<p>要通过网络广播时间信息,请选择<b>出站广播</b>。</p>"
#. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
msgid ""
"<p>To accept NTP packets broadcasted by other hosts on the network\n"
"and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
msgstr "<p>要接受网络中其它主机广播的 NTP 数据包并将它们用于设定本地时间,请选择<b>进站广播<b>。</p>"
#. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
msgid ""
"<p><big><b>Server Location</b></big>\n"
"Select if you want to find the NTP server in the local network or select\n"
@@ -891,7 +892,7 @@
"选择是在本地网络中查找 NTP 服务器,还是从已知 NTP 服务器列表中选择 NTP 服务器。</p>"
#. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
msgid ""
"<p><big><b>Finding Server in the Local\n"
"Network</b></big><br>\n"
@@ -904,7 +905,7 @@
"然后从找到的服务器的列表中选择一个服务器。</p>"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
msgid ""
"<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
"Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -915,7 +916,7 @@
"要显示只适用于某个特定国家/地区的 NTP 服务器,请在<b>国家/地区</b>中进行选择。</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
msgid ""
"<p><big><b>Note</b></big><br>\n"
"The listed NTP servers may not be available from any country, but only\n"
@@ -934,7 +935,7 @@
"。</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
msgid ""
"<p><big><b>Testing Server Accessibility</b></big><br>\n"
"To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -944,7 +945,7 @@
#. help text connected with checkbox: "Use Random Server from pool.ntp.org"
#. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
msgid ""
"<p><big><b>Use Random Servers</b></big><br>\n"
"This service is offered by pool.ntp.org. If you select this option,\n"
@@ -958,7 +959,7 @@
"这意味着您的 NTP 客户端每小时将与不同的服务器同步。</p>\n"
#. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
msgid ""
"<p><big><b>Clock Driver Calibration</b></big><br>\n"
"The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -970,7 +971,7 @@
"特定选项的含义取决于特定驱动。某些驱动不使用全部选项。</p>"
#. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
msgid ""
"To learn more about available options, install the package\n"
"<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
@@ -988,17 +989,17 @@
"将丢失全部修改。"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
msgid "Restart NTP Daemon"
msgstr "重启 NTP 守护进程"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
msgid "Save Settings and Restart NTP Daemon"
msgstr "保存设置并重启 NTP 守护进程"
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
msgid ""
"Warning!\n"
"\n"
@@ -1013,14 +1014,14 @@
"而且该守护进程可能无法正常运行。"
#. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
msgid ""
"NTP server '%1' is not a valid hostname,\n"
"fully qualified hostname, IPv4 address, or IPv6 address."
msgstr "NTP 服务器 '%1' 不是有效的主机名、完全限定的主机名、Ipv4 地址或 IPv6 地址。"
#. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
msgid ""
"Enabling Random Servers from pool.ntp.org would\n"
"replace the current NTP server.\n"
@@ -1032,44 +1033,44 @@
"真的替换当前 NTP 服务器吗?"
#. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
msgid "Select the Device"
msgstr "请选择设备"
#. selection box header
#. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
msgid "Public NTP &Servers"
msgstr "公共 NTP 服务器(&S)"
#. message report (no server selected)
#. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
msgid "Select an NTP server."
msgstr "请选择一个 NTP 服务器。"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
msgid "All Countries"
msgstr "全部国家/地区"
#. combo box header
#. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
msgid "&Country"
msgstr "国家/地区(&C)"
#. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
msgid "Scanning for NTP servers on your network..."
msgstr "正在扫描网络中的 NTP 服务器..."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
#. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
msgid ""
"No NTP server has been found on your network.\n"
"This could be caused by a running SuSEfirewall2,\n"
@@ -1080,205 +1081,205 @@
"它可能阻断了网络扫描。"
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
msgid "No NTP server has been found on your network."
msgstr "在网络中未找到 NTP 服务器。"
#. combo box label
#. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
msgid "Address"
msgstr "地址"
#. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
msgid "No server is selected."
msgstr "未选择服务器。"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
msgid "A&ddress"
msgstr "地址(&D)"
#. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
msgid "Ad&vanced Configuration"
msgstr "高级配置(&V)"
#. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
msgid "&Driver Calibration"
msgstr "驱动校准(&D)"
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
msgid "&Interval of the Synchronization in Minutes"
msgstr "以分钟计的同步周期(&I)"
#. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
msgid "Start NTP Daemon"
msgstr "启动 NTP 守护进程"
#. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
msgid "Only &Manually"
msgstr "仅手动(&M)"
#. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
msgid "&Synchronize without Daemon"
msgstr "不用守护进程同步(&S)"
#. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
msgid "Now and on &Boot"
msgstr "立即和在引导时(&B)"
#. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
msgid "Run NTP Daemon in Chroot &Jail"
msgstr "在 Chroot 囚牢中运行 NTP 守护进程(&J)"
#. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
msgid "&Restrict NTP Service to Configured Servers Only "
msgstr "限制 NTP 服务到配置过的服务器(&R)"
#. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
msgid "Manual"
msgstr "手动"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
msgid "Auto"
msgstr "自动"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
msgid "Custom"
msgstr "自定义"
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
msgid "&Runtime Configuration Policy"
msgstr "运行时配置策略(&R)"
#. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
msgid "&Custom Policy"
msgstr "自定义策略(&C)"
#. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
msgid "&Use Random Servers from pool.ntp.org"
msgstr "使用来自 pool.ntp.org 的随机服务器(&U)"
#. text entry label
#. text entry
#. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
msgid "&Address"
msgstr "地址(&A)"
#. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
msgid "&Select..."
msgstr "选择(&S)..."
#. push button
#. push button
#. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
msgid "&Test"
msgstr "测试(&T)"
#. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
msgid "Synchronization Type"
msgstr "同步类型"
#. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
msgid "Display &Log..."
msgstr "显示日志(&L)..."
#. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
msgid "Clock &Type"
msgstr "时钟类型(&T)"
#. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
msgid "Unit &Number"
msgstr "单元编号(&N)"
#. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
msgid "Create &Symlink"
msgstr "创建符号链接(&S)"
#. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
msgid "&Device"
msgstr "设备(&D)"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
msgid "Access Control Options"
msgstr "访问控制选项"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
msgid "&Server"
msgstr "服务器(&S)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
msgid "&Peer"
msgstr "对等点(&P)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
msgid "&Radio Clock"
msgstr "无线电时钟(&R)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
msgid "&Outgoing Broadcast"
msgstr "出站广播(&O)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
msgid "&Incoming Broadcast"
msgstr "进站广播(&I)"
#. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
msgid "Type"
msgstr "类型"
#. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
msgid "Loc&al Network"
msgstr "本地网络(&A)"
#. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
msgid "&Public NTP Server"
msgstr "公共 NTP 服务器(&P)"
#. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
msgid "NTP Server Location"
msgstr "NTP 服务器位置"
#. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
msgid "&Lookup"
msgstr "查找(&L)"
@@ -1292,151 +1293,162 @@
msgid "Initializing ..."
msgstr "正在初始化..."
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "正在初始化 NTP 客户端配置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "读取网络配置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "读取 NTP 设置"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "正在读取网络配置..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "正在读取 NTP 设置..."
-
-#. progress step
#. While calling "yast clone_system" it is possible that
#. the ntp server has not already been installed at that time.
#. (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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
#. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
msgid "Finished"
msgstr "已完成"
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "正在保存 NTP 客户端配置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "写入 NTP 设置"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "重启 NTP 守护进程"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "正在写入设置..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "正在重启 NTP 守护进程..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-msgid "Cannot update the dynamic configuration policy."
-msgstr "无法更新动态配置策略。"
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "无法重启 NTP 守护进程。"
-
#. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
msgid "The NTP daemon starts when starting the system."
msgstr "将在系统启动时启动 NTP 守护进程。"
#. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
msgid "The NTP daemon does not start automatically."
msgstr "不自动启动 NTP 守护进程。"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
msgid "Servers: %1"
msgstr "服务器:%1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
msgid "Radio Clocks: %1"
msgstr "无线电时钟:%1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
msgid "Peers: %1"
msgstr "对等点:%1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
msgid "Broadcast time information to: %1"
msgstr "广播时间信息到:%1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
msgid "Accept broadcasted time information from: %1"
msgstr "接受广播的时间信息自:%1"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
msgid "Combine static and DHCP configuration."
msgstr "混合静态和 DHCP 配置。"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
msgid "Static configuration only."
msgstr "仅静态配置。"
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
msgid "Custom configuration policy."
msgstr "自定义配置策略。"
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
msgid "Testing the NTP server..."
msgstr "正在测试 NTP 服务器..."
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
msgid "Server is reachable and responds properly."
msgstr "服务器可访问且响应正常。"
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
msgid "Server is unreachable or does not respond properly."
msgstr "服务器不可访问,或响应不正常。"
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
msgstr "未安装软件包 %1,无法在本地网络中搜索 NTP 服务器。\n"
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "正在初始化 NTP 客户端配置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "读取网络配置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "读取 NTP 设置"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "正在读取网络配置..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "正在读取 NTP 设置..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "正在保存 NTP 客户端配置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "写入 NTP 设置"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "重启 NTP 守护进程"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "正在写入设置..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "正在重启 NTP 守护进程..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+msgid "Cannot update the dynamic configuration policy."
+msgstr "无法更新动态配置策略。"
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "无法重启 NTP 守护进程。"
+
+#~ msgid "Firewall Settings"
+#~ msgstr "防火墙设置"
+
#~ msgid "Cannot write sysconfig variables."
#~ msgstr "无法写入系统配置变量。"
Modified: trunk/yast/zh_CN/po/packager.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/packager.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/packager.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2015-10-18 12:15+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -73,8 +73,7 @@
"Firefox as browser, and Nautilus as file manager.\n"
msgstr ""
"GNOME 是一个强大且直观的桌面环境,\n"
-"它使用 Evolution 作为邮件应用,Firefox 作为浏览器,Nautilus 作为文件管理"
-"器。\n"
+"它使用 Evolution 作为邮件应用,Firefox 作为浏览器,Nautilus 作为文件管理器。\n"
#. explanation text for KDE
#: src/clients/inst_desktop.rb:63
@@ -179,8 +178,7 @@
"<p>The installation CDs will be copied into the system\n"
"to create a repository that can be used to install\n"
"other systems.</p>\n"
-msgstr ""
-"<p>安装 CD 将被复制到系统中以创建一个可用于安装其它系统的软件源。</p>\n"
+msgstr "<p>安装 CD 将被复制到系统中以创建一个可用于安装其它系统的软件源。</p>\n"
#. label for showing repositories
#: src/clients/inst_mediacopy.rb:57
@@ -190,8 +188,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:674
-#: src/clients/repositories.rb:687
+#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703
+#: src/clients/repositories.rb:716
#: src/include/packager/key_manager_dialogs.rb:306
msgid "Name"
msgstr "名称"
@@ -372,16 +370,12 @@
#. TRANSLATORS: dialog help 2/3 (version for installation)
#: src/clients/inst_productsources.rb:1269
-msgid ""
-"<p>Select the online repositories you want to use then click <b>Next</b>.</"
-"p>\n"
+msgid "<p>Select the online repositories you want to use then click <b>Next</b>.</p>\n"
msgstr "<p>选择您想要使用的在线软件源并点击<b>下一步</b>。</p>\n"
#. TRANSLATORS: dialog help 2/3 (version for running system)
#: src/clients/inst_productsources.rb:1273
-msgid ""
-"<p>Select the online repositories you want to use then click <b>Finish</b>.</"
-"p>\n"
+msgid "<p>Select the online repositories you want to use then click <b>Finish</b>.</p>\n"
msgstr "<p>选择您想要使用的在线软件源并点击<b>完成</b>。</p>\n"
#. TRANSLATORS: dialog help 3/3
@@ -397,7 +391,7 @@
#. TRANSLATORS: dialog help
#. TRANSLATORS: dialog help
#: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:91
+#: src/include/packager/repositories_include.rb:95
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr "<p>软件源管理器正在下载软件源详情...</p>"
@@ -474,7 +468,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 "正在安装软件包..."
@@ -490,9 +484,7 @@
#. Solve dependencies
#: src/clients/inst_rpmcopy.rb:368
-msgid ""
-"The package resolver run failed. Check your software section in the AutoYaST "
-"profile."
+msgid "The package resolver run failed. Check your software section in the AutoYaST profile."
msgstr "软件包依赖关系解决器运行失败。 请检查您的 AutoYaST 方案中的软件部分。"
#. error message - displayed in a scrollable text area
@@ -516,8 +508,8 @@
#. dialog caption
#. dialog caption
#. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
-#: src/modules/AddOnProduct.rb:682
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
+#: src/modules/AddOnProduct.rb:688
msgid "Initializing..."
msgstr "正在初始化..."
@@ -541,93 +533,101 @@
msgid "&Media"
msgstr "介质(&M)"
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-msgid "Saving the software manager configuration..."
-msgstr "正在保存软件管理器配置..."
-
#. default (minimal) priority of a repository
-#: src/clients/repositories.rb:55
+#: src/clients/repositories.rb:58
msgid "&Priority"
msgstr "优先级(&P)"
-#: src/clients/repositories.rb:57
+#: src/clients/repositories.rb:60
msgid "Keep Downloaded Packages"
msgstr "保留已下载的软件包"
#. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/repositories.rb:72
-msgid ""
-"Installation Repositories - This module does not support the command line "
-"interface, use '%1' instead."
+#: src/clients/repositories.rb:75
+msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead."
msgstr "安装软件源 - 此模块不支持命令行界面,请使用 '%1' 代替。"
#. pad to 3 characters
-#: src/clients/repositories.rb:166
+#: src/clients/repositories.rb:169
msgid "Default"
msgstr "默认"
#. 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:195 src/clients/repositories.rb:260
+#: src/clients/repositories.rb:199 src/clients/repositories.rb:264
msgid "Unknown Name"
msgstr "未知名称"
#. displaye only repositories from the selected service
-#: src/clients/repositories.rb:326 src/clients/repositories.rb:362
-#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436
+#: 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
msgid "Unknown"
msgstr "未知"
#. label to be used instead of URL if not found
-#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1334
+#: src/clients/repositories.rb:337 src/clients/repositories.rb:376
+#: src/modules/AddOnProduct.rb:1351
msgid "URL: %1"
msgstr "URL:%1"
+#. 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 "裸 URL:%s"
+
#. heading - in case repo name not found
-#: src/clients/repositories.rb:357
+#: src/clients/repositories.rb:372
msgid "Unknown Repository Name"
msgstr "未知软件源名称"
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:367
+#: src/clients/repositories.rb:382
msgid "Category: %1"
msgstr "分类:%1"
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:377
+#: src/clients/repositories.rb:392
msgid "Service: %1"
msgstr "服务:%1"
#. #176013
-#: src/clients/repositories.rb:625
+#: src/clients/repositories.rb:640
msgid "All repositories"
msgstr "全部软件源"
-#: src/clients/repositories.rb:628
+#: src/clients/repositories.rb:643
msgid "All services"
msgstr "全部服务"
-#: src/clients/repositories.rb:637
+#: src/clients/repositories.rb:652
msgid "Service '%1'"
msgstr "服务 '%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:652
+#: src/clients/repositories.rb:681
msgid "View"
msgstr "视图"
#. table header - priority of the repository - keep the translation as short as possible!
-#: src/clients/repositories.rb:667
+#: src/clients/repositories.rb:696
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:669 src/clients/repositories.rb:682
+#: src/clients/repositories.rb:698 src/clients/repositories.rb:711
#: src/modules/SourceManager.rb:393
msgid "Enabled"
msgstr "已启用"
@@ -636,88 +636,88 @@
#. 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:672 src/clients/repositories.rb:685
+#: src/clients/repositories.rb:701 src/clients/repositories.rb:714
msgid "Autorefresh"
msgstr "自动刷新"
#. table header - service to which the repo belongs
-#: src/clients/repositories.rb:676
+#: src/clients/repositories.rb:705
msgid "Service"
msgstr "服务"
#. table header - URL of the repo
#. table header - URL of the repo
-#: src/clients/repositories.rb:678 src/clients/repositories.rb:689
+#: src/clients/repositories.rb:707 src/clients/repositories.rb:718
msgid "URL"
msgstr "URL"
#. push button - change URL of the selected repository
-#: src/clients/repositories.rb:789
+#: src/clients/repositories.rb:818
msgid "&Replace..."
msgstr "替换(&R)..."
#. push button - refresh the selected repository now
-#: src/clients/repositories.rb:791
+#: src/clients/repositories.rb:820
msgid "Re&fresh Selected"
msgstr "刷新所选(&F)"
#. push button - disable/enable the selected repository
-#: src/clients/repositories.rb:793
+#: src/clients/repositories.rb:822
msgid "Status &on or off"
msgstr "状态(开或关)(&O)"
#. push button - disable/enable automatic refresh of the selected repository
-#: src/clients/repositories.rb:795
+#: src/clients/repositories.rb:824
msgid "Refre&sh on or off"
msgstr "自动刷新或禁止刷新(&S)"
#. push button - set name of the selected repository
-#: src/clients/repositories.rb:797
+#: src/clients/repositories.rb:826
msgid "Set &Name..."
msgstr "设置名称(&N)..."
#. label
-#: src/clients/repositories.rb:804
+#: src/clients/repositories.rb:833
msgid "Properties"
msgstr "属性"
#. check box
-#: src/clients/repositories.rb:809
+#: src/clients/repositories.rb:838
msgid "&Enabled"
msgstr "已启用(&E)"
#. check box
-#: src/clients/repositories.rb:815
+#: src/clients/repositories.rb:844
msgid "Automatically &Refresh"
msgstr "自动刷新(&R)"
#. push button label
-#: src/clients/repositories.rb:853
+#: src/clients/repositories.rb:882
msgid "&GPG Keys..."
msgstr "&GPG 密钥..."
#. menu button label
-#: src/clients/repositories.rb:858
+#: src/clients/repositories.rb:887
msgid "Refresh"
msgstr "刷新"
#. menu button label
-#: src/clients/repositories.rb:862
+#: src/clients/repositories.rb:891
msgid "Refresh all Autor&efreshed"
msgstr "刷新全部自动刷新的软件源(&E)"
#. menu button label
-#: src/clients/repositories.rb:864
+#: src/clients/repositories.rb:893
msgid "Refresh all &Enabled"
msgstr "刷新全部启用的软件源(&E)"
#. dialog caption
-#: src/clients/repositories.rb:871
+#: src/clients/repositories.rb:900
msgid "Configured Software Repositories"
msgstr "已配置软件源"
#. help
-#: src/clients/repositories.rb:874
+#: src/clients/repositories.rb:903
msgid ""
"<p>\n"
"Manage configured software repositories and services.</p>\n"
@@ -725,24 +725,16 @@
"<p>\n"
"管理已配置的软件源和服务。</p>\n"
-#: 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 ""
-"<P><B>服务</B>或<B>软件源索引服务(RIS)</B>是软件源管理的一种协议。一个服务可"
-"提供一个或多个软件源,它们都可被服务管理员动态调整。</P>"
+#: src/clients/repositories.rb:909
+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 "<P><B>服务</B>或<B>软件源索引服务(RIS)</B>是软件源管理的一种协议。一个服务可提供一个或多个软件源,它们都可被服务管理员动态调整。</P>"
-#: src/clients/repositories.rb:887
+#: src/clients/repositories.rb:916
msgid ""
"<p>\n"
"<b>Adding a new Repository or a Service</b><br>\n"
-"To add a new repository, use <b>Add</b> and specify the software repository "
-"or service.\n"
-"YaST will automatically detect whether a service or a repository is "
-"available at the entered location.\n"
+"To add a new repository, use <b>Add</b> and specify the software repository or service.\n"
+"YaST will automatically detect whether a service or a repository is available at the entered location.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -752,7 +744,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:899
+#: src/clients/repositories.rb:928
msgid ""
"<p>\n"
"To install packages from <b>CD</b>,\n"
@@ -765,7 +757,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:910
+#: src/clients/repositories.rb:939
msgid ""
"<p>\n"
"The CDs can be copied to <b>hard disk</b>\n"
@@ -783,66 +775,48 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:926
+#: src/clients/repositories.rb:955
msgid ""
"<p>\n"
"<b>Modifying Status of a Repository or a Service</b><br>\n"
-"To change a repository location, use <b>Edit</b>. To remove a repository, "
-"use\n"
-"<b>Delete</b>. To enable or disable the repository or to change the refresh "
-"status at initialization time, select the repository in the table and use "
-"the check boxes below.\n"
+"To change a repository location, use <b>Edit</b>. To remove a repository, use\n"
+"<b>Delete</b>. To enable or disable the repository or to change the refresh status at initialization time, select the repository in the table and use the check boxes below.\n"
"</p>\n"
msgstr ""
"<p>\n"
"<b>修改软件源或服务状态</b><br>\n"
"要修改软件源位置,请使用<b>编辑</b>。要移除软件源,请使用<b>删除</b>。\n"
-"要启用或禁用软件源,或者设置初始化时是否刷新,请在表中选中软件源并使用下面的"
-"复选框。\n"
+"要启用或禁用软件源,或者设置初始化时是否刷新,请在表中选中软件源并使用下面的复选框。\n"
"</p>\n"
#. help text, continued
-#: src/clients/repositories.rb:938
+#: src/clients/repositories.rb:967
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"
+"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 ""
"<P><B>软件源优先级</B><BR>\n"
-"软件源优先级是一个介于 0 (最高优先级) 到 200 (最低优先级) 之间的整数值。默认"
-"优先级为 99。若多个软件源提供了同一个软件包,将使用优先级最高的软件源。</P>\n"
+"软件源优先级是一个介于 0 (最高优先级) 到 200 (最低优先级) 之间的整数值。默认优先级为 99。若多个软件源提供了同一个软件包,将使用优先级最高的软件源。</P>\n"
#. help text, continued
-#: src/clients/repositories.rb:946
-msgid ""
-"<P>Select the appropriate option on top of the window for navigation in "
-"repositories and services.</P>"
+#: src/clients/repositories.rb:975
+msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>"
msgstr "<P>请在软件源和服务中的导航窗口顶部选择合适的选项。</P>"
#. help text, continued
-#: src/clients/repositories.rb:954
+#: src/clients/repositories.rb:983
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 ""
-"<P><B>保留已下载的软件包</B><BR>选中此选项以在本地缓存中保留已下载的软件包,"
-"从而可在稍后重装软件包时重复使用它们。若未选中,已下载的软件包将在安装后被删"
-"除。</P>"
+"reinstalled. If not checked, the downloaded packages are deleted after installation.</P>"
+msgstr "<P><B>保留已下载的软件包</B><BR>选中此选项以在本地缓存中保留已下载的软件包,从而可在稍后重装软件包时重复使用它们。若未选中,已下载的软件包将在安装后被删除。</P>"
-#: 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 ""
-"<P>默认本地缓存位于 <B>/var/cache/zypp/packages</B> 文件夹中。可在 <B>/etc/"
-"zypp/zypp.conf</B> 文件中修改该位置。</P>"
+#: src/clients/repositories.rb:989
+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 "<P>默认本地缓存位于 <B>/var/cache/zypp/packages</B> 文件夹中。可在 <B>/etc/zypp/zypp.conf</B> 文件中修改该位置。</P>"
#. popup message part 1
-#: src/clients/repositories.rb:1005
+#: src/clients/repositories.rb:1034
msgid ""
"Unable to save changes to the repository\n"
"configuration."
@@ -850,7 +824,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:1329
+#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1328
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "细节:"
@@ -858,18 +832,18 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1336
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "重试吗?"
#. popup headline
-#: src/clients/repositories.rb:1030
+#: src/clients/repositories.rb:1059
msgid "Abort Repository Configuration"
msgstr "中止软件源配置"
#. popup message
-#: src/clients/repositories.rb:1032
+#: src/clients/repositories.rb:1061
msgid ""
"Abort the repository configuration?\n"
"All changes will be lost."
@@ -878,7 +852,7 @@
"全部修改将不复存在。"
#. refresh also the combobox widget
-#: src/clients/repositories.rb:1329
+#: src/clients/repositories.rb:1364
msgid ""
"There is no service at URL:\n"
"%1"
@@ -887,54 +861,54 @@
"%1"
#. TODO: add help text
-#: src/clients/repositories.rb:1440
+#: src/clients/repositories.rb:1475
msgid "Refreshing Repositories"
msgstr "正在刷新软件源"
-#: src/clients/repositories.rb:1441
+#: src/clients/repositories.rb:1476
msgid "Refreshing Services"
msgstr "正在刷新服务"
-#: src/clients/repositories.rb:1446
+#: src/clients/repositories.rb:1481
msgid "Refresh Repositories"
msgstr "刷新软件源"
-#: src/clients/repositories.rb:1447
+#: src/clients/repositories.rb:1482
msgid "Refresh Services"
msgstr "刷新服务"
#. progress bar label
-#: src/clients/repositories.rb:1479
+#: src/clients/repositories.rb:1514
msgid "Refreshing Repository %1..."
msgstr "正在刷新软件源 %1..."
#. refreshing services
#. progress bar label
-#: src/clients/repositories.rb:1505
+#: src/clients/repositories.rb:1540
msgid "Refreshing Service %1..."
msgstr "正在刷新服务 %1..."
#. yes-no popup
-#: src/clients/repositories.rb:1524
+#: src/clients/repositories.rb:1559
msgid "Delete the selected repository from the list?"
msgstr "从列表中删除所选软件源吗?"
#. yes-no popup
-#: src/clients/repositories.rb:1538
+#: src/clients/repositories.rb:1573
msgid ""
"Delete service %1\n"
"and its repositories?"
msgstr "删除服务 %1 及其软件源吗?"
#. popup message
-#: src/clients/repositories.rb:1606
+#: src/clients/repositories.rb:1641
msgid ""
"For the selected repository, refresh\n"
"cannot be set."
msgstr "无法设置所选软件源的刷新状态。"
#. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1768
+#: src/clients/repositories.rb:1803
msgid ""
"Repository %1\n"
"has been already added. Each repository should be added only once.\n"
@@ -946,7 +920,7 @@
"真的再次添加该软件源吗?"
#. Error popup
-#: src/clients/repositories.rb:1836
+#: src/clients/repositories.rb:1871
msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
msgstr "<p>恢复软件源配置时出错。</p>\n"
@@ -961,8 +935,7 @@
#. warning text
#: src/clients/software_proposal.rb:103
#: src/clients/software_simple_proposal.rb:58
-msgid ""
-"Cannot solve dependencies automatically. Manual intervention is required."
+msgid "Cannot solve dependencies automatically. Manual intervention is required."
msgstr "无法自动解决依赖关系。需手工干预。"
#. this is a heading
@@ -977,9 +950,7 @@
#. Command line help text for the software management module, %1 is "zypper"
#: src/clients/sw_single.rb:64
-msgid ""
-"Software Installation - This module does not support the command line "
-"interface, use '%1' instead."
+msgid "Software Installation - This module does not support the command line interface, use '%1' instead."
msgstr "软件安装 - 此模块不支持命令行界面,请使用 '%1' 代替。"
#. error message (%1 is a package file name)
@@ -1061,20 +1032,20 @@
"现在还安装它们吗?\n"
#. start the repository manager
-#: src/clients/sw_single.rb:619
+#: src/clients/sw_single.rb:614
msgid ""
"Cannot configure online update repository \n"
"without having package %1 installed"
msgstr "未安装 %1 软件包无法配置在线更新软件源"
-#: src/clients/sw_single.rb:645
+#: src/clients/sw_single.rb:640
msgid ""
"Cannot search packages in online repositories\n"
"without having package %1 installed"
msgstr "未安装 %1 软件包无法在在线软件源中搜索软件包"
#. error report, %1 is a list of packages
-#: src/clients/sw_single.rb:673
+#: src/clients/sw_single.rb:668
msgid ""
"The following packages have not been found on the medium:\n"
"%1\n"
@@ -1115,8 +1086,7 @@
#. wrong MD5
#: src/include/checkmedia/ui.rb:126
-msgid ""
-"<B>Error</B> -- MD5 sum does not match<BR>This medium should not be used."
+msgid "<B>Error</B> -- MD5 sum does not match<BR>This medium should not be used."
msgstr "<B>错误</B> -- MD5 校验和不匹配<BR>不应使用此介质。"
#. the correct MD5 is unknown
@@ -1143,17 +1113,14 @@
#: src/include/checkmedia/ui.rb:304
msgid ""
"<P>When you have a problem with\n"
-"the installation and you are using a CD or DVD installation medium, you "
-"should check\n"
+"the installation and you are using a CD or DVD installation medium, you should check\n"
"whether the medium is broken.</P>\n"
-msgstr ""
-"<P>若您使用 CD 或 DVD 介质安装时遇到了问题,您应检查介质是否损坏。</P>\n"
+msgstr "<P>若您使用 CD 或 DVD 介质安装时遇到了问题,您应检查介质是否损坏。</P>\n"
#. help text - media check 3/8
#: src/include/checkmedia/ui.rb:310
msgid ""
-"<P>Select a drive, insert a medium into the drive and press <B>Start Check</"
-"B>\n"
+"<P>Select a drive, insert a medium into the drive and press <B>Start Check</B>\n"
"or use <B>Check ISO File</B> and select an ISO file.\n"
"The check can take several minutes depending on speed of the\n"
"drive and size of the medium. The check verifies the MD5 checksum.</P> "
@@ -1166,10 +1133,8 @@
#. help text - media check 4/8
#: src/include/checkmedia/ui.rb:317
msgid ""
-"<P>If the check of the medium fails, you should not continue the "
-"installation.\n"
-"It may fail or you may lose your data. Better replace the broken medium.</"
-"P>\n"
+"<P>If the check of the medium fails, you should not continue the installation.\n"
+"It may fail or you may lose your data. Better replace the broken medium.</P>\n"
msgstr ""
"<P>若介质检查失败,则不应继续安装。\n"
"继续安装可能失败或导致丢失数据。您最好更换损坏的介质。</P>\n"
@@ -1185,28 +1150,20 @@
#. help text - media check 6/8
#: src/include/checkmedia/ui.rb:325
-msgid ""
-"<P><B>Note:</B> You cannot change the medium while it is used by the system."
-"</P>"
+msgid "<P><B>Note:</B> You cannot change the medium while it is used by the system.</P>"
msgstr "<P><B>注意:</B> 当介质正被系统使用时,您不能更换它。</P>"
#. help text - media check 7/8
#: src/include/checkmedia/ui.rb:329
-msgid ""
-"<P>To check media before the installation, use the media check item in the "
-"boot menu.</P>"
+msgid "<P>To check media before the installation, use the media check item in the boot menu.</P>"
msgstr "<P>要在开始安装前检查介质,请使用引导菜单中的介质检查一项。<P>"
#. help text - media check 8/8
#: src/include/checkmedia/ui.rb:333
msgid ""
-"<P>If you burn the media yourself, use the <B>pad</B> option in your "
-"recording\n"
-"software. It avoids read errors at the end of the media during the check.</"
-"P>\n"
-msgstr ""
-"<P>若自行刻录介质,请使用刻录软件中的 <B>pad</B> 选项。它可避免在检查过程中介"
-"质末尾出现读取错误。</P>\n"
+"<P>If you burn the media yourself, use the <B>pad</B> option in your recording\n"
+"software. It avoids read errors at the end of the media during the check.</P>\n"
+msgstr "<P>若自行刻录介质,请使用刻录软件中的 <B>pad</B> 选项。它可避免在检查过程中介质末尾出现读取错误。</P>\n"
#. advice check of the media
#. for translators: split the message to more lines if needed, use max. 50 characters per line
@@ -1418,42 +1375,42 @@
msgstr "真的删除密钥 '%1' '%2' 吗?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:77
+#: src/include/packager/repositories_include.rb:81
msgid "Adding a New Repository"
msgstr "添加新软件源"
-#: src/include/packager/repositories_include.rb:81
+#: src/include/packager/repositories_include.rb:85
msgid "Check Repository Type"
msgstr "检查软件源类型"
-#: src/include/packager/repositories_include.rb:82
+#: src/include/packager/repositories_include.rb:86
msgid "Add Repository"
msgstr "添加软件源"
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:87
msgid "Read Repository License"
msgstr "读取软件源许可"
-#: src/include/packager/repositories_include.rb:86
+#: src/include/packager/repositories_include.rb:90
msgid "Checking Repository Type"
msgstr "正在检查软件源类型"
-#: src/include/packager/repositories_include.rb:87
+#: src/include/packager/repositories_include.rb:91
msgid "Adding Repository"
msgstr "正在添加软件源"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:92
msgid "Reading Repository License"
msgstr "正在读取软件源许可"
#. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:152
+#: src/include/packager/repositories_include.rb:156
msgid "Repository"
msgstr "软件源"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:224
+#: src/include/packager/repositories_include.rb:228
#: src/modules/SourceManager.rb:330
msgid ""
"There is no product information available at the given location.\n"
@@ -1468,15 +1425,15 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:319
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
msgstr "无法从 URL '%1' 创建软件源。"
#. error message
-#: src/include/packager/repositories_include.rb:331
+#: src/include/packager/repositories_include.rb:335
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."
@@ -1485,17 +1442,22 @@
"请修改协议或在服务器端解压 ISO 映像。"
#. popup message part 2
-#: src/include/packager/repositories_include.rb:341
+#: src/include/packager/repositories_include.rb:345
msgid "Change the URL and try again?"
msgstr "修改 URL 并重试吗?"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:418
+#: src/include/packager/repositories_include.rb:422
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
msgstr "未安装 %1 软件包无法搜索 SLP 软件源。\n"
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+msgid "Saving the software manager configuration..."
+msgstr "正在保存软件管理器配置..."
+
#. New add-on product might add also new agents.
#. Functions Rereads all available agents.
#.
@@ -1503,19 +1465,19 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
msgid "An error occurred while preparing the installation system."
msgstr "准备安装系统时出错。"
#. error report
-#: src/modules/AddOnProduct.rb:653
+#: src/modules/AddOnProduct.rb:659
msgid "Control file %1 not found on media."
msgstr "在介质上未找到控制文件 %1。"
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:894
+#: src/modules/AddOnProduct.rb:900
msgid ""
"Package '%s' is not installed.\n"
"The add-on product cannot be registered."
@@ -1523,67 +1485,74 @@
"软件包 '%s' 未安装。\n"
"无法注册附加产品。"
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+msgid "Unknown Product"
+msgstr "未知产品"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+#| msgid "Please wait..."
+msgid "Re&lease Notes..."
+msgstr "请稍候..."
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
msgid "Unable to use additional products."
msgstr "无法使用附加产品。"
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
msgid "%1, URL: %2"
msgstr "%1,URL:%2"
-#: src/modules/AddOnProduct.rb:1328
+#: src/modules/AddOnProduct.rb:1345
msgid "URL: %1, Path: %2"
msgstr "URL:%1,路径:%2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1359
+#: src/modules/AddOnProduct.rb:1376
msgid "Additional Products"
msgstr "附加产品"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1365
+#: src/modules/AddOnProduct.rb:1382
msgid ""
-"The installation repository also contains the listed additional "
-"repositories.\n"
+"The installation repository also contains the listed additional repositories.\n"
"Select the ones you want to use.\n"
msgstr ""
"安装软件源还包含了下面列出的额外软件源。\n"
"请选择您想要使用的软件源。\n"
-#: src/modules/AddOnProduct.rb:1376
+#: src/modules/AddOnProduct.rb:1393
msgid "Additional Products to Select"
msgstr "供选择的附加产品"
#. push button label
-#: src/modules/AddOnProduct.rb:1383
+#: src/modules/AddOnProduct.rb:1400
msgid "Add Selected &Products"
msgstr "添加所选产品(&P)"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1515
+#: src/modules/AddOnProduct.rb:1532
msgid "Insert the addon %1 medium"
msgstr "请插入附加的 %1 介质"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1520
+#: src/modules/AddOnProduct.rb:1537
msgid "Insert the %1 %2 medium"
msgstr "请插入 %1 %2 介质"
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1572
+#: src/modules/AddOnProduct.rb:1589
msgid "Unable to add product %1."
msgstr "无法添加产品 %1。"
-#. adding the product to the list of products (BNC #269625)
-#. no such products
-#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
-#: src/modules/Packages.rb:471
-msgid "Unknown Product"
-msgstr "未知产品"
-
#. update the trusted flag
#: src/modules/KeyManager.rb:214
msgid ""
@@ -1610,27 +1579,27 @@
msgstr "无法将密钥复制到临时文件夹。"
#. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
msgid "&Show Failed Packages List"
msgstr "显示失败软件包列表(&S)"
#. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
msgid "&Show Full Log"
msgstr "显示完整日志(&S)"
#. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
msgid "Installation of some Packages Failed"
msgstr "某些软件包安装失败了"
#. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
msgid "Installation aborted by user."
msgstr "用户中止了安装。"
#. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
msgid "Medium %1"
msgstr "介质 %1"
@@ -1638,13 +1607,13 @@
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
msgid ">%1"
msgstr ">%1"
#. Nothing more to install from this CD (very concise - little space!!)
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
msgid "Done."
msgstr "完毕。"
@@ -1652,21 +1621,21 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
msgid "Next: %1 -- %2"
msgstr "下一个:%1 - %2"
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
msgid "Next: %1"
msgstr "下一个:%1"
#. 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:918
+#: src/modules/PackageSlideShow.rb:922
msgid "Total"
msgstr "总计"
@@ -1675,78 +1644,65 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
msgid "Downloading %1 (download size %2)"
msgstr "正在下载 %1 (下载大小 %2)"
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
msgid " (Remaining: %1%2 packages)"
msgstr " (还剩:%1%2 个软件包)"
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
msgid "Downloading Packages..."
msgstr "正在下载软件包..."
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
msgid " (Downloaded %1 of %2 packages)"
msgstr " (已下载 %1/%2 个软件包)"
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
msgid "Deleting %1"
msgstr "正在删除 %1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
msgid "Installing %1 (installed size %2)"
msgstr "正在安装 %1 (安装后大小 %2)"
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
msgid "Applying delta RPM: %1"
msgstr "正在应用增量 RPM:%1"
#. warning text
#: src/modules/Packages.rb:311
-msgid ""
-"Your computer is a 64-bit x86-64 system, but you are trying to install a 32-"
-"bit distribution."
+msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
msgstr "您的计算机是 64 位 x86-64 系统,但是您正试图安装 32 位发行版。"
#. help text for software proposal
#: src/modules/Packages.rb:327
-msgid ""
-"<P>The pattern list states which functionality will be available after "
-"installing the system.</P>"
+msgid "<P>The pattern list states which functionality will be available after installing the system.</P>"
msgstr "<P>该软件集列表说明了安装系统后可用的功能。</P>"
#. (see bnc#178357 why these numbers)
#. translators: help text for software proposal
#: 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 ""
-"<P>该提案汇报了将安装到系统的文件总大小。然而,系统将包含一些其它文件 (缓存和"
-"工作文件) 所以所用空间将会比提案中的值稍微大一些。因此最好在启动安装前有至少 "
-"25% (或大约 300 MB) 的空闲空间。<P>"
+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 "<P>该提案汇报了将安装到系统的文件总大小。然而,系统将包含一些其它文件 (缓存和工作文件) 所以所用空间将会比提案中的值稍微大一些。因此最好在启动安装前有至少 25% (或大约 300 MB) 的空闲空间。<P>"
#. help text for software proposal
#: 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"
+"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 ""
"<P>总'下载大小'是指将从远程 (网络) 软件源中下载的软件包大小。\n"
"若网速慢或有数据流量限制,该数值至关重要。</P>\n"
@@ -1788,23 +1744,17 @@
#. Warning message when some add-ons are marked to be removed automatically
#: src/modules/Packages.rb:504
-msgid ""
-"Contact the vendors of these add-ons to provide you with new installation "
-"media."
+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:508
-msgid ""
-"Contact the vendor of the add-on to provide you with a new installation "
-"media."
+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:549
-msgid ""
-"Error: Cannot check free space in basic directory %1 (device %2), cannot "
-"start installation."
+msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation."
msgstr "错误:无法检查基础文件夹 %1 (设备 %2) 中的空闲空间,无法启动安装。"
#. error message: %1: e.g. "/local", %2: "/dev/sda2"
@@ -1853,7 +1803,9 @@
msgstr "<b>警告:</b>即将移除产品 <b>%s</b>。"
#: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+#, fuzzy
+#| msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
msgstr "<b>错误:</b>即将自动移除产品 <b>%s</b>。</font>"
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
@@ -1862,10 +1814,8 @@
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"
-"installation media</li><li>Or select the appropriate online extension or "
-"module\n"
-"in the registration step</li><li>Or to continue with product upgrade go to "
-"the\n"
+"installation media</li><li>Or select the appropriate online extension or module\n"
+"in the registration step</li><li>Or to continue with product upgrade go to the\n"
"software selection and mark the product (the -release package) for removal.\n"
"</li></ul></li></ul>"
msgstr ""
@@ -1876,48 +1826,46 @@
"</ul></li></ul>"
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
msgid "No repository found at '%1'."
msgstr "在 '%1' 下找不到软件源。"
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
msgid ""
-"<p><b>The release notes for the initial release are part of the "
-"installation\n"
+"<p><b>The release notes for the initial release are part of the installation\n"
"media. If an Internet connection is available during configuration, you can\n"
"download updated release notes from the SUSE Linux Web server.</b></p>\n"
msgstr ""
"<p><b>初始发布时的版本资讯是安装介质的一部分。\n"
-"安装期间若互联网连接可用,您可从 SUSE Linux 网络服务器下载更新的版本资讯。</"
-"b></p>\n"
+"安装期间若互联网连接可用,您可从 SUSE Linux 网络服务器下载更新的版本资讯。</b></p>\n"
#. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
msgid "Integrating booted media..."
msgstr "正在集成已引导的介质..."
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
msgid "Failed to integrate the service pack repository."
msgstr "集成服务包软件源失败。"
#. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
msgid "Initializing repositories..."
msgstr "正在初始化软件源..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
msgid "Insert %1 CD 1"
msgstr "请插入 %1 CD 1"
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
msgid "%1 CD 1 not found"
msgstr "%1 未找到 CD 1"
#. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1926,7 +1874,7 @@
"更多细节请检查日志文件 %1。"
#. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1935,12 +1883,12 @@
"将再次调出软件提案。"
#. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
msgid "Evaluating package selection..."
msgstr "正在评估软件包选集..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1951,66 +1899,72 @@
#. Sets that the license (file) has been already accepted
#.
#. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
msgid "Cannot read license file %1"
msgstr "无法读取许可文件 %1"
-#: src/modules/ProductLicense.rb:151
-msgid ""
-"To show the product license properly, put the license.tar.gz file to the "
-"root of the live media when building the image."
-msgstr ""
-"要正确显示产品许可,请在构建映像时把 license.tar.gz 文件放到 live 介质的根目"
-"录。"
+#: src/modules/ProductLicense.rb:153
+msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
+msgstr "要正确显示产品许可,请在构建映像时把 license.tar.gz 文件放到 live 介质的根目录。"
#. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
msgid "&Language"
msgstr "语言(&L)"
#. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
msgid "I &Agree to the License Terms."
msgstr "是,我的大斧已经饥渴难耐了。(&A)"
#. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+#, fuzzy
+#| msgid ""
+#| "If you want to print this EULA, you can find it\n"
+#| "on the first media in the file %1"
+msgid ""
"If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
msgstr "若想打印此最终用户许可协议,您可在第一个介质的 %1 文件中找到许可全文。"
#. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
"the configuration will be aborted.</p>\n"
msgstr ""
"<p>请仔细阅读许可协议并在可用选项中择一。\n"
-"当然若您不同意该许可协议 (<del>傲娇的霸王条款</del>...才没有啦),配置会立即中"
-"止。\n"
+"当然若您不同意该许可协议 (<del>傲娇的霸王条款</del>...才没有啦),配置会立即中止。\n"
"您亦无法畅享 openSUSE 这一最低调奢华有内涵的 Linux 发行版。\n"
-"这会是人生中怎样遗憾的事啊!为了避免您的人生有所缺憾,请选择是。这只是您电脑"
-"生涯中的一小步,却会是您精彩人生中的一大步!</p>\n"
+"这会是人生中怎样遗憾的事啊!为了避免您的人生有所缺憾,请选择是。这只是您电脑生涯中的一小步,却会是您精彩人生中的一大步!</p>\n"
#. dialog title
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
msgid "License Agreement"
msgstr "许可协议"
#. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
msgid "Really abort the add-on product installation?"
msgstr "真的中止附加产品安装吗?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
msgid ""
"Refusing the license agreement cancels the installation.\n"
"Really refuse the agreement?"
@@ -2019,7 +1973,7 @@
"真的拒绝协议吗?你一定会后悔的!"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1048
+#: src/modules/ProductLicense.rb:1044
msgid ""
"Refusing the license agreement cancels the add-on\n"
"product installation. Really refuse the agreement?"
@@ -2028,17 +1982,18 @@
"真的拒绝协议吗?"
#. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1058
+#: src/modules/ProductLicense.rb:1054
msgid "The system is shutting down..."
msgstr "系统正在关机..."
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
#: src/modules/ProductLicense.rb:1153
msgid "%s License Agreement"
msgstr "%s 许可协议"
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
@@ -2140,7 +2095,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
msgid "S&MB/CIFS"
msgstr "S&MB/CIFS"
@@ -2185,100 +2140,100 @@
msgstr "下载软件源描述文件(&D)"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
msgid ""
"<p>If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>"
msgstr "<p>若该位置是保存介质 ISO 映像的文件,请设置 <b>ISO 映像</b>。</p>"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
msgid ""
"<p>If the repository is on multiple media,\n"
"set the location of the first media of the set.</p>\n"
msgstr "<p>若该软件源位于多个介质上,请设置该组介质的第一个介质的位置。</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
msgid "&Server Name"
msgstr "服务器名称(&S)"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1614
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
msgid "&Path to Directory or ISO Image"
msgstr "文件夹或 ISO 映像路径(&P)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
msgid "&ISO Image"
msgstr "&ISO 映像"
#. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
msgid "N&FS v4 Protocol"
msgstr "N&FS v4 协议"
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
msgid "Mount Options"
msgstr "挂载选项"
#. 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:163
+#: src/modules/SourceDialogs.rb:164
msgid "(default)"
msgstr "(默认)"
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
msgid "URL of the Repository"
msgstr "软件源 URL"
#. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
msgid "P&rotocol"
msgstr "协议(&R)"
#. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
msgid "&URL of the Repository"
msgstr "软件源 &URL"
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
msgid "Repository URL"
msgstr "软件源 URL"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
msgid "NFS Server"
msgstr "NFS 服务器"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
msgid "CD or DVD Media"
msgstr "CD 或 DVD 介质"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
msgid "Hard Disk"
msgstr "硬盘"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
msgid "USB Stick or Disk"
msgstr "USB 记忆棒或磁盘"
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:919
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
msgid "Local Directory"
msgstr "本地文件夹"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
msgid "Local ISO Image"
msgstr "本地 ISO 映像"
@@ -2287,62 +2242,57 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: 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
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
msgid "Server and Directory"
msgstr "服务器和文件夹"
#. popup message
-#: src/modules/SourceDialogs.rb:461
+#: src/modules/SourceDialogs.rb:469
msgid "The name of the repository cannot be empty."
msgstr "软件源名称不能为空。"
#. text entry
-#: src/modules/SourceDialogs.rb:473
+#: src/modules/SourceDialogs.rb:482
msgid "&Repository Name"
msgstr "软件源名称(&R)"
#. help text
-#: src/modules/SourceDialogs.rb:488
+#: src/modules/SourceDialogs.rb:497
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
-"Use <b>Repository Name</b> to specify the name of the repository. If it is "
-"empty, YaST will use the product name (if available) or the URL as the name."
-"</p>\n"
+"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
msgstr ""
"<p><big><b>软件源名称</b></big><br>\n"
-"使用<b>软件源名称</b>指定软件源名称。若留空,YaST 将使用产品名 (若有) 或 URL "
-"作为其名称。</p>\n"
+"使用<b>软件源名称</b>指定软件源名称。若留空,YaST 将使用产品名 (若有) 或 URL 作为其名称。</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:502
+#: src/modules/SourceDialogs.rb:511
msgid "&Service Name"
msgstr "服务名称(&S)"
#. help text
-#: src/modules/SourceDialogs.rb:510
+#: src/modules/SourceDialogs.rb:519
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
-"Use <b>Service Name</b> to specify the name of the service. If it is empty, "
-"YaST will use part of the service URL as the name.</p>\n"
+"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
msgstr ""
"<p><big><b>服务名称</b></big><br>\n"
-"使用<b>服务名称</b>指定服务名。若留空,YaST 将使用服务 URL 的一部分作为其名"
-"称。</p>\n"
+"使用<b>服务名称</b>指定服务名。若留空,YaST 将使用服务 URL 的一部分作为其名称。</p>\n"
#. popup message
-#: src/modules/SourceDialogs.rb:545
+#: src/modules/SourceDialogs.rb:554
msgid "URL cannot be empty."
msgstr "URL 不能为空。"
#. text entry
-#: src/modules/SourceDialogs.rb:559
+#: src/modules/SourceDialogs.rb:568
msgid "&URL"
msgstr "&URL"
#. help text
-#: src/modules/SourceDialogs.rb:573
+#: src/modules/SourceDialogs.rb:582
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2354,16 +2304,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:746 src/modules/SourceDialogs.rb:1886
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
msgid "Edit Parts of the URL"
msgstr "编辑部分 URL"
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
msgid "Edit Complete URL"
msgstr "编辑完整 URL"
#. help text
-#: src/modules/SourceDialogs.rb:765
+#: src/modules/SourceDialogs.rb:774
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2373,12 +2323,11 @@
"使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>\n"
"指定 NFS 服务器主机名和服务器上的路径。<p>"
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:781
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
-"This is an expert option, keeping the default value is recommened. See "
-"<b>man 5 nfs</b>\n"
+"This is an expert option, keeping the default value is recommened. See <b>man 5 nfs</b>\n"
"for details and the list of supported options."
msgstr ""
"<p><big><b>挂载选项</b></big><br>\n"
@@ -2386,16 +2335,16 @@
"这是一个专家选项,推荐保持默认值。细节和支持选项列表请参考 <b>man 5 nfs</b>。"
#. radio button
-#: src/modules/SourceDialogs.rb:827
+#: src/modules/SourceDialogs.rb:836
msgid "&CD-ROM"
msgstr "&CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:829
+#: src/modules/SourceDialogs.rb:838
msgid "&DVD-ROM"
msgstr "&DVD-ROM"
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:843
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2404,26 +2353,26 @@
"设置 <b>CD-ROM</b> 或 <b>DVD-ROM</b> 以指定介质类型。</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:934
+#: src/modules/SourceDialogs.rb:943
msgid "ISO Image File"
msgstr "ISO 映像文件"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:957
+#: src/modules/SourceDialogs.rb:966
msgid ""
"The entered path is not a directory\n"
"or the directory does not exist.\n"
msgstr "输入路径不是一个文件夹或该文件夹不存在。\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:987
+#: src/modules/SourceDialogs.rb:996
msgid ""
"The entered path is not a file\n"
"or the file does not exist.\n"
msgstr "输入路径不是一个文件或该文件不存在。\n"
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1011
+#: src/modules/SourceDialogs.rb:1020
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2434,17 +2383,17 @@
"仍然使用它吗?\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1032
+#: src/modules/SourceDialogs.rb:1041
msgid "&Path to Directory"
msgstr "文件夹路径(&P)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1040 src/modules/SourceDialogs.rb:1298
-#: src/modules/SourceDialogs.rb:1365
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
msgid "&Plain RPM Directory"
msgstr "纯 RPM 文件夹(&P)"
-#: src/modules/SourceDialogs.rb:1055
+#: src/modules/SourceDialogs.rb:1064
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2459,20 +2408,20 @@
"<b>纯 RPM 文件夹</b>选项。</p>\n"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1291
+#: src/modules/SourceDialogs.rb:1300
msgid "&USB Mass Storage Device"
msgstr "&USB 大容量存储设备"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1296 src/modules/SourceDialogs.rb:1363
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
msgid "&File System"
msgstr "文件系统(&F)"
-#: src/modules/SourceDialogs.rb:1297 src/modules/SourceDialogs.rb:1364
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
msgid "Dire&ctory"
msgstr "文件夹(&C)"
-#: src/modules/SourceDialogs.rb:1302
+#: src/modules/SourceDialogs.rb:1311
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2492,7 +2441,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:1312 src/modules/SourceDialogs.rb:1379
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
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"
@@ -2502,11 +2451,11 @@
"若检测失败,或您想要使用特定文件系统,还可从列表中选择。</p>\n"
#. combobox title
-#: src/modules/SourceDialogs.rb:1362
+#: src/modules/SourceDialogs.rb:1371
msgid "&Disk Device"
msgstr "磁盘设备(&D)"
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1378
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2524,12 +2473,12 @@
"<b>纯 RPM 文件夹</b>选项。</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1395
+#: src/modules/SourceDialogs.rb:1404
msgid "&Path to ISO Image"
msgstr "ISO 映像路径(&P)"
#. push button
-#: src/modules/SourceDialogs.rb:1415
+#: src/modules/SourceDialogs.rb:1424
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2539,71 +2488,71 @@
"使用<b>ISO 映像路径</b>指定 ISO 映像文件的路径。</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1596
+#: src/modules/SourceDialogs.rb:1605
msgid "Server &Name"
msgstr "服务器名称(&N)"
-#: src/modules/SourceDialogs.rb:1600
+#: src/modules/SourceDialogs.rb:1609
msgid "&Port"
msgstr "端口(&P)"
#. text entry
-#: src/modules/SourceDialogs.rb:1605
+#: src/modules/SourceDialogs.rb:1614
msgid "&Share"
msgstr "共享(&S)"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1618
+#: src/modules/SourceDialogs.rb:1627
msgid "ISO &Image"
msgstr "&ISO 映像"
#. text entry
-#: src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:1630
msgid "&Directory on Server"
msgstr "服务器上的文件夹(&D)"
#. frame
-#: src/modules/SourceDialogs.rb:1626
+#: src/modules/SourceDialogs.rb:1635
msgid "Au&thentication"
msgstr "认证(&T)"
#. check box
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1642
msgid "&Anonymous"
msgstr "匿名(&A)"
#. text entry
-#: src/modules/SourceDialogs.rb:1642
+#: src/modules/SourceDialogs.rb:1651
msgid "&Workgroup or Domain"
msgstr "工作组或域(&W)"
#. text entry
-#: src/modules/SourceDialogs.rb:1651
+#: src/modules/SourceDialogs.rb:1660
msgid "&User Name"
msgstr "用户名(&U)"
#. password entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1667
msgid "&Password"
msgstr "密码(&P)"
#. radio button
-#: src/modules/SourceDialogs.rb:1733
+#: src/modules/SourceDialogs.rb:1742
msgid "&FTP"
msgstr "&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1736
+#: src/modules/SourceDialogs.rb:1745
msgid "H&TTP"
msgstr "H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1752
msgid "HTT&PS"
msgstr "HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1917
+#: src/modules/SourceDialogs.rb:1926
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"
@@ -2611,25 +2560,22 @@
"To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
"<b>User Name</b> and the <b>Password</b>.</p>\n"
"<p>\n"
-"For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to "
-"Directory\n"
+"For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
"or ISO Image</b>. \n"
"If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>\n"
msgstr ""
"<p><big><b>服务器和文件夹</b></big><br>\n"
-"使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>指定 NFS 服务器主机名和在"
-"服务器上的路径。\n"
+"使用<b>服务器名称</b>和<b>文件夹或 ISO 映像路径</b>指定 NFS 服务器主机名和在服务器上的路径。\n"
"要启用认证,请反选<b>匿名</b>并指定<b>用户名</b>和<b>密码</b>。<p>\n"
"<p>\n"
"要启用 SMB/CIFS 软件源,请指定<b>共享</b>名和<b>文件夹或 ISO 映像路径</b>。\n"
"若该位置是保存介质 ISO 映像的文件,请设置 <b>ISO 映像</b>。</p>\n"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1930
+#: src/modules/SourceDialogs.rb:1939
msgid ""
-"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS "
-"repository.\n"
+"<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"
msgstr ""
"<p>可为 HTTP/HTTPS 软件源设置<b>端口</b>号。\n"
@@ -2638,12 +2584,20 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1992
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+#, fuzzy
+#| msgid "I would like to install an additional Add On Product"
+msgid "I would li&ke to install an additional Add On Product"
msgstr "我想要安装一个额外的附加产品"
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+#| msgid "Checking Network Configuration ..."
+msgid "Net&work Configuration..."
+msgstr "正在检查网络配置..."
+
#. help text
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2136
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2653,7 +2607,7 @@
"软件源可位于 CD、网络服务器或硬盘上。</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2128
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2664,7 +2618,7 @@
"请准备好产品 CD 集或 DVD。</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2155
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -2678,7 +2632,7 @@
"若已将全部 CD 复制进了相同文件夹,则只需输入基本路径。</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2150
+#: src/modules/SourceDialogs.rb:2167
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2690,30 +2644,29 @@
"请指定第一张 CD 中的软件包所在的文件夹,诸如 /data1/CD1。</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2165
+#: src/modules/SourceDialogs.rb:2182
msgid "Select the media type"
msgstr "选择介质类型"
-#: src/modules/SourceDialogs.rb:2171
+#: src/modules/SourceDialogs.rb:2188
msgid "Insert the add-on product CD"
msgstr "请插入附加产品 CD"
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2189
msgid "Insert the add-on product DVD"
msgstr "请插入附加产品 DVD"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2190
+#: src/modules/SourceDialogs.rb:2207
msgid "No USB disk was detected."
msgstr "未检测到 USB 磁盘。"
-#. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2393
+#. use three slashes as third slash means path
+#: src/modules/SourceDialogs.rb:2415
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
-"repository. Check <b>Download repository description files</b> to download "
-"the\n"
+"repository. Check <b>Download repository description files</b> to download the\n"
"files when closing this YaST module. If the option is unchecked, YaST will\n"
"automatically download the files when it needs them later. </p>\n"
msgstr ""
@@ -2723,19 +2676,19 @@
"若不选该选项,则 YaST 将在稍后需要这些文件时自动下载它们。</p>\n"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2613
+#: src/modules/SourceDialogs.rb:2635
msgid "Media Type"
msgstr "介质类型"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2637
+#: src/modules/SourceDialogs.rb:2659
msgid "Add On Product"
msgstr "附加产品"
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2668
+#: src/modules/SourceDialogs.rb:2690
msgid "URL scheme '%s' is not valid."
msgstr "URL 方案 '%s' 无效。"
@@ -2927,28 +2880,22 @@
msgstr "没有在您的网络上发现 SLP 软件源。"
#. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
msgid "Partition \"%1\" needs %2 more disk space."
msgstr "分区 \"%1\" 需要 %2 更多磁盘空间。"
#. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
msgid ""
"Deselect packages or delete data or temporary files\n"
"before updating the system.\n"
msgstr "在更新系统前请反选一些软件包或者删除一些数据或临时文件。\n"
#. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
msgid "Deselect some packages."
msgstr "请反选一些软件包。"
-#~ msgid "Raw URL: %s"
-#~ msgstr "裸 URL:%s"
-
-#~ msgid "Only repositories not provided by a service"
-#~ msgstr "只有软件源未由服务提供"
-
#~ msgid "Downloading patch RPM %1 (download size %2)"
#~ msgstr "正在下载补丁 RPM %1 (下载大小 %2)"
@@ -2989,9 +2936,6 @@
#~ msgid "Initialize Software Manager"
#~ msgstr "初始化软件管理器"
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "正在检查网络配置..."
-
#~ msgid "Initializing Software Manager ... "
#~ msgstr "正在初始化软件管理器..."
@@ -3030,22 +2974,16 @@
#~ msgid ""
#~ "<p><big><b>Package Search</b></big><br>\n"
-#~ "Use the functionality of <i>Webpin package search</i> to search in all "
-#~ "known openSUSE build-service and openSUSE community repositories.</p>\n"
+#~ "Use the functionality of <i>Webpin package search</i> to search in all known openSUSE build-service and openSUSE community repositories.</p>\n"
#~ msgstr ""
#~ "<p><big><b>软件包搜索</b></big><br>\n"
-#~ "使用<i>Webpin 软件包搜索</i>功能来搜索全部已知的 openSUSE 编译服务和社区软"
-#~ "件源。</p>\n"
+#~ "使用<i>Webpin 软件包搜索</i>功能来搜索全部已知的 openSUSE 编译服务和社区软件源。</p>\n"
#~ msgid ""
-#~ "<p><big><b>Security</b></big><br> The software found is often not part of "
-#~ "the\n"
+#~ "<p><big><b>Security</b></big><br> The software found is often not part of the\n"
#~ "distribution itself. You need to decide whether to trust the source of a\n"
-#~ "package. We do not take any responsibility for installing such software.</"
-#~ "p>\n"
-#~ msgstr ""
-#~ "<p><big><b>安全性</b></big><br>找到的软件通常不是发行版自身的一部分。您需"
-#~ "要决定是否信任软件包的来源。我们不为安装了这样的软件导致的问题负责。</p>\n"
+#~ "package. We do not take any responsibility for installing such software.</p>\n"
+#~ msgstr "<p><big><b>安全性</b></big><br>找到的软件通常不是发行版自身的一部分。您需要决定是否信任软件包的来源。我们不为安装了这样的软件导致的问题负责。</p>\n"
#~ msgid "Select packages to install."
#~ msgstr "选择要安装的软件包。"
@@ -3105,10 +3043,8 @@
#~ msgstr "搜索范围(&I)"
#~ msgid ""
-#~ "<p><b>These are the release notes made for the first initial release. "
-#~ "They are\n"
-#~ "part of the installation media. During the configuration steps, if a "
-#~ "connection\n"
+#~ "<p><b>These are the release notes made for the first initial release. They are\n"
+#~ "part of the installation media. During the configuration steps, if a connection\n"
#~ "to the Internet is available, you can download updated release notes\n"
#~ "from the SUSE Linux Web server.</b></p>"
#~ msgstr ""
@@ -3179,14 +3115,10 @@
#~ msgid "Synchronizing with ZENworks"
#~ msgstr "正在与 ZENworks 同步"
-#~ msgid ""
-#~ "Your service was added successfully in YaST, but could not be "
-#~ "synchronized with ZENworks."
+#~ msgid "Your service was added successfully in YaST, but could not be synchronized with ZENworks."
#~ msgstr "您的服务已使用 YaST 成功添加,但无法与 ZenWorks 同步。"
-#~ msgid ""
-#~ "Your service was deleted successfully in YaST, but could not be "
-#~ "synchronized with ZENworks."
+#~ msgid "Your service was deleted successfully in YaST, but could not be synchronized with ZENworks."
#~ msgstr "您的服务已使用 YaST 成功删除,但无法与 ZenWorks 同步。"
#~ msgid "Command timed out after %1 milliseconds."
Modified: trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/pkg-bindings.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: pkg-bindings\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2013-02-01 21:40+0800\n"
"Last-Translator: 玛格丽特 · 苏 <i(a)marguerite.su>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -46,12 +46,12 @@
msgstr "<P><BIG><B>正在刷新软件源</B></BIG></P><P>软件包管理器正在更新软件源内容...</P>"
#. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
msgid "The package cannot be selected to install."
msgstr "不能选择安装该软件包。"
#. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
msgid "The package is not available."
msgstr "软件包不可用。"
Modified: trunk/yast/zh_CN/po/printer.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/printer.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/printer.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: printer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2016-03-02 21:53+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -73,19 +73,16 @@
#. If cups is missing, there can be no local running cupsd which is
#. mandatory to set up local print queues.
#: src/clients/printer_proposal.rb:92
-msgid ""
-"Cannot configure printing (required package cups-client is not installed)."
+msgid "Cannot configure printing (required package cups-client is not installed)."
msgstr "无法配置打印 (未安装需要的 cups-client 软件包)。"
#: src/clients/printer_proposal.rb:102
-msgid ""
-"Cannot configure local printers (required package cups is not installed)."
+msgid "Cannot configure local printers (required package cups is not installed)."
msgstr "无法配置本地打印机 (未安装需要的软件包 cups)。"
#. Skip automated queue setup when it is a client-only config:
#: src/clients/printer_proposal.rb:117
-msgid ""
-"No local printer accessible (using remote CUPS server '%1' for printing)."
+msgid "No local printer accessible (using remote CUPS server '%1' for printing)."
msgstr "没有可访问的本地打印机 (使用远程 CUPS 服务器 %1 打印)。"
#. Wait half a minute for a new started cupsd:
@@ -189,17 +186,14 @@
#. Header for a dialog section where the user can
#. specify if USB printers are configured automatically:
#: src/include/printer/autoconfig.rb:61
-msgid ""
-"Specify if automatic USB printer configuration should happen when plug in"
+msgid "Specify if automatic USB printer configuration should happen when plug in"
msgstr "指定是否在插入 USB 打印机时进行自动配置"
#. CheckBox for automatic configuration of USB printers
#. by installing or removing the RPM package udev-configure-printer.
#. Do not change or translate "udev-configure-printer", it is a RPM package name.
#: src/include/printer/autoconfig.rb:75
-msgid ""
-"&Use the package udev-configure-printer for automatic USB printer"
-" configuration"
+msgid "&Use the package udev-configure-printer for automatic USB printer configuration"
msgstr "使用 udev-configure-printer 软件包进行自动 USB 打印机配置(&U)"
#. where %1 will be replaced by the server name:
@@ -207,7 +201,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:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -217,16 +211,14 @@
#. PopupYesNoHeadline headline
#. PopupYesNoHeadline body:
#: src/include/printer/autoconfig.rb:101
-msgid ""
-"A remote CUPS server setting conflicts with automatic configuration of"
-" printers for the local system."
+msgid "A remote CUPS server setting conflicts with automatic configuration of printers for the local system."
msgstr "一个远程 CUPS 服务器设置与本地系统的打印机自动配置冲突。"
#. 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:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -351,7 +343,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
msgid "Description"
msgstr "描述"
@@ -455,8 +447,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:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
msgid "Nothing Selected"
msgstr "未选择任何项"
@@ -506,9 +498,7 @@
#. Body of a Popup::AnyMessage when a wrong queue name was entered:
#: src/include/printer/basicadd.rb:379
-msgid ""
-"Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed"
-" for the queue name."
+msgid "Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed for the queue name."
msgstr "队列名中仅允许使用字母 (a-z 和 A-Z),数字 (0-9) 和下划线 '_' 。"
#. when a queue name is changed to be valid:
@@ -531,9 +521,7 @@
#. The 'next dialog' is the overview dialog where the printer configurations are shown
#. which has a 'Refresh List' button to update the shown printer configurations:
#: src/include/printer/basicadd.rb:430 src/include/printer/basicadd.rb:821
-msgid ""
-"If the next dialog does not show the new printer configuration as expected,"
-" wait some time and use the 'Refresh List' button."
+msgid "If the next dialog does not show the new printer configuration as expected, wait some time and use the 'Refresh List' button."
msgstr "如果下一个对话框未如预期的显示新打印机配置,请点击 '刷新列表' 按钮。"
#. Only a simple message because before the RunHpsetup function was called
@@ -580,9 +568,7 @@
#. Do not change or translate "raw", it is a technical term when no driver is used.
#. Do not change or translate "System V style interface script", it is a technical term.
#: src/include/printer/basicmodify.rb:315
-msgid ""
-"No driver is used (it is a 'raw' queue or a 'System V style interface script'"
-" is used)"
+msgid "No driver is used (it is a 'raw' queue or a 'System V style interface script' is used)"
msgstr "没有使用驱动(在使用一个“原始”队列或者“System V 风格接口脚本”)"
#: src/include/printer/basicmodify.rb:323
@@ -634,9 +620,7 @@
#. The 'next dialog' is the overview dialog where the printer configurations are shown
#. which has a 'Refresh List' button to update the shown printer configurations:
#: src/include/printer/basicmodify.rb:823
-msgid ""
-"If the next dialog does not show the expected modifications, wait some time"
-" and use the 'Refresh List' button."
+msgid "If the next dialog does not show the expected modifications, wait some time and use the 'Refresh List' button."
msgstr "如果下一个对话框未如预期显示修改内容,请点击 '刷新列表' 按钮。"
#. Exit this dialog in any case:
@@ -662,8 +646,7 @@
#. 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:432
-msgid ""
-"Keep the model or select a &manufacturer if no 'raw queue' should be set up"
+msgid "Keep the model or select a &manufacturer if no 'raw queue' should be set up"
msgstr "如果不应该设置 '原始队列‘ 的话,保留打印机型号或选择另一个生产厂商"
#. Header for a ComboBox to select the printer manufacturer:
@@ -780,8 +763,7 @@
msgstr "停止位(&T)"
#: src/include/printer/connectionwizard.rb:1076
-msgid ""
-"To access a bluetooth printer, the RPM package bluez-cups must be installed."
+msgid "To access a bluetooth printer, the RPM package bluez-cups must be installed."
msgstr "要访问蓝牙打印机,必须安装 bluez-cups RPM 软件包。"
#. The user can also decide during the actual installation not to install it
@@ -862,8 +844,7 @@
msgstr "URI(参见打印机手册)[百分号编码]"
#: src/include/printer/connectionwizard.rb:1402
-msgid ""
-"To access a SMB printer share, the RPM package samba-client must be installed."
+msgid "To access a SMB printer share, the RPM package samba-client must be installed."
msgstr "要访问 SMB 打印机共享,必须安装 samba-client RPM 软件包。"
#. The user can also decide during the actual installation not to install it
@@ -983,7 +964,6 @@
msgstr "程序 (/到/指令?选项=值/的/路径) [百分号编码]"
#: src/include/printer/connectionwizard.rb:2044
-#| msgid "<p>To configure Heartbeat, the <b>%1</b> package must be installed.</p>"
msgid "To use 'beh', the RPM package cups-backends must be installed."
msgstr "要使用 'beh',必须安装 RPM 软件包 cups-backends。"
@@ -1181,8 +1161,7 @@
msgstr "'space' 奇偶校验只支持 7 个数据位。"
#: src/include/printer/connectionwizard.rb:2509
-msgid ""
-"The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
+msgid "The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
msgstr "'mark' 奇偶校验只支持 7 个数据位和一个停止位。"
#: src/include/printer/connectionwizard.rb:2551
@@ -1351,9 +1330,7 @@
#. 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:3273
-msgid ""
-"To support Active Directory (R), the RPM package samba-krb-printing must be"
-" installed."
+msgid "To support Active Directory (R), the RPM package samba-krb-printing must be installed."
msgstr "要访问活动目录 (R),必须安装 RPM 软件包 samba-krb-printing。"
#. Show a user notification before it gets disabled:
@@ -1537,8 +1514,7 @@
#. 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:685
-msgid ""
-"The printer description file is not in compliance with the specification."
+msgid "The printer description file is not in compliance with the specification."
msgstr "打印机描述文件不符合规格。"
#. when a PPD file is not in compliance:
@@ -1549,8 +1525,7 @@
#. Body of a Popup::ContinueCancelHeadline
#. when PPD file is not in compliance:
#: src/include/printer/driveradd.rb:705
-msgid ""
-"A non-compliant printer description file can lead to arbitrary failures."
+msgid "A non-compliant printer description file can lead to arbitrary failures."
msgstr "一个不兼容的打印机描述文件可能导致任何错误。"
#: src/include/printer/driveradd.rb:722
@@ -1599,14 +1574,12 @@
"<b><big>Print Queue Overview</big></b><br>\n"
"A printer device is not used directly but via a print queue.<br>\n"
"When various applications submit print jobs simultaneously,\n"
-"these jobs are put in a queue and are sent one after the other to the"
-" printer\n"
+"these jobs are put in a queue and are sent one after the other to the printer\n"
"device.<br>\n"
"It is possible to have several different print queues for the same printer\n"
"device.\n"
"For example a second queue with a monochrome-only driver for a color device\n"
-"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL"
-" printer.\n"
+"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -1614,8 +1587,7 @@
"打印机设备不能直接访问,需要通过打印队列访问。<br>\n"
"当多种应用程序自发提交打印任务时,这些任务被放队列,一个接一个的发送到打印机设备。<br>\n"
"相同的打印机设备可以接受一些不同的打印队列。\n"
-"例如彩色设备的一个使用黑白驱动的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL 驱动的队列。</p"
-">\n"
+"例如彩色设备的一个使用黑白驱动的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL 驱动的队列。</p>\n"
#. Overview dialog help 2/7:
#: src/include/printer/helps.rb:65
@@ -1729,19 +1701,14 @@
"<b><big>Set Up a New Queue for a Printer Device</big></b><br>\n"
"A printer device is not used directly but via a print queue.<br>\n"
"When various application programs submit print jobs simultaneously,\n"
-"the jobs queue up and are sent one after the other to the printer device.<br"
-">\n"
-"It is possible to have several different print queues for the same printer"
-" device.\n"
-"Usually several print queues are needed when several different printer"
-" drivers\n"
+"the jobs queue up and are sent one after the other to the printer device.<br>\n"
+"It is possible to have several different print queues for the same printer device.\n"
+"Usually several print queues are needed when several different printer drivers\n"
"should be used for the same printer device.\n"
"For example a second queue with a monochrome-only driver\n"
"to enforce black-only printout on a color device\n"
-"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL"
-" printer\n"
-"because printing via the PCL driver is usually faster (but with less"
-" quality).\n"
+"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer\n"
+"because printing via the PCL driver is usually faster (but with less quality).\n"
"</p>"
msgstr ""
"<p>\n"
@@ -1750,8 +1717,7 @@
"当多种应用程序自发提交打印任务时,任务会排队,一个接一个的发送到打印设备。<br>\n"
"相同的打印机设备可以接受一些不同的打印队列。\n"
"通常当同一个打印设备使用了一些不同的打印机驱动时,就需要一些不同的打印队列。\n"
-"例如彩色设备的一个使用黑白驱动来强制黑白输出的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL"
-" 驱动的队列,因为通过 PCL 驱动打印通常更快 (但质量会降低)。</p>"
+"例如彩色设备的一个使用黑白驱动来强制黑白输出的二级队列或者PostScript+PCL 打印机的一个 PostScript 队列和一个使用 PCL 驱动的队列,因为通过 PCL 驱动打印通常更快 (但质量会降低)。</p>"
#. BasicAddDialog help 2/7:
#: src/include/printer/helps.rb:143
@@ -1774,8 +1740,7 @@
#: src/include/printer/helps.rb:152
msgid ""
"<p>\n"
-"The <b>connection</b> determines which way data is sent to the printer"
-" device.<br>\n"
+"The <b>connection</b> determines which way data is sent to the printer device.<br>\n"
"If a wrong connection is selected, no data can be sent to the device\n"
"so that there cannot be any printout.<br>\n"
"If a printer device is accessible via more than one connection type,\n"
@@ -1783,10 +1748,8 @@
"In particular HP devices are often accessible both via the 'usb:/...'\n"
"and the 'hp:/...' connection.\n"
"The latter is provided by the HP driver package 'hplip'.\n"
-"For plain printing, both kinds of connections should work, but for anything"
-" else\n"
-"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one"
-" device)\n"
+"For plain printing, both kinds of connections should work, but for anything else\n"
+"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
"the 'hp:/...' connection must be used.\n"
"</p>\n"
msgstr ""
@@ -1807,8 +1770,7 @@
"The <b>driver</b> determines that the right data is produced for the\n"
"specific printer model.<br>\n"
"If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<"
-"br>\n"
+"which results bad looking printout, chaotic printout, or no printout at all.<br>\n"
"Initially the input field for the driver search string is preset\n"
"with the autodetected model name of the currently selected connection\n"
"and those drivers where the driver description matches to the model name\n"
@@ -1833,8 +1795,7 @@
"and feel free to play around and modify the settings\n"
"to what you know what works best for your printer.<br>\n"
"If no driver description matches to the autodetected model name,\n"
-"it does not necessarily mean that there is no driver available for the"
-" model.\n"
+"it does not necessarily mean that there is no driver available for the model.\n"
"Often only the model name in the driver descriptions\n"
"is different from the autodetected model name.\n"
"Therefore you can enter whatever you like as driver search string\n"
@@ -1857,17 +1818,11 @@
"<b>驱动</b>使指定型号的打印机可以输出正确的数据。<br>\n"
"如果指定了错误的驱动,会发送错误的数据到打印机,这将造成难看的、混乱的打印输出,或完全没有打印输出。<br>\n"
"驱动搜索的搜索关键词输入框初始预设为当前选中连接的自动检测到的型号名称,那些驱动描述匹配型号名称的驱动默认自动显示。<br>\n"
-"如果驱动描述匹配自动检测到的型号名称,或所有匹配的驱动描述都属于同一个型号,驱动描述会被分类,最有可能的驱动列示在最上方并被自动预选中。如果没有驱动被自动预"
-"选中,您必须手动查找和选择一个合适的驱动。<br>\n"
-"另外如果一个驱动被自动预选中,也不意味着这个驱动就一定是能满足您特殊需要的最佳驱动。严格的说一个自动预选中的驱动可能在您的特殊打印机型号上完全不能用。原因是"
-"由于自动驱动选择只能基于比较字符串(自动检测到的型号名和驱动描述)来作业,因此结果只是如何设置您的特殊打印机型号的最佳猜想的方案。<br>\n"
+"如果驱动描述匹配自动检测到的型号名称,或所有匹配的驱动描述都属于同一个型号,驱动描述会被分类,最有可能的驱动列示在最上方并被自动预选中。如果没有驱动被自动预选中,您必须手动查找和选择一个合适的驱动。<br>\n"
+"另外如果一个驱动被自动预选中,也不意味着这个驱动就一定是能满足您特殊需要的最佳驱动。严格的说一个自动预选中的驱动可能在您的特殊打印机型号上完全不能用。原因是由于自动驱动选择只能基于比较字符串(自动检测到的型号名和驱动描述)来作业,因此结果只是如何设置您的特殊打印机型号的最佳猜想的方案。<br>\n"
"因此请检查当前预选中的值是否正确,如果您知道您的打印机使用哪种驱动更好的话也可以任意修改设置。<br>\n"
-"如果没有匹配自动检测到的型号名的驱动描述,这也不意味着没有该型号的驱动可用。通常只是驱动描述中的型号名和自动检测到的型号名不同。因此您可以输入您想要的驱动搜"
-"索关键词并搜索全部可用驱动描述。<br>\n"
-"通常默认驱动选项设置应该是合理的,所以该驱动可以用于您的打印机型号。一些驱动选项设置必须匹配您的打印机。尤其是驱动的默认纸张大小设置必须匹配您打印机中实际装"
-"载的纸张。您可以明确的选择 A4 或 Letter 作为默认纸张大小,或者不选以使用驱动内置的默认纸张大小,该内置选项也是当驱动不支持 A4 和"
-" Letter 时的回退选项 (例如小尺寸相片打印机的驱动)。如果您喜欢调整除了 A4 或 Letter"
-" 以外的驱动选项,您必须先设定好队列,然后在下一步的 '编辑/修改' 对话框中调整所有驱动选项。\n"
+"如果没有匹配自动检测到的型号名的驱动描述,这也不意味着没有该型号的驱动可用。通常只是驱动描述中的型号名和自动检测到的型号名不同。因此您可以输入您想要的驱动搜索关键词并搜索全部可用驱动描述。<br>\n"
+"通常默认驱动选项设置应该是合理的,所以该驱动可以用于您的打印机型号。一些驱动选项设置必须匹配您的打印机。尤其是驱动的默认纸张大小设置必须匹配您打印机中实际装载的纸张。您可以明确的选择 A4 或 Letter 作为默认纸张大小,或者不选以使用驱动内置的默认纸张大小,该内置选项也是当驱动不支持 A4 和 Letter 时的回退选项 (例如小尺寸相片打印机的驱动)。如果您喜欢调整除了 A4 或 Letter 以外的驱动选项,您必须先设定好队列,然后在下一步的 '编辑/修改' 对话框中调整所有驱动选项。\n"
"</p>"
#. BasicAddDialog help 5/7:
@@ -1933,8 +1888,7 @@
"<p>\n"
"另外一种设置惠普设备的方法是运行 <b>hp-setup</b>。<br>\n"
"惠普自有工具 'hp-setup' 提供了需要从惠普下载私有驱动插件并在最终用户系统中正确安装的惠普打印机和惠普多合一设备的设置支持。\n"
-"另外 'hp-setup' 可以为惠普的网络打印机和惠普的多合一网络设备提供更好的支持,因为惠普的自有工具可以实现针对特殊惠普网络设备的特殊处理。<br"
-">\n"
+"另外 'hp-setup' 可以为惠普的网络打印机和惠普的多合一网络设备提供更好的支持,因为惠普的自有工具可以实现针对特殊惠普网络设备的特殊处理。<br>\n"
"详情请见 openSUSE 支持数据库文章 '如何设置惠普打印机' 于<br>\n"
"http://zh.opensuse.org/SDB:How_to_set_up_a_HP_printer\n"
"</p>"
@@ -1964,10 +1918,8 @@
"In particular HP devices are often accessible both via the 'usb:/...'\n"
"and the 'hp:/...' connection.\n"
"The latter is provided by the HP driver package 'hplip'.\n"
-"For plain printing, both kinds of connections should work, but for anything"
-" else\n"
-"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one"
-" device)\n"
+"For plain printing, both kinds of connections should work, but for anything else\n"
+"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
"the 'hp:/...' connection must be used.<br>\n"
"When you exchange the currently used connection with another one,\n"
"the input field for the driver search string is preset\n"
@@ -2006,12 +1958,9 @@
"使用惠普多合一设备扫描) 就必须使用 'hp:/...' 连接。\n"
"当您变更目前使用的连接为另一个时,驱动搜索关键词输入框将预设为新选择的连接的自动检测到型号名。\n"
"驱动描述匹配型号名称的驱动也将默认显示。<br>\n"
-"如果驱动描述匹配自动检测到的型号名,或者所有匹配的驱动描述属于同一型号,驱动描述将被分类,最有可能的驱动列示在最顶部"
-" (但依然在当前使用的驱动下面)。另一方面,它并不意味着该驱动能合理的满足您的特殊需求。最顶部列示的驱动可能在您的打印机型号上完全不能用。自动驱动选择基于自"
-"动检测到的型号名称和驱动描述的字符串对比,因此结果只是如何设置您的打印机型号的最佳猜想方案。<br>\n"
+"如果驱动描述匹配自动检测到的型号名,或者所有匹配的驱动描述属于同一型号,驱动描述将被分类,最有可能的驱动列示在最顶部 (但依然在当前使用的驱动下面)。另一方面,它并不意味着该驱动能合理的满足您的特殊需求。最顶部列示的驱动可能在您的打印机型号上完全不能用。自动驱动选择基于自动检测到的型号名称和驱动描述的字符串对比,因此结果只是如何设置您的打印机型号的最佳猜想方案。<br>\n"
"因此请检查当前预选中的值满足需求,如果您知道哪款驱动最适合您的打印机,请随意修改设置。<br>\n"
-"如果没有驱动描述匹配自动检测到的型号名,它也不意味着该型号没有驱动。通常是驱动描述中的型号名和自动检测到的型号名不符。因此您可以输入你喜欢的驱动搜索字符串并"
-"搜索所有可用驱动描述。\n"
+"如果没有驱动描述匹配自动检测到的型号名,它也不意味着该型号没有驱动。通常是驱动描述中的型号名和自动检测到的型号名不符。因此您可以输入你喜欢的驱动搜索字符串并搜索所有可用驱动描述。\n"
"</p>\n"
#. BasicModifyDialog help 3/4:
@@ -2021,12 +1970,9 @@
"The <b>driver</b> determines that the right data is produced for the\n"
"specific printer model.<br>\n"
"If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<"
-"br>\n"
-"You can either select another driver and modify its driver option settings"
-" later\n"
-"or keep the currently used driver and modify its driver option settings now.<"
-"br>\n"
+"which results bad looking printout, chaotic printout, or no printout at all.<br>\n"
+"You can either select another driver and modify its driver option settings later\n"
+"or keep the currently used driver and modify its driver option settings now.<br>\n"
"Some driver option settings must match to your particular printer.\n"
"For example the default paper size setting of the driver\n"
"must match to the paper which is actually loaded in your printer.<br>\n"
@@ -2043,8 +1989,7 @@
"and then in a second step you can adjust all driver options\n"
"by using this dialog again.<br>\n"
"Initially the input field for the driver search string is preset\n"
-"with the description of the currently used driver when the connection was not"
-" changed.\n"
+"with the description of the currently used driver when the connection was not changed.\n"
"This results usually only one single driver which matches\n"
"so that you would have to enter a less specific driver search string\n"
"to get also other drivers or you use the 'Find More' button.\n"
@@ -2060,8 +2005,7 @@
"一些驱动选项设置必须匹配您的打印机。例如驱动的默认纸张大小设置必须匹配您打印机中实际装载的纸张。\n"
"其它驱动选项您可以选择您喜欢的。例如任何可用打印分辨率都能够用在该驱动上。除非您的驱动在高分辨率下不能打印。\n"
"例如镭射打印机的内置内存不足以处理高分辨率的页面。<br>\n"
-"当您变更了当前使用的驱动到另一个时,您必须先应用此修改到队列 (例如您必须完成此对话框以作为第一步),然后在第二步您可以再次使用此对话框调整所有的驱动选项。"
-"<br>\n"
+"当您变更了当前使用的驱动到另一个时,您必须先应用此修改到队列 (例如您必须完成此对话框以作为第一步),然后在第二步您可以再次使用此对话框调整所有的驱动选项。<br>\n"
"通常当连接没有变更时,驱动搜索字符串输入框初始预设为当前使用中的驱动的描述。\n"
"此结果通常是一个匹配的驱动,因此您可以输入一个更宽泛的驱动搜索字符串来获取其他驱动,或者可以使用 '查找更多' 按钮。\n"
"如果没有驱动匹配,也不意味着没有驱动。因此您可以输入你喜欢的字符串作为驱动搜索字符串并搜索全部可用驱动描述。\n"
@@ -2072,10 +2016,8 @@
msgid ""
"<p>\n"
"In contrast to connection and driver where you must select the right one,\n"
-"you are free to enter arbitrary strings for <b>description</b> and <b"
-">location</b>.\n"
-"Application programs often show description and location in the print"
-" dialog.\n"
+"you are free to enter arbitrary strings for <b>description</b> and <b>location</b>.\n"
+"Application programs often show description and location in the print dialog.\n"
"To make sure that those strings look correct in any language\n"
"which a particular user of a particular application program may use,\n"
"it is safe when you use only plain ASCII text without\n"
@@ -2089,10 +2031,8 @@
msgstr ""
"<p>\n"
"不同于连接和驱动,您必须选择正确的哪个,您可以自由的输入任何字符串来作为 <b>描述</b> 和 <b>位置</b>。\n"
-"应用程序通常在打印对话框中显示描述和位置。n为了确保这些字符串能正确的以任何应用程序的用户可能使用的语言显示,您只使用不带特殊字符的普通 ASCII"
-" 文本会更安全,例如,纯 ASCII 字符 (a-z 和 A-Z),ASCII 数字 (0-9),和 ASCII 空格字符 (20 hex)。\n"
-"通常描述描述了型号,偶尔也描述驱动 (例如 '使用通用 PCL 驱动的 ACME FunPrinter 1000 '),位置描述了打印机的物理位置 (例如"
-" '房间 123' 或 '前台')。\n"
+"应用程序通常在打印对话框中显示描述和位置。n为了确保这些字符串能正确的以任何应用程序的用户可能使用的语言显示,您只使用不带特殊字符的普通 ASCII 文本会更安全,例如,纯 ASCII 字符 (a-z 和 A-Z),ASCII 数字 (0-9),和 ASCII 空格字符 (20 hex)。\n"
+"通常描述描述了型号,偶尔也描述驱动 (例如 '使用通用 PCL 驱动的 ACME FunPrinter 1000 '),位置描述了打印机的物理位置 (例如 '房间 123' 或 '前台')。\n"
"</p>"
#. DriverOptionsDialog help 1/3:
@@ -2215,10 +2155,8 @@
"对于非 PostScript 打印机来说,只有 PPD 文件是不足以设置一个能够工作的打印机配置的。\n"
"尤其是,非 PostScript 打印机无法从互联网下载 PPD 文件,然后使用该 PPD 文件设置打印机。\n"
"一般打印机可以设置但无法实际打印,因为驱动可能缺失。\n"
-"对于非 PostScript 打印机来说,您需要一个打印机驱动和一个匹配驱动的 PPD 文件。当您安装上述打印机驱动包时,匹配的 PPD"
-" 文件会自动安装到正确的位置.<br>\n"
-"只有 PostScript 打印机才可以只用 PPD 文件设定一个可工作的 PostScript 打印机配置。尤其是当 PPD 文件不包含"
-" 'cupsFilter' 项时,因为这样的条目会指向一个打印机驱动。<br>\n"
+"对于非 PostScript 打印机来说,您需要一个打印机驱动和一个匹配驱动的 PPD 文件。当您安装上述打印机驱动包时,匹配的 PPD 文件会自动安装到正确的位置.<br>\n"
+"只有 PostScript 打印机才可以只用 PPD 文件设定一个可工作的 PostScript 打印机配置。尤其是当 PPD 文件不包含 'cupsFilter' 项时,因为这样的条目会指向一个打印机驱动。<br>\n"
"</p>\n"
#. ConnectionWizardDialog help 1/7:
@@ -2239,57 +2177,23 @@
#. ConnectionWizardDialog help 2/7:
#: src/include/printer/helps.rb:450
-#| msgid ""
-#| "<p>\n"
-#| "<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"
-#| "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"
-#| "Therefore a space character in a value of an URI component\n"
-#| "is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
-#| "The components of an URI are separated by special reserved characters like\n"
-#| "colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n"
-#| "Finally there could be optional parameters (separated by a question mark '?')\n"
-#| "of the form 'option1=value1&option2=value2&option3=value3' so that\n"
-#| "a full device URI could be for example:<br>\n"
-#| "ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
-#| "Some examples:<br>\n"
-#| "A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
-#| "with serial number 'A1B2C3' may have a device URI like:<br>\n"
-#| "usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n"
-#| "A network printer with IP 192.168.100.1 which is accessible\n"
-#| "via port 9100 may have a device URI like:<br>\n"
-#| "socket://192.168.100.1:9100<br>\n"
-#| "A network printer with IP 192.168.100.2 which is accessible\n"
-#| "via LPD protocol with a remote LPD queue name 'LPT1'\n"
-#| "may have a device URI like:<br>\n"
-#| "lpd://192.168.100.2/LPT1\n"
-#| "</p>"
msgid ""
"<p>\n"
"<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"
+"Its first word (the so called URI scheme) specifies the kind of data-transfer,\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"
"Therefore a space character in a value of an URI component\n"
-"is encoded as '%20' (20 is the hexadecimal value of the space character).<br"
-">\n"
+"is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
"The components of an URI are separated by special reserved characters like\n"
-"colon ':', slash '/', question mark '?', ampersand '&', or equals sign"
-" '='.<br>\n"
-"Finally there could be optional parameters (separated by a question mark"
-" '?')\n"
+"colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n"
+"Finally there could be optional parameters (separated by a question mark '?')\n"
"of the form 'option1=value1&option2=value2&option3=value3' so that\n"
"a full device URI could be for example:<br>\n"
-"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false"
-"<br>\n"
+"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
"Some examples:<br>\n"
"A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
"with serial number 'A1B2C3' may have a device URI like:<br>\n"
@@ -2310,18 +2214,14 @@
"制式之后有或多或少的附加组件指定了这种数据传输类型的细节。<br>\n"
"URI 中不允许出现空格,因此URI 组件的值中的空格字符是编码为 '%20' 的 (20 是空格字符的十六进制值)。<br>\n"
"URI 的组件之间由特殊的保留字符分隔,如冒号 ':',斜线 '/',问号 '?',符号 '&',或者等号 '='。<br>\n"
-"最后可以有可选参数 (由问号 '?' 分隔),格式为 'option1=value1&option2=value2&option3=valu"
-"e3',因此一个完整的设备 URI 的示例如下:<br>\n"
-"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false"
-"<br>\n"
+"最后可以有可选参数 (由问号 '?' 分隔),格式为 'option1=value1&option2=value2&option3=value3',因此一个完整的设备 URI 的示例如下:<br>\n"
+"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
"一些示例:<br>\n"
-"一个由 ‘ACME’ 制造的型号为 ‘Fun Printer 1000+’ 的串号为 'A1B2C3' 的 USB 打印机的设备 URI 可能是:<br"
-">\n"
+"一个由 ‘ACME’ 制造的型号为 ‘Fun Printer 1000+’ 的串号为 'A1B2C3' 的 USB 打印机的设备 URI 可能是:<br>\n"
"usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n"
"一个可通过 9100 端口访问的 IP 地址为 192.168.100.1 的网络打印机的设备 URI 可能是:<br>\n"
"socket://192.168.100.1:9100<br>\n"
-"一个可通过 LPD 端口访问的 IP 地址为 192.168.100.2 的远程 LPD 队列名为 ‘LPT1’ 的网络打印机的设备 URI 可能是:<"
-"br>\n"
+"一个可通过 LPD 端口访问的 IP 地址为 192.168.100.2 的远程 LPD 队列名为 ‘LPT1’ 的网络打印机的设备 URI 可能是:<br>\n"
"lpd://192.168.100.2/LPT1\n"
"</p>"
@@ -2405,24 +2305,16 @@
"<p>\n"
"<b><big>百分号编码</big></b><br>\n"
"该问题很复杂。\n"
-"建议您避免在 URI 中使用保留字符和空格作为组件值,如果您能控制的话 (例如当您必须在 URI"
-" 中指定这样的字符作为值以访问远程打印队列,但远程打印队列又不在您控制下时,您就无法避免使用它们)。\n"
+"建议您避免在 URI 中使用保留字符和空格作为组件值,如果您能控制的话 (例如当您必须在 URI 中指定这样的字符作为值以访问远程打印队列,但远程打印队列又不在您控制下时,您就无法避免使用它们)。\n"
"可能的情况下请只使用 '非保留值'。\n"
"非保留值包括大小写字母,十位数字,连字符,句号,下划线和波浪号。\n"
-"甚至在特殊情况下,连字符,句号,波浪号和大小写都会导致特殊问题 (例如,只有字符,数字和下划线已知可以用作 CUPS"
-" 打印队列名,它们一般没有什么显著问题)。\n"
+"甚至在特殊情况下,连字符,句号,波浪号和大小写都会导致特殊问题 (例如,只有字符,数字和下划线已知可以用作 CUPS 打印队列名,它们一般没有什么显著问题)。\n"
"因此若可能最好只使用小写字母,数字,和下划线作为 URI 中的值。<br>\n"
"组件中的保留字符和空格字符必须以百分比编码 (也叫做 URL 编码)。<br>\n"
-"当对话框中输入框是用来输入 URI 的一个组件的一个值时 (例如,用户名和密码的输入框是分开的),您必须按字面输入空格和保留字符"
-" (非百分比编码)。这样的输入框会自动编码所有空格和保留字符。\n"
-"例如密码实际上是 'Foo%20Bar' (非百分比编码),您必须在对话框中的密码输入框中按字面输入 'Foo%20Bar'。URI"
-" 中的密码组件值实际上储存的是自动百分比编码的结果 'Foo%2520Bar'。相反当对话框中输入框是用来输入 URI 的一个组件的多于一个值时"
-" (例如,一个给所有可选参数如 'option1=value1&option2=value2&option3=value3'"
-" 的输入框或者一个输入框里输入整个 URI),您必须输入编码过的空格和保留字符,因为这时没有自动编码。\n"
-"假设一个可选参数 'option=value' 的输入,value 就应该是 'this&that' 因此整个可选参数应该是"
-" 'option=this&that' (字面上)。\n"
-"但是字面上的 '&' 字符意味着不同可选参数的分隔符,因此 URI 中的 'option=this&that' 意思是第一个可选参数是"
-" 'option=this',第二个可选参数只是 'that'。\n"
+"当对话框中输入框是用来输入 URI 的一个组件的一个值时 (例如,用户名和密码的输入框是分开的),您必须按字面输入空格和保留字符 (非百分比编码)。这样的输入框会自动编码所有空格和保留字符。\n"
+"例如密码实际上是 'Foo%20Bar' (非百分比编码),您必须在对话框中的密码输入框中按字面输入 'Foo%20Bar'。URI 中的密码组件值实际上储存的是自动百分比编码的结果 'Foo%2520Bar'。相反当对话框中输入框是用来输入 URI 的一个组件的多于一个值时 (例如,一个给所有可选参数如 'option1=value1&option2=value2&option3=value3' 的输入框或者一个输入框里输入整个 URI),您必须输入编码过的空格和保留字符,因为这时没有自动编码。\n"
+"假设一个可选参数 'option=value' 的输入,value 就应该是 'this&that' 因此整个可选参数应该是 'option=this&that' (字面上)。\n"
+"但是字面上的 '&' 字符意味着不同可选参数的分隔符,因此 URI 中的 'option=this&that' 意思是第一个可选参数是 'option=this',第二个可选参数只是 'that'。\n"
"因此一个单独的可选参数 'option=this&that' 必须以百分比编码格式输入为 'option=this%26%that'。<br>\n"
"要求百分比编码输入的输入框由 '[percent-encoded]' 提示语表示。<br>\n"
"下面是字符和它们的百分比编码的列表:<br>\n"
@@ -2468,8 +2360,7 @@
#: 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"
+"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br>\n"
"A printserver box is a small device with a network connection\n"
"and a USB or parallel port connection to connect the actual printer.\n"
"A network printer has such a device built-in.\n"
@@ -2516,8 +2407,7 @@
"匹配的设备 URI 是:<br>\n"
"socket://ip地址:端口号<br>。\n"
"<b>行式打印机守护精灵 (LPD) 协议</b><br>\n"
-"IPP 是运行在真实计算机上的 CUPS 的原生协议,但是如果 IPP 是实现在小型打印服务器盒中的,那它通常实现的不好。只有在生产厂商确实提供了官方支持时"
-"再使用 IPP。\n"
+"IPP 是运行在真实计算机上的 CUPS 的原生协议,但是如果 IPP 是实现在小型打印服务器盒中的,那它通常实现的不好。只有在生产厂商确实提供了官方支持时再使用 IPP。\n"
"匹配的设备 URI 是:<br>\n"
"ipp://ip地址:端口号/资源<br>。\n"
"端口号和资源由网络打印机和打印服务器盒的型号而定。<br>\n"
@@ -2526,90 +2416,6 @@
#. ConnectionWizardDialog help 6/7:
#: src/include/printer/helps.rb:627
-#| msgid ""
-#| "<p>\n"
-#| "<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
-#| "In contrast to a printserver box a print server machine\n"
-#| "means a real computer which offers a print service.<br>\n"
-#| "Access happens via various different network protocols.\n"
-#| "Ask your network administrator what which print server machine\n"
-#| "provides in your particular network:<br>\n"
-#| "<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
-#| "To access a SMB printer share, the RPM package samba-client must be installed.\n"
-#| "The package provides the CUPS backend 'smb' which is a link to\n"
-#| "the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
-#| "to a SMB printer share.<br>\n"
-#| "A server name and a printer share name and optionally a workgroup name\n"
-#| "is needed to access it.\n"
-#| "Furthermore a user name and a password may be required to get access.\n"
-#| "Have in mind that spaces and special characters in those values\n"
-#| "must be percent-encoded (see above).<br>\n"
-#| "By default CUPS runs backends (here smbspool) as user 'lp'.\n"
-#| "When printing in an Active Directory (R) environment (AD)\n"
-#| "the user 'lp' is not allowed to print in this environment\n"
-#| "so that the traditional way to print via smbspool as user 'lp'\n"
-#| "would not work.<br>\n"
-#| "For printing in an AD environment additionally\n"
-#| "the RPM package samba-krb-printing must be installed.\n"
-#| "In this case the CUPS backend 'smb' link\n"
-#| "is changed to <tt>/usr/bin/get_printing_ticket</tt>\n"
-#| "which is a wrapper to run smbspool as the original user\n"
-#| "who submitted a particular print job.\n"
-#| "When the Kerberos protocol is used for authentication\n"
-#| "in an AD environment, a user gets a ticket granting ticket (TGT)\n"
-#| "via the display manager during login at the Gnome or KDE desktop.\n"
-#| "When smbspool is run as the original user who submitted\n"
-#| "a particular print job, it can access the TGT of this user\n"
-#| "and use it to pass the printing data to the SMB printer share\n"
-#| "even in an AD environment with Kerberos authentication.\n"
-#| "In this case neither a fixed user name nor a fixed password\n"
-#| "has to be specified for authentication.\n"
-#| "A precondition is that get_printing_ticket runs on the same host\n"
-#| "where the user who submitted a particular print job is logged in.\n"
-#| "This means that it must be set up on the workstation\n"
-#| "for the particular user who will submit such print jobs\n"
-#| "and the user's workstation must send its printing data\n"
-#| "directly to the SMB printer share in the AD environment.\n"
-#| "In particular it does not work on a separated CUPS server machine\n"
-#| "where users who submit print jobs are not logged in.<br>\n"
-#| "For the traditional way a matching full device URI is:<br>\n"
-#| "smb://username:password@workgroup/server/printer<br>\n"
-#| "For example 'John Doe' with password '@home!' may use something like\n"
-#| "the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
-#| "smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
-#| "For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
-#| "http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
-#| "'Windows' and 'Active Directory' are registered trademarks\n"
-#| "of Microsoft Corporation in the United States and/or other countries.<br>\n"
-#| "<b>Traditional UNIX Server (LPR)</b><br>\n"
-#| "A Line Printer Daemon (LPD) runs on a traditional UNIX server\n"
-#| "and provides one or more LPD queues.\n"
-#| "The IP address and a LPD queue name is needed to access it.\n"
-#| "The matching device URI is:<br>\n"
-#| "lpd://ip-address/queue<br>\n"
-#| "<b>CUPS Server</b><br>\n"
-#| "Usually you should not set up a local print queue to access\n"
-#| "a remote queue on a CUPS server. Instead do the setup\n"
-#| "in the <b>Print Via Network</b> dialog.\n"
-#| "Only if you really know that you must set up a local print queue\n"
-#| "to access a remote queue on a CUPS server proceed here.<br>\n"
-#| "IPP is the native protocol for CUPS which runs on a server.\n"
-#| "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>"
msgid ""
"<p>\n"
"<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
@@ -2619,8 +2425,7 @@
"Ask your network administrator what which print server machine\n"
"provides in your particular network:<br>\n"
"<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
-"To access a SMB printer share, the RPM package samba-client must be"
-" installed.\n"
+"To access a SMB printer share, the RPM package samba-client must be installed.\n"
"The package provides the CUPS backend 'smb' which is a link to\n"
"the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
"to a SMB printer share.<br>\n"
@@ -2663,8 +2468,7 @@
"the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
"smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
"For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
-"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br"
-">\n"
+"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
"'Windows' and 'Active Directory' are registered trademarks\n"
"of Microsoft Corporation in the United States and/or other countries.<br>\n"
"<b>Traditional UNIX Server (LPR)</b><br>\n"
@@ -2691,28 +2495,21 @@
"询问您的网络管理员以获知您的网络中哪台计算机是打印服务器,是哪种打印服务器:<br>\n"
"<b>Windows (R) 或 Samba (SMB/CIFS)</b><br>\n"
"要访问 SMB 打印机共享,必须安装 RPM 软件包 samba-client。\n"
-"该软件包提供了 CUPS 后端 'smb',它是对 <tt>/usr/bin/smbspool</tt> 程序的一个链接,由其实际发送数据到 SMB"
-" 打印机共享。<br>\n"
+"该软件包提供了 CUPS 后端 'smb',它是对 <tt>/usr/bin/smbspool</tt> 程序的一个链接,由其实际发送数据到 SMB 打印机共享。<br>\n"
"需要服务器名称和打印机共享名称以及可选的工作组名称来访问它。\n"
"此外,还可能需要用户名和密码来获取访问权限。\n"
"请记住这些值中的空格和特殊字符必须以百分比编码 (见上)。<br>\n"
-"默认 CUPS 以用户 'lp' 运行后端 (这里是 smbspool)。当在活动目录 (R) 环境 (AD) 中打印时,用户 'lp'"
-" 不允许在该环境打印,因此传统的以 'lp' 用户身份通过 smbspool 打印的方法行不通。<br>\n"
-"要在活动目录环境中打印,必须安装 RPM 软件包 samba-krb-printing。这时 CUPS 后端 'smb' 的链接变成了 <tt"
-">/usr/bin/get_printing_ticket</tt>,它是一个以提交打印任务的原始用户身份执行 smbspool 的封装。\n"
+"默认 CUPS 以用户 'lp' 运行后端 (这里是 smbspool)。当在活动目录 (R) 环境 (AD) 中打印时,用户 'lp' 不允许在该环境打印,因此传统的以 'lp' 用户身份通过 smbspool 打印的方法行不通。<br>\n"
+"要在活动目录环境中打印,必须安装 RPM 软件包 samba-krb-printing。这时 CUPS 后端 'smb' 的链接变成了 <tt>/usr/bin/get_printing_ticket</tt>,它是一个以提交打印任务的原始用户身份执行 smbspool 的封装。\n"
"当活动目录环境 (AD) 使用了 Kerberos 协议认证时,用户在登陆 GNOME 或 KDE 桌面时会通过显示管理器得到一个豁免券 (TGT)。\n"
-"当 smbspool 由提交打印任务的原始用户运行时,即使在使用 Kerberos 认证的活动目录 (AD)"
-" 环境下,它依然可以访问该用户的豁免券,使用它来向 SMB 打印机共享传输打印数据。这时不需要指定固定用户名或固定密码进行认证。\n"
-"这样做的前提是 get_printing_ticket 要运行在提交打印任务的用户登录的那台主机上。这意味着它必须在用户提交打印任务的工作站上设置,且用户的"
-"这台工作站必须直接发送打印数据给活动目录 (AD) 环境中的 SMB 打印机共享。尤其是它不能运行在提交打印任务的用户没有登录的独立 CUPS"
-" 服务器机上。<br>\n"
+"当 smbspool 由提交打印任务的原始用户运行时,即使在使用 Kerberos 认证的活动目录 (AD) 环境下,它依然可以访问该用户的豁免券,使用它来向 SMB 打印机共享传输打印数据。这时不需要指定固定用户名或固定密码进行认证。\n"
+"这样做的前提是 get_printing_ticket 要运行在提交打印任务的用户登录的那台主机上。这意味着它必须在用户提交打印任务的工作站上设置,且用户的这台工作站必须直接发送打印数据给活动目录 (AD) 环境中的 SMB 打印机共享。尤其是它不能运行在提交打印任务的用户没有登录的独立 CUPS 服务器机上。<br>\n"
"传统方式下,一个匹配的完整设备 URI 是:<br>\n"
"smb://用户名:密码@工作组/服务器/打印机<br>\n"
"例如用户名 'John Doe'、密码 '@home!' 可能会使用像下面的设备 URI 来访问 'Fun Printer 1000+' 共享:<br>\n"
"smb://Jhon%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
"<b>更多信息</b>请参考 <tt>man smbspool</tt> 和 <br>\n"
-"http://zh.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br"
-">\n"
+"http://zh.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
"'Windows' 和 '活动目录' 是微软公司在美国和/或其它国家的注册商标。<br>\n"
"<b>传统 UNIX 服务器 (LPR)</b><br>\n"
"运行在传统 UNIX 服务器上的行式打印机守护精灵 (LPD) 可以提供一个或多个 LDP 队列。\n"
@@ -2728,44 +2525,6 @@
#. ConnectionWizardDialog help 7/7:
#: src/include/printer/helps.rb:714
-#| msgid ""
-#| "<p>\n"
-#| "<b><big>Special Device URIs</big></b><br>\n"
-#| "<b>Specify an Arbitrary Device URI</b>\n"
-#| "if you know the exact right device URI for your particular case\n"
-#| "or to modify an existing device URI in a special way.<br>\n"
-#| "<b>Send Print Data to Other Program (pipe)</b><br>\n"
-#| "To do this, the RPM package cups-backends must be installed.\n"
-#| "The package provides the CUPS backend 'pipe' which runs\n"
-#| "the program that you specified here.\n"
-#| "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"
-#| "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"
-#| "This way beh can, depending on its configuration,\n"
-#| "repeat the call of the backend or simply hide the error status\n"
-#| "of the backend from being seen by the CUPS daemon.\n"
-#| "The matching device URI is:<br>\n"
-#| "beh:/nodisable/attempts/delay/originalDeviceURI<br>\n"
-#| "If nodisable is '1' beh always exits successfully\n"
-#| "so that the queue gets never disabled but on the other hand\n"
-#| "print jobs are lost if there is an error.<br>\n"
-#| "Attempts is the number of attempts to recall the backend\n"
-#| "in case of an error. '0' means infinite retries.<br>\n"
-#| "Delay is the number of seconds between two attempts\n"
-#| "to call the backend.<br>\n"
-#| "The last parameter is the original URI, which the queue had before.<br>\n"
-#| "Example:<br>\n"
-#| "beh:/1/3/5/socket://ip-address:port-number<br>\n"
-#| "The beh backend tries to access a network printer 3 times with 5 second delay\n"
-#| "between the attempts. If access still fails, the queue is not disabled\n"
-#| "and the print job is lost.<br>\n"
-#| "For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n"
-#| "http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler…"
-#| "</p>"
msgid ""
"<p>\n"
"<b><big>Special Device URIs</big></b><br>\n"
@@ -2798,12 +2557,10 @@
"The last parameter is the original URI, which the queue had before.<br>\n"
"Example:<br>\n"
"beh:/1/3/5/socket://ip-address:port-number<br>\n"
-"The beh backend tries to access a network printer 3 times with 5 second"
-" delay\n"
+"The beh backend tries to access a network printer 3 times with 5 second delay\n"
"between the attempts. If access still fails, the queue is not disabled\n"
"and the print job is lost.<br>\n"
-"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh<"
-"/tt> and<br>\n"
+"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n"
"http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler…"
"</p>"
msgstr ""
@@ -2819,8 +2576,7 @@
"<b>菊链后端错误处理器 (beh)</b><br>\n"
"必须安装 RPM 软件包 foomatic-filters。\n"
"该软件包提供了 CUPS 后端 'beh'。<br>\n"
-"后端 'beh' 是常用后端的一个封装,使用 beh 调用常用后端。通过这种方法,根据 beh 的配置,它可以重复调用后端,或对 CUPS"
-" 守护精灵简单隐藏后端的错误状态。\n"
+"后端 'beh' 是常用后端的一个封装,使用 beh 调用常用后端。通过这种方法,根据 beh 的配置,它可以重复调用后端,或对 CUPS 守护精灵简单隐藏后端的错误状态。\n"
"匹配的设备 URI 为:<br>\n"
"beh://nodisable/尝试次数/延迟/原始设备 URI<br>\n"
"如果 nodisable 是 '1' 的话,beh 总能成功退出因此队列从不禁用,但另一方面说如果出错的话整个队列剩余的打印任务都会丢失。<br>\n"
@@ -2876,8 +2632,7 @@
"<b><big>网络打印</big></b><br>\n"
"通常使用 CUPS (通用 UNIX 打印系统) 来通过网络打印。<br>\n"
"默认 CUPS 使用它的所谓 '浏览' 模式来向网络发布打印机。<br>\n"
-"在这种情况下远程 CUPS 服务器必须通过网路发布它的打印机,您的主机必须运行 CUPS 守护精灵进程 (cupsd) 以监听发布的打印机的进站信息。<"
-"br>\n"
+"在这种情况下远程 CUPS 服务器必须通过网路发布它的打印机,您的主机必须运行 CUPS 守护精灵进程 (cupsd) 以监听发布的打印机的进站信息。<br>\n"
"CUPS 浏览信息是通过 UDP 端口 631 来接收的。<br>\n"
"防火墙相关:<br>\n"
"检查防火墙是否监控着打印机发布的网络区域。\n"
@@ -2919,8 +2674,7 @@
msgid ""
"<p>\n"
"If you print only via network and if you use only one single CUPS server,\n"
-"there is no need to use CUPS Browsing and have a CUPS daemon running on your"
-" host.\n"
+"there is no need to use CUPS Browsing and have a CUPS daemon running on your host.\n"
"Instead it is simpler to specify the CUPS server and access it directly.<br>\n"
"A possible drawback is that application programs may be delayed\n"
"for some time (until a timeout happens) when they try\n"
@@ -2933,9 +2687,7 @@
"<p>\n"
"如果您只通过网络打印且您只使用一个 CUPS 服务器,没有必须使用 CUPS 浏览模式和在您的主机上运行一个 CUPS 守护精灵。\n"
"指定 CUPS 服务器并直接访问它会更简单。<br>\n"
-"一个或有缺陷就是应用程序在访问 CUPS 服务器但服务器不可用时 (比如笔记本带出了公司),它可能会延迟直到超时"
-" (卡死的文雅说法啦)。通常延迟是由主机名称解析 (DNS) 超时造成的,因此在 /etc/hosts 文件中指定一个硬编码的 CUPS"
-" 服务器条目可能会有帮助。\n"
+"一个或有缺陷就是应用程序在访问 CUPS 服务器但服务器不可用时 (比如笔记本带出了公司),它可能会延迟直到超时 (卡死的文雅说法啦)。通常延迟是由主机名称解析 (DNS) 超时造成的,因此在 /etc/hosts 文件中指定一个硬编码的 CUPS 服务器条目可能会有帮助。\n"
"</p>"
#. PrintingViaNetworkDialog help 4/4:
@@ -2953,8 +2705,7 @@
"</p>"
msgstr ""
"<p>\n"
-"如果您的网络中没有 CUPS 服务器,或者您可以直接访问网络打印机,或您使用另外种类的打印服务器,例如通过 Windows (R) 或 Samba"
-" 服务器或传统 UNIX 服务器打印,您需要在您的主机上设置一个合适的打印队列。<br>\n"
+"如果您的网络中没有 CUPS 服务器,或者您可以直接访问网络打印机,或您使用另外种类的打印服务器,例如通过 Windows (R) 或 Samba 服务器或传统 UNIX 服务器打印,您需要在您的主机上设置一个合适的打印队列。<br>\n"
"'Windows' 是美国和/或其他国家的微软的注册商标 (屁咧)。\n"
"</p>"
@@ -2966,8 +2717,7 @@
"Usually CUPS (Common Unix Printing System) should be set up to use\n"
"its so called 'Browsing' mode to make printers available via network.<br>\n"
"In this case CUPS servers publish their local print queues via network\n"
-"and accordingly on CUPS client systems the CUPS daemon process (cupsd) must"
-" run\n"
+"and accordingly on CUPS client systems the CUPS daemon process (cupsd) must run\n"
"which is listening for incoming information about published printers.<br>\n"
"CUPS Browsing information is received via UDP port 631.\n"
"</p>"
@@ -2975,8 +2725,7 @@
"<p>\n"
"<b><big>通过网络分享和发布打印队列</big></b><br>\n"
"通常 CUPS (通用 UNIX 打印系统) 应该设置使用它所谓的 '浏览' 模式来向网络发布打印机。<br>\n"
-"在这种情况下 CUPS 服务器通过网络发布它的本地打印队列,CUPS 客户端系统必须运行 CUPS 守护精灵进程 (cupsd)"
-" 来监听发布的打印机的进站信息。<br>\n"
+"在这种情况下 CUPS 服务器通过网络发布它的本地打印队列,CUPS 客户端系统必须运行 CUPS 守护精灵进程 (cupsd) 来监听发布的打印机的进站信息。<br>\n"
"CUPS 浏览信息是通过 UDP 端口 631 接收的。\n"
"</p>"
@@ -2990,8 +2739,7 @@
"to allow remote access for all hosts in the local network\n"
"and to publish printers to all those hosts.<br>\n"
"It is not required to publish printers in any case.<br>\n"
-"If you have only one single CUPS server, there is no need to use CUPS"
-" Browsing.\n"
+"If you have only one single CUPS server, there is no need to use CUPS Browsing.\n"
"Instead it is simpler to specify the CUPS server on the client systems\n"
"(via 'Printing Via Network') so that the clients access the server directly.\n"
"</p>"
@@ -3027,8 +2775,7 @@
"<p>\n"
"如何指派哪些远程主机可以访问 CUPS 服务器有多种方法,这些方法可以共存。<br>\n"
"允许本地网络内的计算机的远程访问将允许所有本地网络内的主机访问。\n"
-"当一个远程主机拥有属于 CUPS 服务器所在网络的 IP 地址时,或主机的网络连接接入了 CUPS 服务器上的非 PPP 接口 (没有设置"
-" IFF_POINTTOPOINT 标记的接口),它就属于本地网络。<br>\n"
+"当一个远程主机拥有属于 CUPS 服务器所在网络的 IP 地址时,或主机的网络连接接入了 CUPS 服务器上的非 PPP 接口 (没有设置 IFF_POINTTOPOINT 标记的接口),它就属于本地网络。<br>\n"
"另外可以指定一个允许远程访问的网络接口白名单。<br>\n"
"另外也可以指定一个 IP 地址或网络地址的白名单。\n"
"</p>"
@@ -3099,28 +2846,6 @@
#. Policies help 2/2:
#: 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"
-#| "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"
-#| "and enforce another error policy (see <tt>man backend</tt>).\n"
-#| "For example it can stop any further printing attempt\n"
-#| "even when the default error policy is to retry the job.\n"
-#| "This could happen when any attempt to establish\n"
-#| "the communication with the printer is useless\n"
-#| "so that it does no make sense to retry the job.\n"
-#| "<br>\n"
-#| "The following error policies exist:<br>\n"
-#| "Stop the printer and keep the job for future printing.<br>\n"
-#| "Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n"
-#| "Abort and delete the job and proceed with the next job.\n"
-#| "</p>"
msgid ""
"<p>\n"
"<b><big>CUPS Error Policy</big></b><br>\n"
@@ -3140,16 +2865,14 @@
"<br>\n"
"The following error policies exist:<br>\n"
"Stop the printer and keep the job for future printing.<br>\n"
-"Re-send the job from the beginning after waiting some time (30 seconds by"
-" default).<br>\n"
+"Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n"
"Abort and delete the job and proceed with the next job.\n"
"</p>"
msgstr ""
"<p>\n"
"<b><big>CUPS 错误策略</big></b><br>\n"
"错误策略定义了当 CUPS 未能发送打印任务给打印机设备时所用的默认策略。<br>\n"
-"根据打印机的连接方式 (例如 'usb', 'socket', 'lpd', 或 'ipp'),和错误类型,实际发送数据到打印机的 CUPS"
-" 后端可以覆写默认错误策略并强制执行另一个错误策略 (参考 <tt>man backend</tt>)。\n"
+"根据打印机的连接方式 (例如 'usb', 'socket', 'lpd', 或 'ipp'),和错误类型,实际发送数据到打印机的 CUPS 后端可以覆写默认错误策略并强制执行另一个错误策略 (参考 <tt>man backend</tt>)。\n"
"例如它可以停止任何进一步打印尝试即使默认错误策略是重试任务。这可能发生在当任何与打印机建立通信的尝试都是无用的,因此没必要重试任务时。<br>\n"
"存在以下错误策略:<br>\n"
"停止打印机并保留任务以供未来打印。<br>\n"
@@ -3208,10 +2931,7 @@
"RPM 软件包 'udev-configure-printer' 为插入的 USB 打印机提供自动配置。<br>\n"
"当它的复选框初始未选中时,它没有安装。当您选中它时,它将被安装。<br>\n"
"当它的复选框初始选中时,它已经安装。当您取消选中时,它将被卸载。<br>\n"
-"当已安装了 udev-configure-printer 时,自动 USB 打印机配置通过 udev 配置文件"
-" /lib/udev/rules.d/70-printers.rules 的条目执行,该条目在有 USB 打印机插入时会触发运行"
-" 'udev-configure-printer add',有 USB 打印机拔出时会触发运行 'udev-configure-printer"
-" remove'。该文件没有可调整的设置,除非用户手动编辑 70-printers.rules 文件。\n"
+"当已安装了 udev-configure-printer 时,自动 USB 打印机配置通过 udev 配置文件 /lib/udev/rules.d/70-printers.rules 的条目执行,该条目在有 USB 打印机插入时会触发运行 'udev-configure-printer add',有 USB 打印机拔出时会触发运行 'udev-configure-printer remove'。该文件没有可调整的设置,除非用户手动编辑 70-printers.rules 文件。\n"
"</p>"
#. encoding: utf-8
@@ -3239,56 +2959,56 @@
#. Authors: Johannes Meixner <jsmeix(a)suse.de>
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
msgid "Show"
msgstr "显示"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
msgid "&Local"
msgstr "本地(&L)"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
msgid "&Remote"
msgstr "远程(&R)"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
msgid "Configuration"
msgstr "配置"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
msgid "Name"
msgstr "名称"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
msgid "Location"
msgstr "位置"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
msgid "Default"
msgstr "默认值"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
msgid "Status"
msgstr "状态"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
msgid "Re&fresh List"
msgstr "刷新列表(&F)"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
msgid "Print &Test Page"
msgstr "打印测试页(&T)"
@@ -3298,10 +3018,9 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
msgid ""
-"A locally running CUPS daemon is required, but it seems to be not"
-" accessible.\n"
+"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
"A non-accessible cupsd leads to an endless sequence of further failures.\n"
msgstr ""
@@ -3315,7 +3034,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -3329,14 +3048,13 @@
msgstr ""
"CUPS 守护精灵似乎没有监听官方 IANA IPP 端口 (631)。\n"
"使用 'netstat -nap | grep cupsd' 来检查 cupsd 是否在监听该端口。\n"
-"当 /etc/cups/cupsd.conf 中有 'Listen ....1234' 或者 'Port 1234' 设置 (1234 意味着除了官方端口"
-" 631 以外的任何端口号) 时 (也检查下有没有 'BrowsePort 1234') 才会发生。\n"
+"当 /etc/cups/cupsd.conf 中有 'Listen ....1234' 或者 'Port 1234' 设置 (1234 意味着除了官方端口 631 以外的任何端口号) 时 (也检查下有没有 'BrowsePort 1234') 才会发生。\n"
"YaST 打印机模块不支持非官方端口,使用非官方端口会导致未来无尽的错误。\n"
"如果你真的必须使用非官方端口的话,您就不能使用 YaST 打印机模块来配置您的打印机。\n"
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
@@ -3345,71 +3063,67 @@
"(这可能花费一些时间)"
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
msgid "Do no longer use the inaccessible CUPS server '%1'?"
msgstr "不再使用无法访问的 CUPS 服务器 '%1'?"
#. Popup::YesNoHeadline body recommendation how to answer the headline question
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:207
+#: src/include/printer/overview.rb:210
msgid "To proceed, you should agree that '%1' will be no longer used."
msgstr "您应该同意不再使用 '%1' 才能继续进行。"
#. 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:223 src/include/printer/overview.rb:234
-msgid ""
-"A non-accessible server leads to an endless sequence of delays and failures."
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
+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:253
+#: src/include/printer/overview.rb:256
msgid "CUPS Server %1"
msgstr "CUPS 服务器 %1"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
msgid "Testing if CUPS server is accessible..."
msgstr "正在检测打印服务器是否可访问..."
#. 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:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
msgid "Select an entry."
msgstr "请选择一项。"
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
msgid "Cannot Delete"
msgstr "无法删除"
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
-msgid ""
-"This is a remote configuration. Only local configurations can be deleted."
+#: src/include/printer/overview.rb:610
+msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr "这是远程配置。仅本地配置可以被删除。"
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
msgid "Confirm Deletion"
msgstr "确认删除"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
-msgid ""
-"The selected configuration would be deleted immediately and cannot be"
-" restored."
+#: src/include/printer/overview.rb:619
+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:620
+#: src/include/printer/overview.rb:623
msgid "Delete configuration %1"
msgstr "删除配置 %1"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
msgid "Do not delete it"
msgstr "不删除"
@@ -3420,33 +3134,33 @@
#. 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:637
+#: src/include/printer/overview.rb:640
msgid "Confirm Deletion of a Class"
msgstr "确认删除一个类"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
msgid "A deleted class cannot be re-created with this tool."
msgstr "此工具不能重新创建一个已被删除的类。"
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
msgid "Rejecting Print Jobs"
msgstr "拒绝打印任务"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
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:697
+#: src/include/printer/overview.rb:700
msgid "Printout Disabled"
msgstr "打印输出已禁用"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
msgid "The testpage cannot be printed because printout is disabled."
msgstr "无法打印测试页,因为打印输出被禁用。"
@@ -3455,27 +3169,25 @@
#. 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:728
-msgid ""
-"There are pending print jobs which might be deleted before the testpage is"
-" printed."
+#: src/include/printer/overview.rb:731
+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:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
msgid "Delete Pending Print Jobs For %1"
msgstr "为 %1 删除等待中的打印任务"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
msgid "Delete them before printing testpage"
msgstr "在打印测试页前删除它们"
#. 'No' 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:762
msgid "Print testpage after the other jobs"
msgstr "在其它任务完成后打印测试页"
@@ -3483,7 +3195,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:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
msgid "Failed to delete all pending jobs for %1."
msgstr "删除 %1 所有等待中的任务失败。"
@@ -3502,28 +3214,28 @@
#. + (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:799
+#: src/include/printer/overview.rb:802
msgid "Test printout"
msgstr "测试打印"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
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:803
+#: src/include/printer/overview.rb:806
msgid "Single test page"
msgstr "单一测试页"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
msgid "Two test pages"
msgstr "两张测试页"
#. 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:835
+#: src/include/printer/overview.rb:838
msgid "Failed to print testpage for %1."
msgstr "为 %1 打印测试页失败。"
@@ -3531,25 +3243,25 @@
#. 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:852
+#: src/include/printer/overview.rb:855
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:856
+#: src/include/printer/overview.rb:859
msgid "Sent testpage to %1. Printing should start soon."
msgstr "发送测试页到 %1。应该很快开始打印。"
#. Popup::AnyQuestion 'Yes' button label
#. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:861
+#: src/include/printer/overview.rb:864
msgid "Testpage printout was successful"
msgstr "测试页打印成功"
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
msgid "Testpage printing failed"
msgstr "测试打印失败"
@@ -3569,58 +3281,54 @@
#. 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:897
+#: src/include/printer/overview.rb:900
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:925
+#: src/include/printer/overview.rb:928
msgid "Delete all pending jobs"
msgstr "删除所有等待中的任务"
#. 'No' 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:931
msgid "Do not delete them"
msgstr "不删除"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr "完整日志请见 /var/log/cups/error_log 文件。"
-#: src/include/printer/overview.rb:1048
-msgid ""
-"CUPS log information while processing the testpage for %1 (English only)"
+#: src/include/printer/overview.rb:1051
+msgid "CUPS log information while processing the testpage for %1 (English only)"
msgstr "处理 %1 的测试页的 CUPS 日志信息 (仅英文)"
#. 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:1065
+#: src/include/printer/overview.rb:1068
msgid "For CUPS log information, see the /var/log/cups/error_log file."
msgstr "CUPS 日志信息见 /var/log/cups/error_log 文件。"
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1075
-msgid ""
-"When printing via a remote system fails, you may ask an admin of the remote"
-" system."
+#: src/include/printer/overview.rb:1078
+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:1102
+#: src/include/printer/overview.rb:1105
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr "添加一项配置与远程 CUPS 服务器设定相冲突。"
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
msgid "Cannot Modify"
msgstr "无法修改"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
-msgid ""
-"This is a remote configuration. Only local configurations can be modified."
+#: src/include/printer/overview.rb:1164
+msgid "This is a remote configuration. Only local configurations can be modified."
msgstr "这是远程配置。仅可以修改本地配置。"
#. An entry for a ComboBox from which the user can select that the CUPS error policy
@@ -3676,9 +3384,7 @@
#. PopupYesNoHeadline headline
#. PopupYesNoHeadline body:
#: src/include/printer/policies.rb:139
-msgid ""
-"A remote CUPS server setting conflicts with setting policies for the local"
-" system."
+msgid "A remote CUPS server setting conflicts with setting policies for the local system."
msgstr "一个远程 CUPS 服务器设定与本地系统的设定策略冲突。"
#. where %1 will be replaced by the print queue name.
@@ -3916,8 +3622,7 @@
#. they are at least informend why there may be still remote queues:
#: src/include/printer/printingvianetwork.rb:727
msgid ""
-"When switching from 'accept printer announcements' to 'not accept"
-" announcements'\n"
+"When switching from 'accept printer announcements' to 'not accept announcements'\n"
"or after 'request printer information from CUPS servers' was disabled\n"
"it takes usually 5 minutes until already received information faded away..."
msgstr ""
@@ -3999,16 +3704,13 @@
#. TextEntry to allow remote access to local print queues
#. for hosts and/or networks:
#: src/include/printer/sharing.rb:180
-msgid ""
-"Allow access from those IP addresses or &network/netmask (separated by space)"
+msgid "Allow access from those IP addresses or &network/netmask (separated by space)"
msgstr "允许来自这些 IP 地址或网络/网络掩码的访问(用空格分开)(&N)"
#. TextEntry to publish local print queues
#. to IP addresses and/or network broadcast addresses:
#: src/include/printer/sharing.rb:192
-msgid ""
-"Publish to these IP addresses or network &broadcast addresses (separated by"
-" space)"
+msgid "Publish to these IP addresses or network &broadcast addresses (separated by space)"
msgstr "向这些 IP 地址或网络广播地址发布打印机(用空格分开)(&B)"
#. A CheckBox label to publish local print queues by default
@@ -4064,9 +3766,7 @@
#. PopupYesNoHeadline headline
#. PopupYesNoHeadline body:
#: src/include/printer/sharing.rb:643
-msgid ""
-"A remote CUPS server setting conflicts with sharing local printer"
-" configurations."
+msgid "A remote CUPS server setting conflicts with sharing local printer configurations."
msgstr "一个远程 CUPS 服务器设定与本地打印机共享配置冲突。"
#. Only "Printing via Network" configuration of printer.
@@ -4404,8 +4104,7 @@
#: src/modules/Printer.rb:2389
msgid ""
"Launched hp-setup.\n"
-"You must finish hp-setup before you can proceed with the printer"
-" configuration.\n"
+"You must finish hp-setup before you can proceed with the printer configuration.\n"
msgstr ""
"hp-setup 已启动。\n"
"在继续配置打印机前,您必须完成 hp-setup。\n"
@@ -4425,15 +4124,12 @@
#. Is the package available to be installed?
#. Package::Available returns nil if no package source is available.
#: src/modules/Printerlib.rb:179
-msgid ""
-"Required package %1 is not installed and there is no package repository"
-" available."
+msgid "Required package %1 is not installed and there is no package repository available."
msgstr "未安装必需的包 %1 且没有可用的软件源。"
#. Message of a Popup::Error where %1 will be replaced by the package name:
#: src/modules/Printerlib.rb:194
-msgid ""
-"Required package %1 is not installed and not available in the repository."
+msgid "Required package %1 is not installed and not available in the repository."
msgstr "未安装必需的软件包 %1 且软件源中没有该软件包。"
#. Only a simple message because:
Modified: trunk/yast/zh_CN/po/rdp.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/rdp.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/rdp.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-02-04 15:54+0800\n"
"Last-Translator: 玛格丽特 · 苏 <i(a)marguerite.su>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -102,52 +102,52 @@
msgstr "防火墙设置"
#. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
msgid "Write firewall settings"
msgstr "写入防火墙设置"
#. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
msgid "Configure xrdp"
msgstr "配置 xrdp"
#. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
msgid "Restart the services"
msgstr "重启服务"
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
msgid "Stop the services"
msgstr "停止服务"
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
msgid "Saving Remote Administration Configuration"
msgstr "正在保存远程管理配置"
#. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
msgid "Writing firewall settings..."
msgstr "正在写入防火墙设置..."
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
msgid "Configuring xrdp..."
msgstr "正在配置 xrdp..."
#. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
msgid "Restarting the service..."
msgstr "正在重启服务..."
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
msgid "Stopping the service..."
msgstr "正在停止服务..."
#. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
msgid "Remote administration is enabled."
msgstr "已启用远程管理。"
#. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
msgid "Remote administration is disabled."
msgstr "已禁用远程管理。"
Modified: trunk/yast/zh_CN/po/rear.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/rear.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/rear.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2013-09-18 14:55+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -232,13 +232,13 @@
msgstr "正在读取 Rear 配置"
#: src/include/rear/ui.rb:698
+msgid "Reading rear settings"
+msgstr "正在读取 rear 设置"
+
+#: src/include/rear/ui.rb:698
msgid "Analyzing system"
msgstr "正在分析系统"
-#: src/include/rear/ui.rb:698
-msgid "Reading rear settings"
-msgstr "正在读取 rear 设置"
-
#: src/include/rear/ui.rb:699
msgid "Analyzing system..."
msgstr "正在分析系统..."
Modified: trunk/yast/zh_CN/po/registration.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/registration.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/registration.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
"PO-Revision-Date: 2016-06-05 16:56+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -22,29 +22,6 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 2.0\n"
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-msgid "Local Registration Servers"
-msgstr "本地注册服务器"
-
-#: src/clients/discover_registration_services.rb:44
-msgid ""
-"Select a detected registration server from the list\n"
-"or the default SUSE registration server."
-msgstr ""
-"请从列表中选择一个检测到的注册服务器\n"
-"或使用默认的 SUSE 注册服务器。"
-
-#. error popup
-#: src/clients/discover_registration_services.rb:68
-msgid "No registration server selected."
-msgstr "未选择注册服务器。"
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-msgid "SUSE Customer Center (%s)"
-msgstr "SUSE 客服中心(&s)"
-
#. popup message
#. popup message
#. popup message
@@ -63,7 +40,7 @@
#. @return [Symbol] user input
#: src/clients/inst_scc.rb:189
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -99,8 +76,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:283
-#: src/lib/registration/registration_ui.rb:316
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
msgid "Registering %s ..."
msgstr "正在注册 %s ..."
@@ -237,18 +214,25 @@
msgid "SHA256 Fingerprint: "
msgstr "SHA256 指纹: "
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:76
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
+#: src/lib/registration/connect_helpers.rb:80
msgid "Connection time out."
msgstr "连接超时。"
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
+msgstr ""
+
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:84
+#: src/lib/registration/connect_helpers.rb:91
msgid "Check that this system is known to the registration server."
msgstr "检查本系统是否已在注册服务器上注册。"
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:90
+#: src/lib/registration/connect_helpers.rb:97
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -259,8 +243,7 @@
"Just wait several minutes after logging in and then retry \n"
"the upgrade again."
msgstr ""
-"若您正在从 SLE11 升级请确保 SCC 服务器了解您之前在旧的 NCC 服务器上的注册情"
-"况。\n"
+"若您正在从 SLE11 升级请确保 SCC 服务器了解您之前在旧的 NCC 服务器上的注册情况。\n"
"从 NCC 同步到 SCC 可能需要花费很长时间。\n"
"\n"
"若该 SLE11 系统是最近才安装的,您可以登入到 %s 来加速同步过程。\n"
@@ -270,41 +253,47 @@
#. 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:104
-#: src/lib/registration/connect_helpers.rb:109
-#: src/lib/registration/connect_helpers.rb:112
+#: 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:170
-#: src/lib/registration/connect_helpers.rb:173
-msgid "Registration failed."
-msgstr "注册失败。"
+#: src/lib/registration/connect_helpers.rb:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
+#, fuzzy
+#| msgid "Contacting the Registration Server"
+msgid "Connection to registration server failed."
+msgstr "正在连接注册服务器"
-#: src/lib/registration/connect_helpers.rb:114
+#: src/lib/registration/connect_helpers.rb:121
msgid "Registration client error."
msgstr "注册客户端错误。"
-#: src/lib/registration/connect_helpers.rb:116
+#: src/lib/registration/connect_helpers.rb:123
+#, fuzzy
+#| msgid ""
+#| "Registration server error.\n"
+#| "Retry registration later."
msgid ""
"Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
msgstr ""
"注册服务器错误。\n"
"请稍候重新注册。"
#. error message
-#: src/lib/registration/connect_helpers.rb:158
+#: src/lib/registration/connect_helpers.rb:165
msgid "Received SSL Certificate does not match the expected certificate."
msgstr "收到的 SSL 证书不匹配期望的证书。"
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:188
+#: src/lib/registration/connect_helpers.rb:198
msgid "Details: %s"
msgstr "细节:%s"
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:217
+#: src/lib/registration/connect_helpers.rb:227
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -317,23 +306,23 @@
"请手动修复该证书,确保可安全连接服务器并再次启动本 YaST 模块。"
#. progress label
-#: src/lib/registration/connect_helpers.rb:229
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing the SSL certificate"
msgstr "导入 SSL 证书"
-#: src/lib/registration/connect_helpers.rb:230
+#: src/lib/registration/connect_helpers.rb:240
msgid "Importing '%s' certificate..."
msgstr "正在导入 '%s' 证书..."
#. try to use a translatable message first, if not found then use
#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:251
+#: src/lib/registration/connect_helpers.rb:261
msgid "Secure connection error: %s"
msgstr "安全连接错误:%s"
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:270
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -345,14 +334,14 @@
"请确保服务器上安装了最新的支持新注册协议的产品。"
#. FIXME: use a better message, this one has been reused after the text freeze
-#. error message, the entered URL is not valid
-#: src/lib/registration/connect_helpers.rb:282
-#: src/lib/registration/ui/local_server_dialog.rb:67
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
msgid "Invalid URL."
msgstr "无效 URL。"
#. Error popup
-#: src/lib/registration/connect_helpers.rb:286
+#: src/lib/registration/connect_helpers.rb:296
msgid ""
"Network is not configured, the registration server cannot be reached.\n"
"Do you want to configure the network now?"
@@ -360,7 +349,7 @@
"未配置网络,无法访问注册服务器。\n"
"您想要现在配置网络吗?"
-#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/connect_helpers.rb:303
msgid "Network error, check the network configuration."
msgstr "网络错误,请检查网络配置。"
@@ -370,14 +359,14 @@
msgstr "正在存储注册配置..."
#. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
msgid ""
"The base product was not found,\n"
"check your system."
msgstr "未找到基础产品,请检查您的系统。"
#. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
msgid ""
"The installation medium or the installer itself is seriously broken.\n"
"Report a bug at %s."
@@ -385,18 +374,16 @@
"安装介质或安装器自身严重损坏。\n"
"请于 %s 汇报故障。"
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
msgid ""
"Make sure a product is installed and /etc/products.d/baseproduct\n"
"is a symlink pointing to the base product .prod file."
-msgstr ""
-"请确保安装了产品且 /etc/products.d/baseproduct 是一个指向基础产品的 .prod 文"
-"件的符号链接。"
+msgstr "请确保安装了产品且 /etc/products.d/baseproduct 是一个指向基础产品的 .prod 文件的符号链接。"
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:269
+#: src/lib/registration/registration_ui.rb:272
msgid "Registering the System..."
msgstr "正在注册系统..."
@@ -405,14 +392,14 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:148
-#: src/lib/registration/registration_ui.rb:353
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
#: src/lib/registration/ui/migration_repos_workflow.rb:304
msgid "Updating to %s ..."
msgstr "正在更新到 %s ..."
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:165
+#: src/lib/registration/registration_ui.rb:166
msgid "Synchronizing Products..."
msgstr "正在同步产品..."
@@ -422,27 +409,27 @@
#. @return [Array<Registration::Addon>] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:179
+#: src/lib/registration/registration_ui.rb:180
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
msgid "Loading Available Extensions and Modules..."
msgstr "正在加载可用扩展和模块..."
-#: src/lib/registration/registration_ui.rb:193
+#: src/lib/registration/registration_ui.rb:195
msgid "Loading Migration Products..."
msgstr "正在加载迁移产品..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:210
+#: src/lib/registration/registration_ui.rb:213
msgid "Register Extensions and Modules"
msgstr "注册扩展和模块"
#. help text
-#: src/lib/registration/registration_ui.rb:214
+#: src/lib/registration/registration_ui.rb:217
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr "<p>正在注册扩展和模块。</p>"
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:239
+#: src/lib/registration/registration_ui.rb:242
msgid ""
"The registration server offers update repositories.\n"
"\n"
@@ -451,7 +438,7 @@
"\n"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:243
+#: src/lib/registration/registration_ui.rb:246
msgid ""
"Would you like to enable these repositories during installation\n"
"in order to receive the latest updates?"
@@ -459,7 +446,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:247
+#: src/lib/registration/registration_ui.rb:250
msgid ""
"Would you like to enable these repositories during upgrade\n"
"in order to receive the latest updates?"
@@ -473,7 +460,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -487,39 +474,39 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
msgid "Unknown product"
msgstr "未知产品"
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:293
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
msgid "Saving repository configuration failed."
msgstr "保存软件源配置失败。"
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
msgid "Updating service '%s' failed."
msgstr "更新服务 '%s' 失败。"
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
msgid "Adding service '%s' failed."
msgstr "添加服务 '%s' 失败。"
#. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
msgid "Saving service '%s' failed."
msgstr "保存服务 '%s' 失败。"
#. error message
-#: src/lib/registration/sw_mgmt.rb:280
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Refreshing service '%s' failed."
msgstr "刷新服务 '%s' 失败。"
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:487
+#: src/lib/registration/sw_mgmt.rb:474
msgid ""
"Cannot find remote product %s.\n"
"The product cannot be registered."
@@ -574,13 +561,10 @@
#: 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>"
+"<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 ""
"<p>请输入所请求扩展或模块的注册码。</p>\n"
-"<p>注册码为成功注册所必需。若您无法提供注册码则请返回并反选相应扩展或模块。</"
-"p>"
+"<p>注册码为成功注册所必需。若您无法提供注册码则请返回并反选相应扩展或模块。</p>"
#. part of the UI - labels in the dialog
#. @return [Array<Yast::Term>] UI definition
@@ -596,39 +580,39 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
msgid "Details"
msgstr "细节"
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
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
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
msgid "%s (not available)"
msgstr "%s (不可用)"
#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
msgid "YaST allows to select at most %s extensions or modules."
msgstr "YaST 允许选择最多 %s 个扩展或模块。"
#. help text (2/3)
-#: 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>"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
+msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>"
msgstr "<p>请注意,某些扩展或模块可能需要指定的注册码。</p>"
#. help text (3/3)
-#: 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>"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
+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 "<p>若您想要移除扩展或模块,您需要登入 SUSE 客服中心并在那里手动移除它们。</p>"
#. dialog title
@@ -638,12 +622,11 @@
#. help text (1/3)
#: src/lib/registration/ui/addon_selection_registration_dialog.rb:34
-msgid ""
-"<p>Here you can select available extensions and modules for yoursystem.</p>"
+msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
msgstr "<p>在此您可为您的系统选择可用扩展和模块。</p>"
#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
msgid "Available Extensions and Modules"
msgstr "可用扩展和模块"
@@ -654,9 +637,7 @@
#. help text (1/3)
#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40
-msgid ""
-"<p>Here you can select extensions and modules which will be registered again."
-"</p>"
+msgid "<p>Here you can select extensions and modules which will be registered again.</p>"
msgstr "<p>在此您可选择要再次注册的扩展和模块。</p>"
#. @return [String] the main dialog label
@@ -666,9 +647,7 @@
#. help text
#: 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>"
+msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
msgstr "<p>在此您可选择与基础产品一起注册的扩展和模块。</p>"
#: src/lib/registration/ui/autoyast_addon_dialog.rb:41
@@ -703,42 +682,40 @@
msgstr "下载可用扩展..."
#. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
msgid "Really delete '%s'?"
msgstr "真的删除 '%s' 吗?"
#. dialog definition for adding/editing an addon
#. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
msgid "Extension or Module &Identifier"
msgstr "扩展或模块标识符(&I)"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "&Version"
msgstr "版本(&V)"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
msgid "&Architecture"
msgstr "架构(&A)"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
msgid "&Release Type"
msgstr "发行类型(&R)"
#. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:140
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
msgid "Registration &Code"
msgstr "注册码(&C)"
#: src/lib/registration/ui/autoyast_config_dialog.rb:57
msgid ""
-"<p>Product registration includes your product in SUSE Customer Center "
-"database,\n"
+"<p>Product registration includes your product in SUSE Customer Center database,\n"
"enabling you to get online updates and technical support.\n"
-"To register while installing automatically, select <b>Run Product "
-"Registration</b>.</p>"
+"To register while installing automatically, select <b>Run Product Registration</b>.</p>"
msgstr ""
"<p>产品注册会将您的产品收纳在 SUSE 客服中心数据库中,\n"
"使您能够获得在线更新和技术支持。\n"
@@ -746,15 +723,12 @@
#: src/lib/registration/ui/autoyast_config_dialog.rb:63
msgid ""
-"<p>If your network deploys a custom registration server, set the correct URL "
-"of the server\n"
-"and the location of the SMT certificate in <b>SMT Server Settings</b>. "
-"Refer\n"
+"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
+"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
"to your SMT manual for further assistance.</p>"
msgstr ""
"<p>若您的网络部署了一个自定义注册服务器,请设置正确的服务器 URL\n"
-"以及在<b>SMT 服务器设置</b>中设置 SMT 证书的位置。进一步协助请参考您的 SMT 手"
-"册。</p>"
+"以及在<b>SMT 服务器设置</b>中设置 SMT 证书的位置。进一步协助请参考您的 SMT 手册。</p>"
#. the UI defition for the global registration status
#. @return [Yast::Term] UI term
@@ -762,10 +736,8 @@
msgid "Register the Product"
msgstr "注册产品"
-#. 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:138
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
msgid "&E-mail Address"
msgstr "电子邮件地址(&E)"
@@ -774,56 +746,68 @@
msgstr "安装来自更新软件源的可用更新"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
msgid "Server Settings"
msgstr "服务器设置"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
msgid "Find Registration Server Using SLP Discovery"
msgstr "使用 SLP 探索查找注册服务器"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
msgid "Use Specific Server URL Instead of the Default"
msgstr "使用特定服务器 URL 而非默认"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
msgid "Optional SSL Server Certificate URL"
msgstr "可选 SSL 服务器证书 URL"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
msgid "Optional SSL Server Certificate Fingerprint"
msgstr "可选 SSL 服务器证书指纹"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
msgid "none"
msgstr "无"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
msgid "SSL Certificate Fingerprint"
msgstr "SSL 证书指纹"
#. the UI defition for the main dialog
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
msgid "Register Extensions or Modules..."
msgstr "注册扩展或模块..."
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
-msgid "&Local Registration Server..."
-msgstr "本地注册服务器(&L)..."
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
+#, fuzzy
+#| msgid "Registering the System..."
+msgid "Register System via %s"
+msgstr "正在注册系统..."
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#, fuzzy
+#| msgid "Registration Server"
+msgid "Register System via local SMT Server"
+msgstr "注册服务器"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+msgid "&Local Registration Server URL"
+msgstr "本地注册服务器 URL(&L)"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
msgid "&Skip Registration"
msgstr "跳过注册(&S)"
#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
msgid "&Register Extensions or Modules Again"
msgstr "再次注册扩展或模块(&R)"
@@ -831,28 +815,37 @@
#. @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/base_system_registration_dialog.rb:342
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr "系统已注册。"
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:149
-msgid ""
-"Enter SUSE Customer Center credentials here to register the system to get "
-"updates and extensions."
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
+msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
msgstr "在此输入 SUSE 客服中心账户信息来注册系统以获得更新和扩展。"
#. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:184
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
+#, fuzzy
+#| 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?"
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?"
+"Customer Center for online registration."
msgstr ""
"若您未注册您的系统,我们将无法保证您能够访问更新软件源。\n"
"\n"
@@ -860,31 +853,9 @@
"\n"
"现在真的要跳过注册吗?"
-#. 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:201
-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 ""
-"请在下面字段输入本产品的注册码或评估码以及您在 SUSE 客服中心的用户名/电子邮件"
-"地址。\n"
-"只有注册了产品才能够获得安全和常规软件更新。"
-
-#. 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:213
-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:225
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
msgid "Net&work Configuration..."
msgstr "网络配置(&w)..."
@@ -910,49 +881,37 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: 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>"
+#, fuzzy
+#| msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
msgstr "<p>安全连接 (HTTPS) 使用 SSL 证书来校验服务器的权威性和加密所传输的数据。</p>"
#. help text (RichText) for importing a SSL certificate (2/5)
-#: 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 ""
-"<p>您可以选择导入该证书到已知证书签发机构 (CA) 列表中,这意味着您信任该未知证"
-"书的主体和签发人。</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+#, fuzzy
+#| 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>"
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
+msgstr "<p>您可以选择导入该证书到已知证书签发机构 (CA) 列表中,这意味着您信任该未知证书的主体和签发人。</p>"
#. help text (RichText) for importing a SSL certificate (3/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+#, fuzzy
+#| msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
msgstr "<p>导入证书将允许使用例如自签名的证书。</p>"
#. help text (RichText) for importing a SSL certificate (4/5)
-#: 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 ""
-"<p><b>重要:</b>您应该校验该证书的指纹来确保您从所请求的服务器导入了真正的证"
-"书。</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+#, fuzzy
+#| 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>"
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
+msgstr "<p><b>重要:</b>您应该校验该证书的指纹来确保您从所请求的服务器导入了真正的证书。</p>"
#. help text (RichText) for importing a SSL certificate (5/5)
#: 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>"
+msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
msgstr "<p><b>未校验即导入一个未知证书是一个巨大的安全风险。</b></p>"
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-msgid "&Local Registration Server URL"
-msgstr "本地注册服务器 URL(&L)"
-
#. TRANSLATORS: error message, %s are details
#. TRANSLATORS: error message, %s are details
#: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -976,13 +935,8 @@
#. 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 ""
-"<p>在此对话框中您可手动选择用于在线迁移的软件源。软件包将被升级到所选源中所能"
-"找到的最高版本。</p>"
+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 "<p>在此对话框中您可手动选择用于在线迁移的软件源。软件包将被升级到所选源中所能找到的最高版本。</p>"
#. TRANSLATORS: Multiselection widget label
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85
@@ -990,17 +944,17 @@
msgstr "选择用于迁移的软件源"
#. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
msgid "Manage Repositories..."
msgstr "管理软件源..."
#. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
msgid "URL: %s"
msgstr "URL:%s"
#. TRANSLATORS: summary text, %s is a repository priority (1-99)
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
msgid "Priority: %s"
msgstr "优先级:%s"
@@ -1038,9 +992,7 @@
#. TRANSLATORS: help text (1/3)
#: src/lib/registration/ui/migration_selection_dialog.rb:65
-msgid ""
-"<p>Here you can select the migration target products. The registrationserver "
-"may offer several possible migration to new products.</p>"
+msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>"
msgstr "<p>在此您可选择迁移对象产品。注册服务器或许会提供一些可供迁移的新产品。</p>"
#. TRANSLATORS: help text (2/3)
@@ -1050,9 +1002,7 @@
#. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
#: src/lib/registration/ui/migration_selection_dialog.rb:70
-msgid ""
-"<p>Use the <b>%s</b> check box to manually select the migration repositories "
-"later.</p>"
+msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>"
msgstr "<p>稍后使用 <b>%s</b> 复选框手动选择迁移软件源。</p>"
#: src/lib/registration/ui/migration_selection_dialog.rb:71
@@ -1065,17 +1015,17 @@
msgstr "选择迁移对象。"
#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
msgid "Manually Adjust the Repositories for Migration"
msgstr "手动调整迁移软件源"
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
msgid "Possible Migration Targets"
msgstr "可行迁移对象"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
msgid "Migration Summary"
msgstr "迁移摘要"
@@ -1085,42 +1035,38 @@
#. 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:214
-msgid ""
-"ERROR: Product <b>%{product}</b> is not available at the registration server "
-"(%{url}). Make the product available to allow using this migration."
-msgstr ""
-"错误:产品 <b>%{product}</b> 在注册服务器 (%{url}) 上不可用。请将缺失的产品添"
-"加到注册服务器上以允许使用此迁移助手。"
+#: 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 "错误:产品 <b>%{product}</b> 在注册服务器 (%{url}) 上不可用。请将缺失的产品添加到注册服务器上以允许使用此迁移助手。"
#. 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:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
msgid "%s <b>will be installed.</b>"
msgstr "<b>将安装</b> %s。"
#. 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:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
msgid "%s <b>stays unchanged.</b>"
msgstr "%s <b>无变化。</b>"
#. 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:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr "%{old_product} <b> 将被升级到</b> %{new_product}。"
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr "%{old_product} <b>将被降级到</b> %{new_product}。"
#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1138,18 +1084,12 @@
msgstr "<p>系统已注册。</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>"
+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 "<p>您可以再次注册或注册额外扩展或模块以增强系统功能。</p>"
#: 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 ""
-"<p>若您想要反注册您的系统,您需要登入 SUSE 客服中心并在那里手动移除该系统。</"
-"p>"
+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 "<p>若您想要反注册您的系统,您需要登入 SUSE 客服中心并在那里手动移除该系统。</p>"
#. button label
#: src/lib/registration/ui/registered_system_dialog.rb:70
@@ -1178,16 +1118,95 @@
"自动注册升级失败。\n"
"您可以从头开始手动注册该系统。"
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:211
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service] List of services to show.
+#. @param heading [String] Text to be shown as dialog heading. A default text
+#. will be used if it's not specified.
+#. @param description [String] Text to be shown as description. A default text
+#. will be used if it's not specified.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:64
+msgid "Local Registration Servers"
+msgstr "本地注册服务器"
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:65
+msgid ""
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
+msgstr ""
+"请从列表中选择一个检测到的注册服务器\n"
+"或使用默认的 SUSE 注册服务器。"
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:67
+#, fuzzy
+#| msgid "No registration server selected."
+msgid "No registration server selected"
+msgstr "未选择注册服务器。"
+
+#. Default registration server
+#.
+#. return [String] Returns a string representing the default SCC service.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:102
+msgid "SUSE Customer Center (%s)"
+msgstr "SUSE 客服中心(&s)"
+
+#. @return [Array<Yast::SlpServiceClass::Service>]
+#: src/lib/registration/url_helpers.rb:220
msgid "Searching..."
msgstr "搜索中..."
-#: src/lib/registration/url_helpers.rb:211
+#: src/lib/registration/url_helpers.rb:220
msgid "Looking up local registration servers..."
msgstr "正在查找本地注册服务器..."
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service>] list of services to show
+#. @param heading [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
#, fuzzy
+#| msgid "Server Settings"
+msgid "Service selection"
+msgstr "服务器设置"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+#| msgid "No registration server selected."
+msgid "No service was selected."
+msgstr "未选择注册服务器。"
+
+#~ msgid "Registration failed."
+#~ msgstr "注册失败。"
+
+#~ msgid "&Local Registration Server..."
+#~ msgstr "本地注册服务器(&L)..."
+
+#~ 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 ""
+#~ "请在下面字段输入本产品的注册码或评估码以及您在 SUSE 客服中心的用户名/电子邮件地址。\n"
+#~ "只有注册了产品才能够获得安全和常规软件更新。"
+
+#~ msgid ""
+#~ "If you skip product registration now, remember to register after\n"
+#~ "installation has completed."
+#~ msgstr "若您现在跳过了注册,请记得在安装完成后注册呀。"
+
+#, fuzzy
#~| msgid "Additional Repositories"
#~ msgid "Migration Repositories"
#~ msgstr "附加源"
@@ -1294,11 +1313,9 @@
#~ msgid ""
#~ "<p>\n"
-#~ "To install an add-on product from separate media together with &product;, "
-#~ "select\n"
+#~ "To install an add-on product from separate media together with &product;, select\n"
#~ "<b>Include Add-on Products from Separate Media</b>.</p>\n"
-#~ "<p>If you need specific hardware drivers for installation, see <i>%s</i> "
-#~ "site.</p>"
+#~ "<p>If you need specific hardware drivers for installation, see <i>%s</i> site.</p>"
#~ msgstr ""
#~ "<p>\n"
#~ "要与 &product; 一起安装某个来自独立介质的附加产品,请选择\n"
@@ -1457,8 +1474,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Configure your system to enable online updates by registering it with "
-#~ "Novell.\n"
+#~ "Configure your system to enable online updates by registering it with Novell.\n"
#~ "To do this now, select <b>Configure Now</b>. Delay the registration with\n"
#~ "<b>Configure Later</b>.\n"
#~ "</p>"
@@ -1470,34 +1486,25 @@
#~ msgid ""
#~ "<p>\n"
-#~ "To simplify the registration process, include information from your "
-#~ "system\n"
+#~ "To simplify the registration process, include information from your system\n"
#~ "with <b>Optional Information</b> and <b>Hardware Profile</b>. \n"
-#~ "<b>Details</b> shows the maximum amount of information that can be "
-#~ "involved\n"
-#~ " in your registration. To obtain this information, it contacts the "
-#~ "Novell\n"
-#~ "server to query what information is needed for your product. Only the "
-#~ "identity\n"
+#~ "<b>Details</b> shows the maximum amount of information that can be involved\n"
+#~ " in your registration. To obtain this information, it contacts the Novell\n"
+#~ "server to query what information is needed for your product. Only the identity\n"
#~ "of the installed product is sent in this initial exchange.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
-#~ "要简化注册流程,可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信"
-#~ "息。\n"
-#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息,注册程序会联"
-#~ "系\n"
-#~ "Novell 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身"
-#~ "份。\n"
+#~ "要简化注册流程,可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信息。\n"
+#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息,注册程序会联系\n"
+#~ "Novell 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身份。\n"
#~ "</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "If you purchased your copy of this product, enable <b>Registration Code</"
-#~ "b>\n"
+#~ "If you purchased your copy of this product, enable <b>Registration Code</b>\n"
#~ "so you are prompted for your product code. \n"
-#~ "This registers you for the installation support included with your "
-#~ "product.\n"
+#~ "This registers you for the installation support included with your product.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
@@ -1508,44 +1515,34 @@
#~ msgid ""
#~ "<p>\n"
#~ "No information is passed to anyone outside Novell. The data is used for\n"
-#~ "statistical purposes and to enhance your convenience regarding driver "
-#~ "support\n"
-#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. "
-#~ "View\n"
-#~ "the transmitted information in the log file <tt>~/.suse_register.log</"
-#~ "tt>.\n"
+#~ "statistical purposes and to enhance your convenience regarding driver support\n"
+#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. View\n"
+#~ "the transmitted information in the log file <tt>~/.suse_register.log</tt>.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
-#~ "没有信息会被转让给 Novell 以外的任何人。该数据用于统计目的,为了在驱动支持"
-#~ "和网络账户方面为您提供更多方便。\n"
-#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/."
-#~ "suse_register.log</tt> 中查看已传输的信息。\n"
+#~ "没有信息会被转让给 Novell 以外的任何人。该数据用于统计目的,为了在驱动支持和网络账户方面为您提供更多方便。\n"
+#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/.suse_register.log</tt> 中查看已传输的信息。\n"
#~ "</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your "
-#~ "update \n"
+#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
#~ "sources are still valid and adds any new ones that may be available.\n"
-#~ "It additionally sends any modifications to your included data to Novell, "
-#~ "such \n"
+#~ "It additionally sends any modifications to your included data to Novell, such \n"
#~ "as hardware information if <b>Hardware Information</b> is activated.\n"
#~ "This option does not remove any sources added manually.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
-#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新"
-#~ "来源。\n"
-#~ "它还会把对从您系统上采集的数据的任何修订发送到 Novell,比如激活了<b>硬件信"
-#~ "息</b>\n"
+#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新来源。\n"
+#~ "它还会把对从您系统上采集的数据的任何修订发送到 Novell,比如激活了<b>硬件信息</b>\n"
#~ "时的硬件信息。该选项不会移除任何手动添加的来源。\n"
#~ "</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "The registration process will contact a Novell server (or a local "
-#~ "registration server if your company provides one).\n"
+#~ "The registration process will contact a Novell server (or a local registration server if your company provides one).\n"
#~ "Make sure that the network and proxy settings are correct.\n"
#~ "You can go back to the network setup to check or change the settings.\n"
#~ "</p>\n"
@@ -1557,8 +1554,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Configure your system to enable online updates by registering it with "
-#~ "Open-SLX.\n"
+#~ "Configure your system to enable online updates by registering it with Open-SLX.\n"
#~ "To do this now, select <b>Configure Now</b>. Delay the registration with\n"
#~ "<b>Configure Later</b>.\n"
#~ "</p>"
@@ -1570,69 +1566,51 @@
#~ msgid ""
#~ "<p>\n"
-#~ "To simplify the registration process, include information from your "
-#~ "system\n"
+#~ "To simplify the registration process, include information from your system\n"
#~ "with <b>Optional Information</b> and <b>Hardware Profile</b>. \n"
-#~ "<b>Details</b> shows the maximum amount of information that can be "
-#~ "involved\n"
-#~ " in your registration. To obtain this information, it contacts the Open-"
-#~ "SLX\n"
-#~ "server to query what information is needed for your product. Only the "
-#~ "identity\n"
+#~ "<b>Details</b> shows the maximum amount of information that can be involved\n"
+#~ " in your registration. To obtain this information, it contacts the Open-SLX\n"
+#~ "server to query what information is needed for your product. Only the identity\n"
#~ "of the installed product is sent in this initial exchange.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
-#~ "要简化注册流程,可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信"
-#~ "息。\n"
-#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息,注册程序会联"
-#~ "系\n"
-#~ "Open-SLX 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身"
-#~ "份。\n"
+#~ "要简化注册流程,可使用<b>可选信息</b>和<b>硬件方案</b>从您的系统中采集信息。\n"
+#~ "<b>细节</b>可显示注册过程中可能涉及的最多信息。为获取此信息,注册程序会联系\n"
+#~ "Open-SLX 服务器查询您产品所需的信息。本次初始交换仅会发送已安装产品的身份。\n"
#~ "</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "No information is passed to anyone outside Open-SLX. The data is used "
-#~ "for\n"
-#~ "statistical purposes and to enhance your convenience regarding driver "
-#~ "support\n"
-#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. "
-#~ "View\n"
-#~ "the transmitted information in the log file <tt>~/.suse_register.log</"
-#~ "tt>.\n"
+#~ "No information is passed to anyone outside Open-SLX. The data is used for\n"
+#~ "statistical purposes and to enhance your convenience regarding driver support\n"
+#~ "and your Web account. Find a detailed privacy policy in <b>Details</b>. View\n"
+#~ "the transmitted information in the log file <tt>~/.suse_register.log</tt>.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
-#~ "没有信息会被转让给 Open-SLX 以外的任何人。该数据用于统计目的,为了驱动器支"
-#~ "持和网络帐户方面为您提供更多方便。\n"
-#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/."
-#~ "suse_register.log</tt> 中查看已传输的信息。\n"
+#~ "没有信息会被转让给 Open-SLX 以外的任何人。该数据用于统计目的,为了驱动器支持和网络帐户方面为您提供更多方便。\n"
+#~ "您可在<b>细节</b>中找到详细的隐私策略。您可在日志文件 <tt>~/.suse_register.log</tt> 中查看已传输的信息。\n"
#~ "</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your "
-#~ "update \n"
+#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
#~ "sources are still valid and adds any new ones that may be available.\n"
-#~ "It additionally sends any modifications to your included data to Open-"
-#~ "SLX, such \n"
+#~ "It additionally sends any modifications to your included data to Open-SLX, such \n"
#~ "as hardware information if <b>Hardware Information</b> is activated.\n"
#~ "This option does not remove any sources added manually.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
-#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新"
-#~ "来源。\n"
-#~ "它还会把对从您系统上采集的数据的任何修订发送到 Open-SLX,比如激活了<b>硬件"
-#~ "信息</b>\n"
+#~ "<b>定期与客服中心同步</b>会检查您的更新来源是否仍然有效并添加任何可用的新来源。\n"
+#~ "它还会把对从您系统上采集的数据的任何修订发送到 Open-SLX,比如激活了<b>硬件信息</b>\n"
#~ "时的硬件信息。该选项不会移除任何手动添加的来源。\n"
#~ "</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "The registration process will contact an Open-SLX server (or a local "
-#~ "registration server if your company provides one).\n"
+#~ "The registration process will contact an Open-SLX server (or a local registration server if your company provides one).\n"
#~ "Please make sure that the network and proxy settings are correct.\n"
#~ "You can step back to the network setup to check or change the settings.\n"
#~ "</p>"
@@ -1720,8 +1698,7 @@
#~ msgid "The following package needs to be installed."
#~ msgstr "需要安装以下软件包。"
-#~ msgid ""
-#~ "To count this installation correctly the package %1 needs to be installed."
+#~ msgid "To count this installation correctly the package %1 needs to be installed."
#~ msgstr "<p>为了正确统计此计算机,需要安装软件包 %1。</p>"
#~ msgid "Therefore the following package needs to be removed first."
@@ -1730,9 +1707,7 @@
#~ msgid "The package %1 should have been installed and %2 removed."
#~ msgstr "应该已经安装了软件包 %1 并移除了软件包 %2。"
-#~ msgid ""
-#~ "Registration will continue now although the registration server may "
-#~ "miscount this installation."
+#~ msgid "Registration will continue now although the registration server may miscount this installation."
#~ msgstr "即使注册服务器或许漏计了此计算机,注册也将立即继续进行。"
#~ msgid "Setting up online update source..."
@@ -1768,27 +1743,16 @@
#~ msgid "Key is invalid."
#~ msgstr "无效键。"
-#~ msgid ""
-#~ "<p>Get more information about the registration process with "
-#~ "<tt>suse_register -h</tt>.</p>"
-#~ msgstr ""
-#~ "<p>请使用 <tt>suse_register -h</tt> 获得有关注册过程的更多信息。</p>"
+#~ msgid "<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>"
+#~ msgstr "<p>请使用 <tt>suse_register -h</tt> 获得有关注册过程的更多信息。</p>"
#~ msgid ""
#~ "<p>Other information used for registration is shown in <b>Registration\n"
-#~ "Data</b>.<br>To add a new key and value pair, press <b>Add</b> then enter "
-#~ "the\n"
-#~ "appropriate values. These parameters are the ones that can be passed with "
-#~ "<tt>suse_register\n"
-#~ "-a</tt>.<br>Get more information with <tt>suse_register -p</tt>. Remove "
-#~ "a\n"
-#~ "key-value pair with <b>Delete</b> or modify an existing pair with "
-#~ "<b>Edit</b>.</p>"
-#~ msgstr ""
-#~ "<p>用于注册的其他信息显示在<b>注册数据</b>中。<br>要添加新键值对,请按<b>"
-#~ "添加</b>,然后输入适当的值。这些参数也可通过 <tt>suse_register -a</tt> 传"
-#~ "递。<br>可使用 <tt>suse_register -p</tt> 获得更多信息。可使用<b>删除</b>移"
-#~ "除键值对或使用<b>编辑</b>修改现有键值对。</p>"
+#~ "Data</b>.<br>To add a new key and value pair, press <b>Add</b> then enter the\n"
+#~ "appropriate values. These parameters are the ones that can be passed with <tt>suse_register\n"
+#~ "-a</tt>.<br>Get more information with <tt>suse_register -p</tt>. Remove a\n"
+#~ "key-value pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
+#~ msgstr "<p>用于注册的其他信息显示在<b>注册数据</b>中。<br>要添加新键值对,请按<b>添加</b>,然后输入适当的值。这些参数也可通过 <tt>suse_register -a</tt> 传递。<br>可使用 <tt>suse_register -p</tt> 获得更多信息。可使用<b>删除</b>移除键值对或使用<b>编辑</b>修改现有键值对。</p>"
#~ msgid "SMT Server"
#~ msgstr "SMT 服务器"
@@ -1900,27 +1864,11 @@
#~ msgid "See the help text for details."
#~ msgstr "详情请参阅帮助文本。"
-#~ msgid ""
-#~ "<p>To register this installation at a local registration server, "
-#~ "configure the URL and optionally the server's CA certificate via the "
-#~ "<b>Advanced</b> menu.</p>"
-#~ msgstr ""
-#~ "<p>要在本地注册服务器上注册此计算机,请配置 URL,可能还要通过<b>高级</b>菜"
-#~ "单配置服务器 CA 证书。</p>"
+#~ msgid "<p>To register this installation at a local registration server, configure the URL and optionally the server's CA certificate via the <b>Advanced</b> menu.</p>"
+#~ msgstr "<p>要在本地注册服务器上注册此计算机,请配置 URL,可能还要通过<b>高级</b>菜单配置服务器 CA 证书。</p>"
-#~ msgid ""
-#~ "<p>The registration server URL has to start with <i>https://</i> whereas "
-#~ "the location of its CA certificate may be a URL of the format <i>http://</"
-#~ "i>, <i>https://</i> or <i>ftp://</i>. Furthermore valid locations are <i>/"
-#~ "path/on/local/disk</i>, <b>floppy</b><i>/path/on/floppy-disk</i> and the "
-#~ "keyword <i>done</i>. The latter indicates that no CA certificate handling "
-#~ "needs to be done in order to trust the registration server.</p>"
-#~ msgstr ""
-#~ "<p>注册服务器 URL 必须以 <i>https://</i> 开头而其 CA 证书的位置可以是 "
-#~ "<i>http://</i>、<i>https://</i> 或 <i>ftp://</i> 格式的 URL。此外有效的位"
-#~ "置为 <i>/patch/on/local/disk</i>,<b>floppy</b><i>/path/on/floppy-disk</"
-#~ "i> 和关键词 <i>done</i>。后者表示不需要处理 CA 证书即可信任该注册服务器。"
-#~ "</p>"
+#~ msgid "<p>The registration server URL has to start with <i>https://</i> whereas the location of its CA certificate may be a URL of the format <i>http://</i>, <i>https://</i> or <i>ftp://</i>. Furthermore valid locations are <i>/path/on/local/disk</i>, <b>floppy</b><i>/path/on/floppy-disk</i> and the keyword <i>done</i>. The latter indicates that no CA certificate handling needs to be done in order to trust the registration server.</p>"
+#~ msgstr "<p>注册服务器 URL 必须以 <i>https://</i> 开头而其 CA 证书的位置可以是 <i>http://</i>、<i>https://</i> 或 <i>ftp://</i> 格式的 URL。此外有效的位置为 <i>/patch/on/local/disk</i>,<b>floppy</b><i>/path/on/floppy-disk</i> 和关键词 <i>done</i>。后者表示不需要处理 CA 证书即可信任该注册服务器。</p>"
#~ msgid "Do you want to skip registration?"
#~ msgstr "您想要跳过注册吗?"
@@ -2090,8 +2038,7 @@
#~ msgid ""
#~ "The SMT server URL could not be validated as URL.\n"
-#~ "Registration can not be performed. Please modify /etc/suseRegister.conf "
-#~ "and run Registration manually.\n"
+#~ "Registration can not be performed. Please modify /etc/suseRegister.conf and run Registration manually.\n"
#~ "The SMT server URL that was configured was\n"
#~ "%1"
#~ msgstr ""
@@ -2117,12 +2064,9 @@
#~ msgid ""
#~ "<p>\n"
-#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your "
-#~ "update \n"
-#~ "repositories are still valid and adds any new ones that may be "
-#~ "available.\n"
-#~ "It additionally sends any modifications to your included data to Novell, "
-#~ "such \n"
+#~ "<b>Regularly Synchronize with the Customer Center</b> checks that your update \n"
+#~ "repositories are still valid and adds any new ones that may be available.\n"
+#~ "It additionally sends any modifications to your included data to Novell, such \n"
#~ "as hardware information if <b>Hardware Information</b> is activated.\n"
#~ "This option does not remove any repositories added manually.\n"
#~ "</p>"
Modified: trunk/yast/zh_CN/po/reipl.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/reipl.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/reipl.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-06-10 11:57+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -28,11 +28,16 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "After shutdown, reload the system\n"
+#| "with an IPL from DASD '%1'.\n"
msgid ""
"\n"
"After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
msgstr ""
"\n"
"关机后,从可直接访问存储设备 (DASD) '%1'\n"
@@ -43,7 +48,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -56,7 +61,7 @@
"逻辑单元编号为 '%3' 的光纤通道协议\n"
"'%1' 进行初始程序装入 (IPL) 来重加系统。\n"
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: trunk/yast/zh_CN/po/samba-client.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/samba-client.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/samba-client.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: Samba Client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-06-18 19:42+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -824,79 +824,79 @@
msgstr "正在安装所需软件包..."
#. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
msgid "PAM Login"
msgstr "PAM 登入"
#. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
msgid "Use Kerberos"
msgstr "使用 Kerberos"
#. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
msgid "Do Not Use Kerberos"
msgstr "不使用 Kerberos"
#. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
msgid "Default Realm"
msgstr "默认领域"
#. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
msgid "Default Domain"
msgstr "默认域"
#. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
msgid "KDC Server Address"
msgstr "KDC 服务器地址"
#. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
msgid "Clock Skew"
msgstr "时钟偏差"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
msgid "<b>KDC Server</b>: %1<br>"
msgstr "<b>KDC 服务器</b>:%1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<b>默认域</b>:%1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
msgid "<b>Default Realm</b>: %1<br>"
msgstr "<b>默认领域</b>:%1<br>"
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
msgid "<b>Kerberos Authentication Enabled</b>: %1"
msgstr "<b>启动 Kerberos 认证</b>:%1"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "是"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
msgid "No"
msgstr "否"
#. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
msgid "Configuration Acquired via DNS"
msgstr "通过 DNS 取得的配置"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
@@ -905,7 +905,7 @@
"请重试。\n"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: trunk/yast/zh_CN/po/services-manager.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/services-manager.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/services-manager.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-18 11:26+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -274,11 +274,11 @@
#. 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
+#: src/modules/services_manager_service.rb:415
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr "无法 %{change} %{service},其当前处于 %{status} 状态。"
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
msgid "Could not %{change} %{service}. "
msgstr "无法 %{change} %{service}。"
Modified: trunk/yast/zh_CN/po/snapper.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/snapper.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/snapper.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2016-06-05 23:33+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -20,134 +20,171 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 2.0\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 <jsuchome(a)suse.cz>
+#.
+#. Main file for snapper configuration. Uses all other files.
+#: src/clients/snapper.rb:49
msgid "Configuration of system snapshots"
msgstr "系统快照配置"
#. 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:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
msgid "Description"
msgstr "描述"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
msgid "User data"
msgstr "用户数据"
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
msgid "Cleanup algorithm"
msgstr "清理算法"
-#. 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:161
+#, fuzzy
+#| msgid "Modify Snapshot %1"
+msgid "Modify Snapshot %{num}"
msgstr "修订快照 %1"
-#. popup label, %1, %2 are numbers (range)
-#: src/include/snapper/dialogs.rb:166
-msgid "Modify Snapshots %1 - %2"
-msgstr "修订快照 %1 - %2"
+#. popup label, %{pre} and %{post} are numbers
+#: src/include/snapper/dialogs.rb:167
+msgid "Modify Snapshot %{pre} and %{post}"
+msgstr "修订快照 %{pre} 和 %{post}"
#. label
#: src/include/snapper/dialogs.rb:169
-msgid "Pre (%1)"
+#, fuzzy
+#| msgid "Pre (%1)"
+msgid "Pre (%{pre})"
msgstr "前期快照 (%1)"
#. label
#: src/include/snapper/dialogs.rb:173
-msgid "Post (%1)"
+#, fuzzy
+#| msgid "Post (%1)"
+msgid "Post (%{post})"
msgstr "后期快照 (%2)"
#. popup label
-#: src/include/snapper/dialogs.rb:249
+#: src/include/snapper/dialogs.rb:250
msgid "Create New Snapshot"
msgstr "创建新快照"
#. radio button label
-#: src/include/snapper/dialogs.rb:262
+#: src/include/snapper/dialogs.rb:263
msgid "Single snapshot"
msgstr "单个快照"
#. 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:272 src/include/snapper/dialogs.rb:450
msgid "Pre"
msgstr "前期快照"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:281
+#: src/include/snapper/dialogs.rb:282
msgid "Post, paired with:"
msgstr "后期快照,配对为:"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:352
-msgid "Really delete snapshot '%1'?"
+#: src/include/snapper/dialogs.rb:358
+#, fuzzy
+#| msgid "Really delete snapshot '%1'?"
+msgid "Really delete snapshot %{num}?"
msgstr "真的删除快照 ‘%1’ 吗?"
+#. yes/no popup question
+#: src/include/snapper/dialogs.rb:365
+msgid "Really delete snapshots %{pre} and %{post}?"
+msgstr "真的删除快照 %{pre} 和 %{post} 吗?"
+
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:365
+#: src/include/snapper/dialogs.rb:380
msgid "Snapshots"
msgstr "快照"
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:394
+#: src/include/snapper/dialogs.rb:409
msgid "Single"
msgstr "单个"
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:419
+#: src/include/snapper/dialogs.rb:434
msgid "Pre & Post"
msgstr "前后快照"
#. busy popup message
-#: src/include/snapper/dialogs.rb:454
+#: src/include/snapper/dialogs.rb:469
msgid "Reading list of snapshots..."
msgstr "正在读取快照列表..."
#. combo box label
-#: src/include/snapper/dialogs.rb:475
+#: src/include/snapper/dialogs.rb:485
msgid "Current Configuration"
msgstr "当前配置"
#. table header
-#: src/include/snapper/dialogs.rb:486
+#: src/include/snapper/dialogs.rb:496
msgid "ID"
msgstr "ID"
-#: src/include/snapper/dialogs.rb:487
+#: src/include/snapper/dialogs.rb:497
msgid "Type"
msgstr "类型"
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:498
msgid "Start Date"
msgstr "开始日期"
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:499
msgid "End Date"
msgstr "结束日期"
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:501
msgid "User Data"
msgstr "用户数据"
#. button label
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:507
msgid "Show Changes"
msgstr "显示变化"
#. button label
-#: src/include/snapper/dialogs.rb:500
+#: src/include/snapper/dialogs.rb:510
msgid "Modify"
msgstr "修订"
#. popup message
-#: src/include/snapper/dialogs.rb:542
+#: src/include/snapper/dialogs.rb:553
msgid ""
"This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
"Showing differences is not possible."
@@ -156,131 +193,131 @@
"无法显示差异。"
#. dialog caption
-#: src/include/snapper/dialogs.rb:588
+#: src/include/snapper/dialogs.rb:638
msgid "Selected Snapshot Overview"
msgstr "所选快照概览"
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:626
+#: src/include/snapper/dialogs.rb:670
msgid "%1: %2"
msgstr "%1:%2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:645
+#: src/include/snapper/dialogs.rb:689
msgid "Calculating changed files..."
msgstr "正在计算有变化的文件..."
#. busy popup message
-#: src/include/snapper/dialogs.rb:742
+#: src/include/snapper/dialogs.rb:699
msgid "Calculating file modifications..."
msgstr "正在计算文件修改..."
#. label
-#: src/include/snapper/dialogs.rb:750
+#: src/include/snapper/dialogs.rb:707
msgid "New file was created."
msgstr "已创建新文件。"
#. label
-#: src/include/snapper/dialogs.rb:754
+#: src/include/snapper/dialogs.rb:711
msgid "File was removed."
msgstr "已移除文件。"
#. label
-#: src/include/snapper/dialogs.rb:759
+#: src/include/snapper/dialogs.rb:716
msgid "File content was not changed."
msgstr "文件内容无变化。"
#. label
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:722
msgid "File does not exist in either snapshot."
msgstr "文件在任何快照中都不存在。"
#. label
-#: src/include/snapper/dialogs.rb:771
+#: src/include/snapper/dialogs.rb:728
msgid "File content was modified."
msgstr "已修订文件内容。"
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:738
msgid "File mode was changed from '%1' to '%2'."
msgstr "文件模式已从 '%1' 变为 '%2'。"
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:796
+#: src/include/snapper/dialogs.rb:753
msgid "File user ownership was changed from '%1' to '%2'."
msgstr "文件用户所有权已从 '%1' 变为 '%2'。"
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:812
+#: src/include/snapper/dialogs.rb:769
msgid "File group ownership was changed from '%1' to '%2'."
msgstr "文件组所有权已经从 '%1' 变为 '%2'。"
#. button label
-#: src/include/snapper/dialogs.rb:847
+#: src/include/snapper/dialogs.rb:786
msgid "R&estore from First"
msgstr "从第一个快照恢复(&E)"
#. button label
-#: src/include/snapper/dialogs.rb:849
+#: src/include/snapper/dialogs.rb:788
msgid "Restore"
msgstr "恢复"
-#: src/include/snapper/dialogs.rb:872
+#: src/include/snapper/dialogs.rb:811
msgid "Res&tore from Second"
msgstr "从第二个快照恢复(&T)"
#. radio button label
-#: src/include/snapper/dialogs.rb:909
+#: src/include/snapper/dialogs.rb:848
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:860
msgid "Show the difference between current and selected snapshot:"
msgstr "显示当前系统和所选快照间的差异:"
#. radio button label
-#: src/include/snapper/dialogs.rb:968
+#: src/include/snapper/dialogs.rb:907
msgid "Show the difference between first and second snapshot"
msgstr "显示第一个和第二个快照间的差异"
#. radio button label
-#: src/include/snapper/dialogs.rb:979
+#: src/include/snapper/dialogs.rb:918
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:929
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
+#: src/include/snapper/dialogs.rb:958
+msgid "Time of taking the snapshot:"
+msgstr "快照耗时:"
+
+#. label, date string will follow at the end of line
+#: src/include/snapper/dialogs.rb:966
msgid "Time of taking the first snapshot:"
msgstr "第一个快照耗时:"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:971
msgid "Time of taking the second snapshot:"
msgstr "第二个快照耗时:"
-#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1044
-msgid "Time of taking the snapshot:"
-msgstr "快照耗时:"
-
#. button label
-#: src/include/snapper/dialogs.rb:1066
+#: src/include/snapper/dialogs.rb:994
msgid "&Open"
msgstr "打开(&O)"
#. button label
-#: src/include/snapper/dialogs.rb:1112
+#: src/include/snapper/dialogs.rb:1040
msgid "Restore Selected"
msgstr "恢复所选内容"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1186
+#: src/include/snapper/dialogs.rb:1125
msgid ""
"Do you want to delete the file\n"
"\n"
@@ -296,7 +333,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:1146 src/include/snapper/dialogs.rb:1165
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -311,24 +348,25 @@
"到当前系统吗?"
#. popup message
-#: src/include/snapper/dialogs.rb:1259
-msgid "No file was selected for restoring"
+#: src/include/snapper/dialogs.rb:1191
+#, fuzzy
+#| msgid "No file was selected for restoring"
+msgid "No file was selected for restoring."
msgstr "未选择要恢复的文件。"
#. popup headline
-#: src/include/snapper/dialogs.rb:1264
+#: src/include/snapper/dialogs.rb:1201
msgid "Restoring files"
msgstr "正在恢复文件"
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1267
+#: src/include/snapper/dialogs.rb:1204
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
"%2\n"
"</p>\n"
-"<p>Files existing in original snapshot will be copied to current system.</"
-"p>\n"
+"<p>Files existing in original snapshot will be copied to current system.</p>\n"
"<p>Files that did not exist in the snapshot will be deleted.</p>Are you sure?"
msgstr ""
"<p>这些文件将从快照 '%1' 中恢复:</p>\n"
@@ -339,7 +377,7 @@
"<p>快照中不存在的文件将被删除。</p>您确定吗?"
#. Read dialog help
-#: src/include/snapper/helps.rb:36
+#: src/include/snapper/helps.rb:35
msgid ""
"<p><b><big>Reading the list of snapshots</big></b><br>\n"
"</p>\n"
@@ -348,172 +386,153 @@
"</p>\n"
#. Summary dialog help:
-#: src/include/snapper/helps.rb:40
+#: src/include/snapper/helps.rb:39
+#, fuzzy
+#| 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"
+#| "new file system changes in the specified snapshot.</p>\n"
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"
+"<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 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 ""
"<p><b><big>快照配置</big></b></p>\n"
"<p>该表格显示了一份根文件系统快照列表。\n"
"有三种类型的快照,<b>单个</b>,<b>前期</b>和<b>后期</b>。\n"
-"\"单个\" 快照用于存储某一特定时间点的文件系统状态,而 \"前期\" 和 \"后期\" 快"
-"照用于确定在两次快照期间执行的某特殊操作造成的修改。\n"
+"\"单个\" 快照用于存储某一特定时间点的文件系统状态,而 \"前期\" 和 \"后期\" 快照用于确定在两次快照期间执行的某特殊操作造成的修改。\n"
"\"前期\" 和 \"后期\" 快照在表格中是成对显示的。</p>\n"
-"<p>选择一个快照或快照对,点击<b>显示变化</b>来查看指定快照中新的文件系统变"
-"化。</p>\n"
+"<p>选择一个快照或快照对,点击<b>显示变化</b>来查看指定快照中新的文件系统变化。</p>\n"
#. Show snapshot dialog help
-#: src/include/snapper/helps.rb:49
+#: src/include/snapper/helps.rb:48
+#, fuzzy
+#| 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"
+#| "</p>\n"
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"
+"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 ""
"<p><b><big>快照概览</big></b></p>\n"
-"<p>该树形结构显示了创建第一个 ('前期') 和第二个 ('后期') 快照期间被修改的全部"
-"文件。在右侧,您可以看到第一个快照创建时生成的描述和两个快照的创建时间。</p>\n"
-"<p>当选中该树形结构中的某个文件时,您可以看到其修订历史。默认显示了所选快照对"
-"之间的差异,但也可以比较该文件的不同版本。</p>\n"
+"<p>该树形结构显示了创建第一个 ('前期') 和第二个 ('后期') 快照期间被修改的全部文件。在右侧,您可以看到第一个快照创建时生成的描述和两个快照的创建时间。</p>\n"
+"<p>当选中该树形结构中的某个文件时,您可以看到其修订历史。默认显示了所选快照对之间的差异,但也可以比较该文件的不同版本。</p>\n"
#. 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"
-"The tree shows all the files that differ in a selected snapshot and the "
-"current system. On the right side, you see the snapshot description and time "
-"of its creation.\n"
+"The tree shows all the files that differ in a selected snapshot and the current system. On the right side, you see the snapshot description and time of its creation.\n"
"</p>\n"
"<p>\n"
-"When a file is selected in the tree, you can see the its difference between "
-"snapshot version and current system.\n"
+"When a file is selected in the tree, you can see the its difference between snapshot version and current system.\n"
"</p>\n"
msgstr ""
"<p><b><big>快照概览</big></b></p>\n"
-"<p>该树形结构显示了所选快照中与当前系统有所不同的全部文件。在右侧,您可以看到"
-"快照描述和其创建时间。</p>\n"
-"<p>当选中该树形结构中的某个文件时,您可以看到快照版本和当前系统的不同之处。</"
-"p>\n"
+"<p>该树形结构显示了所选快照中与当前系统有所不同的全部文件。在右侧,您可以看到快照描述和其创建时间。</p>\n"
+"<p>当选中该树形结构中的某个文件时,您可以看到快照版本和当前系统的不同之处。</p>\n"
-#. popup error
-#: src/modules/Snapper.rb:91
-msgid "Snapshot '%1' was not found."
-msgstr "未找到快照 '%1'。"
+#. 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
+msgid "Failed to get config:\n"
+msgstr "获取配置失败:\n"
-#. 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
+msgid "Failed to get snapshot mount point:\n"
+msgstr "获取快照挂载点失败:\n"
+
#. 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
-msgid "Reason not known."
-msgstr "原因未知。"
-
-#: src/modules/Snapper.rb:238
-msgid "Configuration not found."
-msgstr "未找到配置。"
-
-#: src/modules/Snapper.rb:240
-msgid "Configuration is not valid."
-msgstr "配置无效。"
-
-#. error popup
-#: src/modules/Snapper.rb:247
-msgid ""
-"Failed to initialize snapper library:\n"
-"%1"
+#: src/modules/Snapper.rb:276
+#, fuzzy
+#| msgid ""
+#| "Failed to create new snapshot:\n"
+#| "%1"
+msgid "Failed to create new snapshot:\n"
msgstr ""
-"初始化 Snapper 库失败:\n"
+"创建新快照失败:\n"
"%1"
-#: src/modules/Snapper.rb:266
-msgid "Snapshot was not found."
-msgstr "未找到快照。"
-
-#. error popup
-#: src/modules/Snapper.rb:271
-msgid ""
-"Failed to delete snapshot:\n"
-"%1"
+#. Modify existing snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:291
+#, fuzzy
+#| msgid ""
+#| "Failed to modify snapshot:\n"
+#| "%1"
+msgid "Failed to modify snapshot:\n"
msgstr ""
-"删除快照失败:\n"
-"%1"
-
-#. error popup
-#: src/modules/Snapper.rb:289
-msgid ""
-"Failed to modify snapshot:\n"
-"%1"
-msgstr ""
"修订快照失败:\n"
"%1"
+#. Delete existing snapshot
+#. Return true on success
#: src/modules/Snapper.rb:306
-msgid "Wrong snapshot type given."
-msgstr "给定了错误的快照类型。"
-
-#: src/modules/Snapper.rb:308
-msgid "'Pre' snapshot was not given."
-msgstr "未给定前期快照。"
-
-#: src/modules/Snapper.rb:310
-msgid "Given 'Pre' snapshot was not found."
-msgstr "未找到给定的前期快照。"
-
-#. error popup
-#: src/modules/Snapper.rb:316
-msgid ""
-"Failed to create new snapshot:\n"
-"%1"
+#, fuzzy
+#| msgid ""
+#| "Failed to delete snapshot:\n"
+#| "%1"
+msgid "Failed to delete snapshot:\n"
msgstr ""
-"创建新快照失败:\n"
+"删除快照失败:\n"
"%1"
#. Snapper read dialog caption
-#: src/modules/Snapper.rb:326
+#: src/modules/Snapper.rb:319
msgid "Initializing Snapper"
msgstr "正在初始化 Snapper"
-#. Progress stage 1/3
-#: src/modules/Snapper.rb:337
-msgid "Read the list of snapshots"
-msgstr "读取快照列表"
+#. Progress stage 1/2
+#: src/modules/Snapper.rb:324
+msgid "Read list of configurations"
+msgstr "读取配置列表"
-#. Progress step 1/3
-#: src/modules/Snapper.rb:341
-msgid "Reading the database..."
-msgstr "正在读取数据库..."
+#. Progress stage 2/2
+#: src/modules/Snapper.rb:326
+#, fuzzy
+#| msgid "Reading list of snapshots"
+msgid "Read list of snapshots"
+msgstr "正在读取快照列表"
+#. Progress step 1/2
+#: src/modules/Snapper.rb:330
+msgid "Reading list of configurations"
+msgstr "正在读取配置列表"
+
+#. Progress step 2/2
+#: src/modules/Snapper.rb:332
+msgid "Reading list of snapshots"
+msgstr "正在读取快照列表"
+
#. Progress finished
-#: src/modules/Snapper.rb:343
+#: src/modules/Snapper.rb:334
msgid "Finished"
msgstr "已完成"
-#. error popup
-#: src/modules/Snapper.rb:352
+#: src/modules/Snapper.rb:344
+msgid "Querying snapper configurations failed:"
+msgstr "查询 snapper 配置失败:"
+
+#: 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"
@@ -523,47 +542,64 @@
"才能使用 yast2-snapper。可使用 snapper 命令\n"
"行工具来创建配置。"
+#: src/modules/Snapper.rb:359
+msgid "Querying snapper snapshots failed:"
+msgstr "查询 snapper 快照失败:"
+
#. label for log window
-#: src/modules/Snapper.rb:395
+#: src/modules/Snapper.rb:399
msgid "Restoring Files..."
msgstr "正在恢复文件..."
#. log entry (%1 is file name)
-#: src/modules/Snapper.rb:424
+#: src/modules/Snapper.rb:428
msgid "Deleted %1\n"
msgstr "已删除 %1\n"
#. log entry (%1 is file name)
-#: src/modules/Snapper.rb:477
+#: src/modules/Snapper.rb:481
msgid "%1 skipped\n"
msgstr "已跳过 %1\n"
-#~ msgid "Modify Snapshot %{pre} and %{post}"
-#~ msgstr "修订快照 %{pre} 和 %{post}"
+#~ msgid "Modify Snapshots %1 - %2"
+#~ msgstr "修订快照 %1 - %2"
-#~ msgid "Really delete snapshots %{pre} and %{post}?"
-#~ msgstr "真的删除快照 %{pre} 和 %{post} 吗?"
+#~ msgid "Snapshot '%1' was not found."
+#~ msgstr "未找到快照 '%1'。"
-#~ msgid "Failed to get config:\n"
-#~ msgstr "获取配置失败:\n"
+#~ msgid "Reason not known."
+#~ msgstr "原因未知。"
-#~ msgid "Failed to get snapshot mount point:\n"
-#~ msgstr "获取快照挂载点失败:\n"
+#~ msgid "Configuration not found."
+#~ msgstr "未找到配置。"
-#~ msgid "Read list of configurations"
-#~ msgstr "读取配置列表"
+#~ msgid "Configuration is not valid."
+#~ msgstr "配置无效。"
-#~ msgid "Reading list of configurations"
-#~ msgstr "正在读取配置列表"
+#~ msgid ""
+#~ "Failed to initialize snapper library:\n"
+#~ "%1"
+#~ msgstr ""
+#~ "初始化 Snapper 库失败:\n"
+#~ "%1"
-#~ msgid "Reading list of snapshots"
-#~ msgstr "正在读取快照列表"
+#~ msgid "Snapshot was not found."
+#~ msgstr "未找到快照。"
-#~ msgid "Querying snapper configurations failed:"
-#~ msgstr "查询 snapper 配置失败:"
+#~ msgid "Wrong snapshot type given."
+#~ msgstr "给定了错误的快照类型。"
-#~ msgid "Querying snapper snapshots failed:"
-#~ msgstr "查询 snapper 快照失败:"
+#~ msgid "'Pre' snapshot was not given."
+#~ msgstr "未给定前期快照。"
+#~ msgid "Given 'Pre' snapshot was not found."
+#~ msgstr "未找到给定的前期快照。"
+
+#~ msgid "Read the list of snapshots"
+#~ msgstr "读取快照列表"
+
+#~ msgid "Reading the database..."
+#~ msgstr "正在读取数据库..."
+
#~ msgid "File /etc/sysconfig/snapper is not available."
#~ msgstr "文件 /etc/sysconfig/snapper 不可用。"
Modified: trunk/yast/zh_CN/po/storage.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/storage.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/storage.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2016-06-05 23:45+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -151,8 +151,7 @@
"advanced configurations like RAID and encryption.</p>\n"
msgstr ""
"<p>\n"
-"若建议提案不契合您的需要,您可以基于当前显示在磁盘上的分区配置,创建您自己"
-"的\n"
+"若建议提案不契合您的需要,您可以基于当前显示在磁盘上的分区配置,创建您自己的\n"
"要改变分区配置请选择\n"
"<b>%1</b>。\n"
"这也是 RAID 和加密之类高级配置要选择的选项。</p>\n"
@@ -447,8 +446,7 @@
"\n"
"欲安装 Linux,请先引导 Windows 并卸载一些应用程序或删除某些数据以腾出空间。\n"
"\n"
-"Windows 设备上至少需要有 %1 MB 可用空间,包括 Windows 工作空间和 %2 的空"
-"间。\n"
+"Windows 设备上至少需要有 %1 MB 可用空间,包括 Windows 工作空间和 %2 的空间。\n"
#. not yet checked
#. Inform the user that his Windows partition is being checked.
@@ -581,8 +579,7 @@
"由于须重组数据,强烈推荐备份好您的数据。\n"
"在个别情景下,重组可能会失败。\n"
"\n"
-"只有您已在 Windows 下成功运行过了 scandisk 和 defrag 系统应用程序后才可以继"
-"续。\n"
+"只有您已在 Windows 下成功运行过了 scandisk 和 defrag 系统应用程序后才可以继续。\n"
"\n"
"真的收缩您的 Windows 分区吗?\n"
@@ -646,8 +643,7 @@
#. normally the target is located on hard disks. Here no hard disks
#. can be found. YaST2 cannot install. Update CD might have newer drivers.
#: src/clients/inst_target_selection.rb:172
-msgid ""
-"No disks found. Try using the update CD, if available, for installation."
+msgid "No disks found. Try using the update CD, if available, for installation."
msgstr "未找到磁盘。如果有的话,请尝试使用更新 CD 来安装,它或许有新一些磁盘驱动。"
#. There are several hard disks found. Linux is completely installed on
@@ -936,15 +932,14 @@
msgstr ""
"<p>\n"
"您若删除 Windows,此分区上的全部数据都将在安装时<b>不复存在且无法恢复</b>。\n"
-"当收缩 Windows 时,我们<b>强烈推荐备份数据</b>,因为系统必须对数据进行重"
-"组,\n"
+"当收缩 Windows 时,我们<b>强烈推荐备份数据</b>,因为系统必须对数据进行重组,\n"
"这在个别情况下可能失败。\n"
"</p>\n"
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6250
+#: src/modules/StorageProposal.rb:6272
msgid "Propose Separate &Home Partition"
msgstr "创建使用独立主分区的提案(&H)"
@@ -1204,8 +1199,7 @@
"You have not assigned a swap partition. In most cases, we highly recommend \n"
"to create and assign a swap partition.\n"
"Swap partitions on your system are listed in the main window with the\n"
-"type \"Linux Swap\". An assigned swap partition has the mount point \"swap"
-"\".\n"
+"type \"Linux Swap\". An assigned swap partition has the mount point \"swap\".\n"
"You can assign more than one swap partition, if desired.\n"
"\n"
"Really use the setup without swap partition?\n"
@@ -1247,8 +1241,7 @@
#: src/include/partitioning/custom_part_check_generated.rb:534
msgid ""
"If in doubt, better go back and mark this partition for\n"
-"formatting, especially if it is assigned to one of the standard mount "
-"points\n"
+"formatting, especially if it is assigned to one of the standard mount points\n"
"like /, /boot, /opt or /var.\n"
msgstr ""
"若存疑,最好返回上一步并标记格式化此分区,尤其是当它指派为了\n"
@@ -1319,18 +1312,14 @@
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
-msgstr ""
-"无法移除设备 (%1) 因为它是一个逻辑分区并且另一个具有较高编号的逻辑分区正在使"
-"用中。\n"
+msgstr "无法移除设备 (%1) 因为它是一个逻辑分区并且另一个具有较高编号的逻辑分区正在使用中。\n"
#. popup text
#: src/include/partitioning/custom_part_check_generated.rb:790
msgid ""
-"The selected extended partition contains partitions which are currently "
-"mounted:\n"
+"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
-"We *strongly* recommend to unmount these partitions before you delete the "
-"extended partition.\n"
+"We *strongly* recommend to unmount these partitions before you delete the extended partition.\n"
"Choose Cancel unless you know exactly what you are doing.\n"
msgstr ""
"所选扩展分区包含了当前已挂载的分区:\n"
@@ -1384,7 +1373,7 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
#: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6378
+#: src/modules/StorageProposal.rb:6400
msgid "Do not forget what you enter here!"
msgstr "求别忘您在这儿输入的东东!"
@@ -1493,8 +1482,7 @@
"Normally, a file system to mount is identified in /etc/fstab\n"
"by the device name. This identification can be changed so the file system \n"
"to mount is found by searching for a UUID or a volume label. Not all file \n"
-"systems can be mounted by UUID or a volume label. If an option is "
-"disabled, \n"
+"systems can be mounted by UUID or a volume label. If an option is disabled, \n"
"this is not possible.\n"
msgstr ""
"<p><b>挂载到 /etc/fstab 的方式:</b>\n"
@@ -1507,8 +1495,7 @@
#: src/include/partitioning/custom_part_dialogs.rb:479
msgid ""
"<p><b>Volume Label:</b>\n"
-"The name entered in this field is used as the volume label. This usually "
-"makes sense only \n"
+"The name entered in this field is used as the volume label. This usually makes sense only \n"
"when you activate the option for mounting by volume label.\n"
"A volume label cannot contain the / character or spaces.\n"
msgstr ""
@@ -1734,8 +1721,7 @@
msgid ""
"The selected device contains partitions that are currently mounted:\n"
"%1\n"
-"We *strongly* recommended to unmount these partitions before deleting the "
-"partition table.\n"
+"We *strongly* recommended to unmount these partitions before deleting the partition table.\n"
"Choose Cancel unless you know exactly what you are doing.\n"
msgstr ""
"所选设备包含了当前已挂载的分区:\n"
@@ -1815,7 +1801,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6231
+#: src/modules/StorageProposal.rb:6253
msgid "Enable Snapshots"
msgstr "启用快照"
@@ -1887,8 +1873,7 @@
#: src/include/partitioning/ep-dialogs.rb:746
msgid ""
"<p>\n"
-"This mount point corresponds to a temporary filesystem like /tmp or /var/"
-"tmp.\n"
+"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
"If you leave the encryption password empty, the system will create\n"
"a random password at system startup for you. This means, you will lose all\n"
"data on these filesystems at system shutdown.\n"
@@ -1906,8 +1891,7 @@
#: src/include/partitioning/ep-dialogs.rb:761
msgid ""
"<p>\n"
-"If you forget your password, you will lose access to the data on your file "
-"system.\n"
+"If you forget your password, you will lose access to the data on your file system.\n"
"Choose your password carefully. A combination of letters and numbers\n"
"is recommended. To ensure the password was entered correctly,\n"
"enter it twice.\n"
@@ -1926,8 +1910,7 @@
#: src/include/partitioning/ep-dialogs.rb:775
msgid ""
"<p>\n"
-"You must distinguish between uppercase and lowercase. A password should have "
-"at\n"
+"You must distinguish between uppercase and lowercase. A password should have at\n"
"least %1 characters and, as a rule, not contain any special characters\n"
"(e.g., letters with accents or umlauts).\n"
"</p>\n"
@@ -1981,8 +1964,7 @@
#: src/include/partitioning/custom_part_helptexts.rb:159
msgid ""
"<p>\n"
-"If the encrypted file system does not contain any system file and therefore "
-"is\n"
+"If the encrypted file system does not contain any system file and therefore is\n"
"not needed for the update, you may select <b>Skip</b>. In this case, the\n"
"file system is not accessed during update.\n"
"</p>\n"
@@ -2022,8 +2004,7 @@
"警告:您的系统声明它需要一个 EFI 引导设置。\n"
"由于所选磁盘不包含 GPT 磁盘标签,YaST 将在此磁盘上创建一个 GPT 标签。\n"
"\n"
-"您必须标记移除此磁盘上的全部分区即全盘格式化。因为 MBR 和 GPT 分区无法共"
-"存。\n"
+"您必须标记移除此磁盘上的全部分区即全盘格式化。因为 MBR 和 GPT 分区无法共存。\n"
#. error popup text
#: src/include/partitioning/custom_part_lib.rb:51
@@ -2115,8 +2096,7 @@
#. error popup text
#: src/include/partitioning/custom_part_lib.rb:248
-msgid ""
-"Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
+msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
msgstr "挂载点中的字符无效。不要在挂载点中使用 \"`'!\"%#\"。"
#. error popup text
@@ -2672,12 +2652,9 @@
#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
-"volume, select <b>Encrypt Device</b>. Changing the encryption on an "
-"existing\n"
+"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
"volume will delete all data on it.</p>\n"
-msgstr ""
-"<p>如果您想要加密卷上的所有数据,选择 <b>加密设备</b>。修改一个已有卷的加密方"
-"式会删除其中所有数据。</p>\n"
+msgstr "<p>如果您想要加密卷上的所有数据,选择 <b>加密设备</b>。修改一个已有卷的加密方式会删除其中所有数据。</p>\n"
#. helptext
#: src/include/partitioning/ep-dialogs.rb:137
@@ -2774,8 +2751,7 @@
"</p>\n"
msgstr ""
"<p>\n"
-"此卷使用的文件系统为 swap。您可以留空加密密码,但那样 swap 设备就不能用于休"
-"眠 (挂起到磁盘)。\n"
+"此卷使用的文件系统为 swap。您可以留空加密密码,但那样 swap 设备就不能用于休眠 (挂起到磁盘)。\n"
"</p>\n"
#: src/include/partitioning/ep-dialogs.rb:804
@@ -2938,9 +2914,7 @@
"<p>This view shows all Device Mapper devices except for those already \n"
"included in some other view. Therefore multipath disks,\n"
"BIOS RAIDs and LVM logical volumes are not shown here.</p>\n"
-msgstr ""
-"<p>该视图显示了除已经包含在其他视图的所有设备映射器设备。因此多路径磁盘、"
-"BIOS RAID 和 LVM 逻辑卷不在这里显示。</p>\n"
+msgstr "<p>该视图显示了除已经包含在其他视图的所有设备映射器设备。因此多路径磁盘、BIOS RAID 和 LVM 逻辑卷不在这里显示。</p>\n"
#. helptext
#: src/include/partitioning/ep-dm.rb:161
@@ -3172,9 +3146,7 @@
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
-msgstr ""
-"真的要在 %1 上创建新分区表吗?这会删除 %1 上的所有数据和使用 %1 上的分区的所"
-"有 RAID 和卷组。"
+msgstr "真的要在 %1 上创建新分区表吗?这会删除 %1 上的所有数据和使用 %1 上的分区的所有 RAID 和卷组。"
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:137
@@ -3400,9 +3372,7 @@
msgid ""
"<p>This view shows all hard disks including\n"
"iSCSI disks, BIOS RAIDs and multipath disks and their partitions.</p>\n"
-msgstr ""
-"<p>该视图显示包括 iSCCI 磁盘,BIOS RAID 和多路径磁盘在内的所有硬盘和它们的分"
-"区。</p>\n"
+msgstr "<p>该视图显示包括 iSCCI 磁盘,BIOS RAID 和多路径磁盘在内的所有硬盘和它们的分区。</p>\n"
#. push button text (do not translate 'SMART', it is the name of the tool)
#: src/include/partitioning/ep-hd.rb:320
@@ -3463,9 +3433,7 @@
"<p>This view shows all partitions of the selected\n"
"hard disk. If the hard disk is used by e.g. BIOS RAID or multipath, no\n"
"partitions are shown here.</p>\n"
-msgstr ""
-"<p>该视图显示了所选硬盘的所有分区。如果硬盘被例如 BIOS RAID 或多路径使用,则"
-"显示不出分区。</p>\n"
+msgstr "<p>该视图显示了所选硬盘的所有分区。如果硬盘被例如 BIOS RAID 或多路径使用,则显示不出分区。</p>\n"
#. helptext
#: src/include/partitioning/ep-hd.rb:596
@@ -3473,9 +3441,7 @@
"<p>This view shows all devices used by the\n"
"selected hard disk. The view is only available for BIOS RAIDs, partitioned\n"
"software RAIDs and multipath disks.</p>\n"
-msgstr ""
-"<p>该视图显示了所选硬盘使用的全部设备。此视图只适用于 BIOS RAID,已分区的软"
-"件 RAID 和多路径磁盘。</p>\n"
+msgstr "<p>该视图显示了所选硬盘使用的全部设备。此视图只适用于 BIOS RAID,已分区的软件 RAID 和多路径磁盘。</p>\n"
#. tab heading
#: src/include/partitioning/ep-hd.rb:646
@@ -3505,9 +3471,7 @@
"<p>YaST has scanned your hard disks and found one or several existing \n"
"Linux systems with mount points. The old mount points are shown in \n"
"the table.</p>\n"
-msgstr ""
-"<p>YaST 已扫描了您的硬盘,发现了一个或多个带挂载点的已有 Linux 系统。旧挂载点"
-"显示在表格中。</p>\n"
+msgstr "<p>YaST 已扫描了您的硬盘,发现了一个或多个带挂载点的已有 Linux 系统。旧挂载点显示在表格中。</p>\n"
#. help text, richtext format
#: src/include/partitioning/ep-import.rb:305
@@ -3515,9 +3479,7 @@
"<p>You can choose whether the existing system\n"
"volumes, e.g. / and /usr, will be formatted during the\n"
"installation. Non-system volumes, e.g. /home, will not be formatted.</p>"
-msgstr ""
-"<p>您可以选择安装时是否格式化已有系统卷,例如 / 和 /usr。非系统卷,如 /home,"
-"则不会被格式化。</p>"
+msgstr "<p>您可以选择安装时是否格式化已有系统卷,例如 / 和 /usr。非系统卷,如 /home,则不会被格式化。</p>"
#. popup text
#: src/include/partitioning/ep-import.rb:328
@@ -3677,8 +3639,7 @@
#: src/include/partitioning/ep-loop-dialogs.rb:36
msgid ""
"\n"
-"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the "
-"file\n"
+"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the file\n"
"containing the data for the encrypted loop device to set up.</p>\n"
msgstr ""
"\n"
@@ -3969,8 +3930,7 @@
#: src/include/partitioning/ep-lvm-dialogs.rb:491
msgid ""
"<p>Enter the size as well as the number and size\n"
-"of stripes for the new logical volume. The number of stripes cannot be "
-"higher\n"
+"of stripes for the new logical volume. The number of stripes cannot be higher\n"
"than the number of physical volumes of the volume group.</p>"
msgstr "<p>为新逻辑卷输入尺寸、分带数和分带尺寸。分带数不能大于卷组的物理卷数。</p>"
@@ -3984,10 +3944,8 @@
"Volume, the assigned Thin Pool must be able to meet this space requirement.\n"
"Thin Volumes cannot have a Stripe Count."
msgstr ""
-"<p>所谓的<b>瘦卷</b>可以创建为任意卷尺寸。所需的空间是按需从指定的<b>瘦池</b>"
-"中获取的。\n"
-"因此您可以创建比瘦池还大的瘦卷。当然啦,在有真实数据写入到瘦卷时,指定的瘦池"
-"还是必须能够\n"
+"<p>所谓的<b>瘦卷</b>可以创建为任意卷尺寸。所需的空间是按需从指定的<b>瘦池</b>中获取的。\n"
+"因此您可以创建比瘦池还大的瘦卷。当然啦,在有真实数据写入到瘦卷时,指定的瘦池还是必须能够\n"
"满足空间需求。瘦卷无法有分带计数。"
#. heading for frame
@@ -4021,20 +3979,17 @@
#: src/include/partitioning/ep-lvm-dialogs.rb:778
msgid ""
"<p>You can declare the logical volume as a <b>Normal Volume</b>.\n"
-"This is the default and means plain LVM Volumes like all volumes were before "
-"the feature of <b>Thin Provisioning</b> existed.\n"
+"This is the default and means plain LVM Volumes like all volumes were before the feature of <b>Thin Provisioning</b> existed.\n"
"If in doubt this is most probably the right choice</p>"
msgstr ""
"你可以将逻辑卷声明为 <b>正常卷</b>。\n"
-"这是默认选项,表示像 <b>瘦配置</b> 特性存在之前的所有卷一样的普通 LVM 卷。如"
-"果存疑,那这就是最可能对的选项</p>"
+"这是默认选项,表示像 <b>瘦配置</b> 特性存在之前的所有卷一样的普通 LVM 卷。如果存疑,那这就是最可能对的选项</p>"
#. helptext
#: src/include/partitioning/ep-lvm-dialogs.rb:787
msgid ""
"<p>You can declare the logical volume as a <b>Thin Pool</b>.\n"
-"This means <b>Thin Volumes</b> allocate their needed space on demand from "
-"such a pool.</p>"
+"This means <b>Thin Volumes</b> allocate their needed space on demand from such a pool.</p>"
msgstr ""
"您可以将逻辑卷声明为 <b>瘦池</b>。\n"
"这意味着<b>瘦卷</b>将能按需从此池中分配它们所需的空间。</p>"
@@ -4043,8 +3998,7 @@
#: src/include/partitioning/ep-lvm-dialogs.rb:794
msgid ""
"<p>You can declare the logical volume as a <b>Thin Volume</b>.\n"
-"This means the volume allocates needed space on demand from a <b>Thin Pool</"
-"b>.</p>"
+"This means the volume allocates needed space on demand from a <b>Thin Pool</b>.</p>"
msgstr ""
"<p>您可以将逻辑卷声明为 <b>瘦卷</b>。\n"
"这意味着该卷将按需从<b>瘦池</b>中分配所需空间。</p>"
@@ -4101,8 +4055,7 @@
msgid ""
"There are not enough suitable unused devices to create a volume group.\n"
"\n"
-"To use LVM, at least one unused partition of type 0x8e (or 0x83) or one "
-"unused\n"
+"To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused\n"
"RAID device is required. Change your partition table accordingly."
msgstr ""
"没有足够的合适的未使用设备来创建卷组。\n"
@@ -4327,9 +4280,7 @@
#. fallback dialog content
#: src/include/partitioning/ep-nfs.rb:55
-msgid ""
-"NFS configuration is not available. Check yast2-nfs-client package "
-"installation."
+msgid "NFS configuration is not available. Check yast2-nfs-client package installation."
msgstr "网络文件系统配置不可用。请检查是否安装了 yast2-nfs-client 软件包。"
#. heading
@@ -4361,8 +4312,7 @@
#: src/include/partitioning/ep-raid-dialogs.rb:87
msgid ""
"<p><b>RAID 0:</b> This level increases your disk performance.\n"
-"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, "
-"data recovery will not be possible.</p>\n"
+"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, data recovery will not be possible.</p>\n"
msgstr ""
"<p><b>RAID 0</b>:此级别可提高磁盘性能。\n"
"在此方式中<b>没有</b>冗余。如果其中一个驱动器崩溃,将无法恢复数据。</p>\n"
@@ -4371,10 +4321,8 @@
#: src/include/partitioning/ep-raid-dialogs.rb:95
msgid ""
"<p><b>RAID 1:</b> <br>This mode has the best redundancy. It can be\n"
-"used with two or more disks. This mode maintains an exact copy of all data "
-"on all\n"
-"disks. As long as at least one disk is still working, no data is lost. The "
-"partitions\n"
+"used with two or more disks. This mode maintains an exact copy of all data on all\n"
+"disks. As long as at least one disk is still working, no data is lost. The partitions\n"
"used for this type of RAID should have approximately the same size.</p>\n"
msgstr ""
"<p><b>RAID 1:</b> <br>这种方式具有最佳冗余性能。用在\n"
@@ -4386,15 +4334,12 @@
#: src/include/partitioning/ep-raid-dialogs.rb:106
msgid ""
"<p><b>RAID 5:</b> <br>This mode combines management of a larger number\n"
-"of disks and still maintains some redundancy. This mode can be used on three "
-"disks or more.\n"
-"If one disk fails, all data is still intact. If two disks fail "
-"simultaneously, all data is lost</p>\n"
+"of disks and still maintains some redundancy. This mode can be used on three disks or more.\n"
+"If one disk fails, all data is still intact. If two disks fail simultaneously, all data is lost</p>\n"
msgstr ""
"<p><b>RAID 5:</b> <br>这种方式既能管理数量更多的磁盘,\n"
"还能保持一定的冗余程度。这种方式适用于三个或更多磁盘的情况。\n"
-"如果一个磁盘出故障,所有数据仍能完好无损。如果两个磁盘同时出故障,则所有数据"
-"都会丢失。</p>\n"
+"如果一个磁盘出故障,所有数据仍能完好无损。如果两个磁盘同时出故障,则所有数据都会丢失。</p>\n"
#. helptext
#: src/include/partitioning/ep-raid-dialogs.rb:116
@@ -4410,10 +4355,8 @@
#: src/include/partitioning/ep-raid-dialogs.rb:126
msgid ""
"<p>Add partitions to your RAID. According to\n"
-"the RAID type, the usable disk size is the sum of these partitions (RAID0), "
-"the size\n"
-"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</"
-"p>\n"
+"the RAID type, the usable disk size is the sum of these partitions (RAID0), the size\n"
+"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</p>\n"
msgstr ""
"<p>向 RAID 添加分区。根据\n"
"RAID 的类型,可用磁盘尺寸是这些分区尺寸之和 (RAID0)、最小分区的\n"
@@ -4480,10 +4423,8 @@
#: src/include/partitioning/ep-raid-dialogs.rb:338
msgid ""
"<p><b>Chunk Size:</b><br>It is the smallest \"atomic\" mass\n"
-"of data that can be written to the devices. A reasonable chunk size for RAID "
-"5 is 128 kB. For RAID 0,\n"
-"32 kB is a good starting point. For RAID 1, the chunk size does not affect "
-"the array very much.</p>\n"
+"of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128 kB. For RAID 0,\n"
+"32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>\n"
msgstr ""
"<p><b>区块尺寸:</b><br>这是可以写入设备的\n"
"最小\"单位\"数据块。RAID 5 的合理区块尺寸为 128KB。对于 RAID 0,\n"
@@ -4497,8 +4438,7 @@
#: src/include/partitioning/ep-raid-dialogs.rb:353
msgid ""
"The parity algorithm to use with RAID5/6.\n"
-"Left-symmetric is the one that offers maximum performance on typical disks "
-"with rotating platters.\n"
+"Left-symmetric is the one that offers maximum performance on typical disks with rotating platters.\n"
msgstr ""
"RAID5/6 所用的奇偶校验算法。\n"
"对于典型的旋转盘片磁盘来说,左对称能够提供最佳性能。\n"
@@ -4766,11 +4706,9 @@
msgid ""
"<p><b>Default Mount by</b> gives the mount by\n"
"method for newly created file systems. <i>Device Name</i> uses the kernel\n"
-"device name, which is not persistent. <i>Device ID</i> and <i>Device Path</"
-"i>\n"
+"device name, which is not persistent. <i>Device ID</i> and <i>Device Path</i>\n"
"use names generated by udev from hardware information. These should be\n"
-"persistent but unfortunately this is not always true. Finally <i>UUID</i> "
-"and\n"
+"persistent but unfortunately this is not always true. Finally <i>UUID</i> and\n"
"<i>Volume Label</i> use the file systems UUID and label.</p>\n"
msgstr ""
"<p><b>默认挂载方式</b> 给出新创建文件系统的挂载方式。<i>设备名称</i>\n"
@@ -4789,9 +4727,7 @@
#: src/include/partitioning/ep-settings.rb:217
msgid ""
"<p><b>Alignment of Newly Created Partitions</b>\n"
-"determines how created partitions are aligned. <b>cylinder</b> is the "
-"traditional alignment at cylinder boundaries of the disk. <b>optimal</b> "
-"aligns the \n"
+"determines how created partitions are aligned. <b>cylinder</b> is the traditional alignment at cylinder boundaries of the disk. <b>optimal</b> aligns the \n"
"partitions for best performance according to hints provided by the Linux \n"
"kernel or tries to be compatible with Windows Vista and Win 7.</p>\n"
msgstr ""
@@ -5057,24 +4993,19 @@
#: src/modules/DualMultiSelectionBox.rb:316
msgid ""
"<p>This dialog is for defining classes for the raid devices\n"
-"contained in the raid. Available classes are A, B, C, D and E but for many "
-"cases\n"
+"contained in the raid. Available classes are A, B, C, D and E but for many cases\n"
"fewer classes are needed (e.g. only A and B). </p>"
msgstr ""
-"<p>该对话框用来为 RAID 中的 RAID 设备定义分类。可用的分类为 A、B、C、B 和 "
-"E,\n"
+"<p>该对话框用来为 RAID 中的 RAID 设备定义分类。可用的分类为 A、B、C、B 和 E,\n"
"但是大多数情况下只需要很少的分类 (例如,只用 A 和 B)。</p>"
#. dialog help text
#: src/modules/DualMultiSelectionBox.rb:325
msgid ""
"<p>You can put a device into a class by right-clicking on the\n"
-"device and choosing the appropriate class from context menu. By pressing "
-"the \n"
-"Ctrl or Shift key you can select multiple devices and put them into a class "
-"in\n"
-"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put "
-"currently \n"
+"device and choosing the appropriate class from context menu. By pressing the \n"
+"Ctrl or Shift key you can select multiple devices and put them into a class in\n"
+"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put currently \n"
"selected devices into this class.</p>"
msgstr ""
"<p>您可以通过右键点击该设备并从交互菜单中选择合适的分类来给设备归类。\n"
@@ -5100,11 +5031,9 @@
msgid ""
"<b>Interleaved</b> uses first device of class A, then first device of \n"
"class B, then all the following classes with assigned devices. Then the \n"
-"second device of class A, the second device of class B, and so on will "
-"follow."
+"second device of class A, the second device of class B, and so on will follow."
msgstr ""
-"<b>交错</b>使用分类 A 的第一个设备,然后是分类 B 的第一个设备,直到用光所有分"
-"类下的指派设备。\n"
+"<b>交错</b>使用分类 A 的第一个设备,然后是分类 B 的第一个设备,直到用光所有分类下的指派设备。\n"
"然后接着是分类 A 的第二个设备,分类 B 的第二个设备。诸如此类。"
#. dialog help text
@@ -5121,24 +5050,17 @@
#: src/modules/DualMultiSelectionBox.rb:379
msgid ""
"By pressing button \"<b>%1</b>\" you can select a file that contains\n"
-"lines with a regular expression and a class name (e.g. \"sda.* A\"). All "
-"devices that match \n"
-"the regular expression will be put into the class on this line. The regular "
-"expression is \n"
+"lines with a regular expression and a class name (e.g. \"sda.* A\"). All devices that match \n"
+"the regular expression will be put into the class on this line. The regular expression is \n"
"matched against the kernel name (e.g. /dev/sda1), \n"
-"the udev path name (e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-"
-"part1) and the\n"
+"the udev path name (e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-part1) and the\n"
"the udev id (e.g. /dev/disk/by-id/ata-ST3500418AS_9VMN8X8L-part1). \n"
-"The first match finally determines the class if a devices name matches more "
-"then one\n"
+"The first match finally determines the class if a devices name matches more then one\n"
"regular expression.</p>"
msgstr ""
-"通过按键 \"<b>%1</b>\" 您可以选择一个带有正则表达式和类名 (例如 \"sda* A\") "
-"的文件。\n"
-"所有匹配此正则表达式的设备都将被归类为此行中指定的分类名。正则表达式可以匹配"
-"内核名(例如 /dev/sda1),\n"
-"udev 路径名 (例如 /dev/disk/by-path/pci-0000:00:1f:2-scsi-0:0:0:0-part1) 和 "
-"udev id (例如\n"
+"通过按键 \"<b>%1</b>\" 您可以选择一个带有正则表达式和类名 (例如 \"sda* A\") 的文件。\n"
+"所有匹配此正则表达式的设备都将被归类为此行中指定的分类名。正则表达式可以匹配内核名(例如 /dev/sda1),\n"
+"udev 路径名 (例如 /dev/disk/by-path/pci-0000:00:1f:2-scsi-0:0:0:0-part1) 和 udev id (例如\n"
"/dev/disk/by-id/ata-ST3500418AS_9VMN8X8L-part1)。\n"
"如果设备名匹配了多个正则表达式,第一个匹配将最终决定分类名。。</p>"
@@ -5175,8 +5097,7 @@
#: src/modules/FileSystems.rb:297
msgid ""
"<p><b>Tmpfs Size:</b>\n"
-"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or "
-"Gigabyte or\n"
+"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n"
"as a number followed by a percent sign meaning percentage of memory.</p>"
msgstr ""
"<p><b>缓存文件系统尺寸:</b>\n"
@@ -5211,8 +5132,7 @@
#: src/modules/FileSystems.rb:485
msgid ""
"<p><b>Mount Read-Only:</b>\n"
-"Writing to the file system is not possible. Default is false. During "
-"installation\n"
+"Writing to the file system is not possible. Default is false. During installation\n"
"the file system is always mounted read-write.</p>"
msgstr ""
"<p><b>只读挂载:</b>\n"
@@ -5258,10 +5178,8 @@
"<p><b>Do Not Mount at System Start-up:</b>\n"
"The file system is not automatically mounted when the system starts.\n"
"An entry in /etc/fstab is created and the file system is mounted\n"
-"with the appropriate options when the command <tt>mount <mount point></"
-"tt>\n"
-"is entered (<mount point> is the directory to which the file system is "
-"mounted). Default is false.</p>\n"
+"with the appropriate options when the command <tt>mount <mount point></tt>\n"
+"is entered (<mount point> is the directory to which the file system is mounted). Default is false.</p>\n"
msgstr ""
"<p><b>不在系统启动时挂载:</b>\n"
"系统启动时文件系统不会自动挂载。\n"
@@ -5299,10 +5217,8 @@
"<tt>journal</tt> -- All data is committed to the journal prior to being\n"
"written into the main file system. Highest performance impact.<br>\n"
"<tt>ordered</tt> -- All data is forced directly out to the main file system\n"
-"prior to its metadata being committed to the journal. Medium performance "
-"impact.<br>\n"
-"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact."
-"</p>\n"
+"prior to its metadata being committed to the journal. Medium performance impact.<br>\n"
+"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</p>\n"
msgstr ""
"<p><b>数据日志模式:</b>\n"
"指定文件数据的日志模式。\n"
@@ -5346,17 +5262,14 @@
msgstr "任意选项值(&V)"
#: src/modules/FileSystems.rb:647
-msgid ""
-"Invalid characters in arbitrary option value. Do not use spaces or tabs. Try "
-"again."
+msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
msgstr "自由选项值中有无效字符。不要使用空格或 Tab。请重试。"
#. help text, richtext format
#: src/modules/FileSystems.rb:651
msgid ""
"<p><b>Arbitrary Option Value:</b>\n"
-"In this field, type any legal mount option allowed in the fourth field of /"
-"etc/fstab.\n"
+"In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n"
"Multiple options are separated by commas.</p>\n"
msgstr ""
"<p><b>任意选项值</b>:\n"
@@ -5386,8 +5299,7 @@
#: src/modules/FileSystems.rb:706
msgid ""
"<p><b>Codepage for Short FAT Names:</b>\n"
-"This codepage is used for converting to shortname characters on FAT file "
-"systems.</p>\n"
+"This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
msgstr ""
"<p><b>文件配置表短名称的代码页:</b>\n"
"此代码页用于 FAT 文件系统上的短名称字符转换。</p>\n"
@@ -5401,8 +5313,7 @@
#: src/modules/FileSystems.rb:726
msgid ""
"<p><b>Number of FATs:</b>\n"
-"Specify the number of file allocation tables in the file system. The default "
-"is 2.</p>"
+"Specify the number of file allocation tables in the file system. The default is 2.</p>"
msgstr ""
"<p><b>文件配置表数量:</b>\n"
"指定文件系统中的文件配置表的数量。默认值是 2。</p>"
@@ -5416,13 +5327,10 @@
#: src/modules/FileSystems.rb:746
msgid ""
"<p><b>FAT Size:</b>\n"
-"Specifies the type of file allocation tables used (12, 16, or 32-bit). If "
-"auto is specified, YaST will automatically select the value most suitable "
-"for the file system size.</p>\n"
+"Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
msgstr ""
"<p><b>文件配置表尺寸:</b>\n"
-"指定所用文件配置表的类型(12 位、16 位或 32 位)。如果指定自动选项,YaST2 将为"
-"文件系统尺寸自动选择最适合的值。</p>\n"
+"指定所用文件配置表的类型(12 位、16 位或 32 位)。如果指定自动选项,YaST2 将为文件系统尺寸自动选择最适合的值。</p>\n"
#. label text
#: src/modules/FileSystems.rb:755
@@ -5452,8 +5360,7 @@
#: src/modules/FileSystems.rb:787
msgid ""
"<p><b>Hash Function:</b>\n"
-"This specifies the name of the hash function to use to sort the file names "
-"in directories.</p>\n"
+"This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
msgstr ""
"<p><b>哈希函数:</b>\n"
"此选项指定对文件夹中的文件名进行排序所用的哈希函数的名称。</p>\n"
@@ -5467,14 +5374,10 @@
#: src/modules/FileSystems.rb:803
msgid ""
"<p><b>FS Revision:</b>\n"
-"This option defines the reiserfs format revision to use. '3.5' is for "
-"backwards compatibility with kernels of the 2.2.x series. '3.6' is more "
-"recent, but can only be used with kernel versions greater than or equal to "
-"2.4.</p>\n"
+"This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
msgstr ""
"<p><b>文件系统修订版本:</b>\n"
-"此选项定义要使用的 reiserfs 修订版本。\"3.5\"用于向后兼容 2.2.x 系列的内"
-"核。\"3.6\"是最新的,但只能用于 2.4 或更高版本的内核。</p>\n"
+"此选项定义要使用的 reiserfs 修订版本。\"3.5\"用于向后兼容 2.2.x 系列的内核。\"3.6\"是最新的,但只能用于 2.4 或更高版本的内核。</p>\n"
#. label text
#. label text
@@ -5486,13 +5389,10 @@
#: src/modules/FileSystems.rb:823
msgid ""
"<p><b>Block Size:</b>\n"
-"Specify the size of blocks in bytes. Valid block size values are 512, 1024, "
-"2048 and 4096 bytes per block. If auto is selected, the standard block size "
-"of 4096 is used.</p>\n"
+"Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n"
msgstr ""
"<p><b>块尺寸:</b>\n"
-"指定以字节计的块尺寸。有效的块尺寸值为每个块 512、1024、2048 和 4096 字节。如"
-"果选中自动选项,将使用 4096 这个标准块尺寸。</p>\n"
+"指定以字节计的块尺寸。有效的块尺寸值为每个块 512、1024、2048 和 4096 字节。如果选中自动选项,将使用 4096 这个标准块尺寸。</p>\n"
#. label text
#. label text
@@ -5519,12 +5419,10 @@
#: src/modules/FileSystems.rb:875
msgid ""
"<p><b>Percentage of Inode Space:</b>\n"
-"The option \"Percentage of Inode Space\" specifies the maximum percentage of "
-"space in the file system that can be allocated to inodes.</p>\n"
+"The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
msgstr ""
"<p><b>索引节点空间百分比:</b>\n"
-"\"索引节点空间百分比\"选项指定文件系统中可分配给索引节点的最大空间百分比。</"
-"p>\n"
+"\"索引节点空间百分比\"选项指定文件系统中可分配给索引节点的最大空间百分比。</p>\n"
#. label text
#: src/modules/FileSystems.rb:884
@@ -5535,8 +5433,7 @@
#: src/modules/FileSystems.rb:890
msgid ""
"<p><b>Inode Aligned:</b>\n"
-"The option \"Inode Aligned\" is used to specify whether inode allocation is "
-"or\n"
+"The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
"is not aligned. By default inodes are aligned, which\n"
"is usually more efficient than unaligned access.</p>\n"
msgstr ""
@@ -5564,8 +5461,7 @@
#: src/modules/FileSystems.rb:934
msgid ""
"<p><b>Log Size</b>\n"
-"Set the log size (in megabytes). If auto, the default is 40% of the "
-"aggregate size.</p>\n"
+"Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
msgstr ""
"<p><b>日志尺寸</b>\n"
"设置日志尺寸(以 MB 计)。如果选择自动选项,默认值为总尺寸的 40%。</p>\n"
@@ -5606,13 +5502,10 @@
#: src/modules/FileSystems.rb:987
msgid ""
"<p><b>Block Size:</b>\n"
-"Specify the size of blocks in bytes. Valid block size values are 1024, 2048, "
-"and 4096 bytes per block. If auto is selected, the block size is determined "
-"by the file system size and the expected use of the file system.</p>\n"
+"Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
msgstr ""
"<p><b>块尺寸:</b>\n"
-"指定以字节计的块尺寸。有效的块尺寸值为每个块 1024、2048 和 4096 字节。如果选"
-"中自动选项,块尺寸将由文件系统的尺寸和预期使用量来决定。</p>\n"
+"指定以字节计的块尺寸。有效的块尺寸值为每个块 1024、2048 和 4096 字节。如果选中自动选项,块尺寸将由文件系统的尺寸和预期使用量来决定。</p>\n"
#. label text
#: src/modules/FileSystems.rb:996
@@ -5628,15 +5521,12 @@
"bytes-per-inode ratio, the fewer inodes will be created. Generally, this\n"
"value should not be smaller than the block size of the file system, or else\n"
"too many inodes will be created. It is not possible to expand the number of\n"
-"inodes on a file system after its creation. So be sure to enter a "
-"reasonable\n"
+"inodes on a file system after its creation. So be sure to enter a reasonable\n"
"value for this parameter.</p>\n"
msgstr ""
"<p><b>每索引节点的字节数:</b>\n"
-"指定字节与索引节点的比率。YaST2 为磁盘上每 <bytes-per-inode> 个字节的空"
-"间创建一个索引节点。字节/索引节点 之比越大,创建的索引节点越少。\n"
-"通常这个值不应小于文件系统中的块尺寸,因为若比块小的话就会创建太多的索引节"
-"点。 创建文件系统后,将无法扩展其中的索引节点的个数,\n"
+"指定字节与索引节点的比率。YaST2 为磁盘上每 <bytes-per-inode> 个字节的空间创建一个索引节点。字节/索引节点 之比越大,创建的索引节点越少。\n"
+"通常这个值不应小于文件系统中的块尺寸,因为若比块小的话就会创建太多的索引节点。 创建文件系统后,将无法扩展其中的索引节点的个数,\n"
"因此务必为此参数输入一个合理值。</p>\n"
#. label text
@@ -5656,14 +5546,8 @@
#. xgettext: no-c-format
#. help text, richtext format
#: src/modules/FileSystems.rb:1033
-msgid ""
-"<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of "
-"blocks reserved for the super user. The default is computed so that normally "
-"1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved "
-"default is 0.1.</p>"
-msgstr ""
-"<p><b>为 root 保留的块的百分比:</b>指定为超级用户保留的块的百分比。该值默认"
-"会自动计算,通常保留 1G。默认保留的上限是 5.0, 下限是 0.1。</p>"
+msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>"
+msgstr "<p><b>为 root 保留的块的百分比:</b>指定为超级用户保留的块的百分比。该值默认会自动计算,通常保留 1G。默认保留的上限是 5.0, 下限是 0.1。</p>"
#. checkbox text
#: src/modules/FileSystems.rb:1042
@@ -5702,21 +5586,19 @@
#: src/modules/FileSystems.rb:1103
msgid ""
"<p><b>No Journal:</b>\n"
-"Suppressed use of journaling on filesystem. Only activate this when you "
-"really\n"
+"Suppressed use of journaling on filesystem. Only activate this when you really\n"
"know what you are doing.</p>\n"
msgstr ""
"<p><b>禁用日志:</b>\n"
-"不在文件系统中使用日志功能。只有在您真正知道您在做什么的时候才可以激活。</"
-"p>\n"
+"不在文件系统中使用日志功能。只有在您真正知道您在做什么的时候才可以激活。</p>\n"
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:936
+#: src/modules/Partitions.rb:937
msgid "Operation not permitted on disk %{device}.\n"
msgstr "磁盘 %{device} 上不允许该操作。\n"
#. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:941
+#: src/modules/Partitions.rb:942
msgid ""
"\n"
"It's not supported by the partitioning tool parted to change\n"
@@ -5736,7 +5618,7 @@
"添加、缩放,或移除分区操作。\n"
#. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:953
+#: src/modules/Partitions.rb:954
msgid ""
"\n"
"The partitioning on your disk %{device} is either not readable or not \n"
@@ -5756,7 +5638,7 @@
"添加、缩放或移除分区操作。\n"
#. popup text %{device} is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:965
+#: src/modules/Partitions.rb:966
msgid ""
"\n"
"The disk %{device} does not contain a partition table but for\n"
@@ -5774,7 +5656,7 @@
"但您无法在这里缩放或移除那个磁盘中的那个分区。\n"
#. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:982
msgid ""
"\n"
"\n"
@@ -5790,7 +5672,7 @@
"所有数据。\n"
#. popup text
-#: src/modules/Partitions.rb:991
+#: src/modules/Partitions.rb:992
msgid ""
"\n"
"\n"
@@ -5959,8 +5841,7 @@
#. TRANSLATORS: error popup
#: src/modules/Storage.rb:5262
-msgid ""
-"Partitions cannot be created since other partitions on the disk are used."
+msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr "无法创建分区因为磁盘上的其它分区正在使用中。"
#: src/modules/Storage.rb:5288
@@ -6007,8 +5888,7 @@
"the installation.\n"
msgstr ""
"\n"
-"无法移除设备 %1 因为这将间接地修改设备 %2,后者含有激活的 swap,那是运行安装"
-"所需要的。\n"
+"无法移除设备 %1 因为这将间接地修改设备 %2,后者含有激活的 swap,那是运行安装所需要的。\n"
#: src/modules/Storage.rb:5380
msgid ""
@@ -6270,26 +6150,22 @@
#: src/modules/StorageFields.rb:346
msgid ""
"<b>Mount by</b> indicates how the file system\n"
-"is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) "
-"by\n"
+"is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) by\n"
"file system UUID, (ID) by device ID, and (Path) by device path.\n"
msgstr ""
"<b>挂载方式</b>表示文件系统的挂载方式:(Kernel) 通过内核名称、\n"
-" (Label) 通过文件系统标签、(UUID) 通过文件系统 UUID、(ID) 通过设备 ID 和 "
-"(Path) 通过设备路径。\n"
+" (Label) 通过文件系统标签、(UUID) 通过文件系统 UUID、(ID) 通过设备 ID 和 (Path) 通过设备路径。\n"
#. helptext for table column and overview entry
#: src/modules/StorageFields.rb:356
msgid ""
"A question mark (?) indicates that\n"
"the file system is not listed in <tt>/etc/fstab</tt>. It is either mounted\n"
-"manually or by some automount system. When changing settings for this "
-"volume\n"
+"manually or by some automount system. When changing settings for this volume\n"
"YaST will not update <tt>/etc/fstab</tt>.\n"
msgstr ""
"问号 (?) 表示该文件系统未列于 <tt>/etc/fstab</tt> 中。\n"
-"它要么是手动挂载的要么是由某些自动挂载系统挂载的。当改变此卷的设置时,YaST 将"
-"不会更新 <tt>/etc/fstab</tt>。\n"
+"它要么是手动挂载的要么是由某些自动挂载系统挂载的。当改变此卷的设置时,YaST 将不会更新 <tt>/etc/fstab</tt>。\n"
#. helptext for table column and overview entry
#: src/modules/StorageFields.rb:368
@@ -6302,8 +6178,7 @@
#: src/modules/StorageFields.rb:374
msgid ""
"An asterisk (*) after the mount point\n"
-"indicates a file system that is currently not mounted (for example, because "
-"it\n"
+"indicates a file system that is currently not mounted (for example, because it\n"
"has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>)."
msgstr ""
"挂载点后面的星号 (*) 表示此文件系统目前未挂载\n"
@@ -6646,35 +6521,33 @@
"存储子系统被应用程序 “%1” 锁定 (%2)。\n"
"继续前您必须退出该应用程序。"
-#. enable snapshots for root volume if desired
+#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4579 src/modules/StorageProposal.rb:5702
-msgid ""
-"Resize impossible due to inconsistent file system. Try checking file system "
-"under Windows."
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
+msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr "由于文件系统不一致,无法调整尺寸。请试试在 Windows 下检查文件系统。"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6217
+#: src/modules/StorageProposal.rb:6239
msgid "File System for Root Partition"
msgstr "根分区文件系统"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6264
+#: src/modules/StorageProposal.rb:6286
msgid "File System for Home Partition"
msgstr "主分区文件系统"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6282
+#: src/modules/StorageProposal.rb:6304
msgid "Enlarge &Swap for Suspend"
msgstr "增大 &Swap 用于挂起"
-#: src/modules/StorageProposal.rb:6292
+#: src/modules/StorageProposal.rb:6314
msgid "Proposal Settings"
msgstr "提案设置"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6307
+#: src/modules/StorageProposal.rb:6329
msgid ""
"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
@@ -6685,7 +6558,7 @@
"选择 <b>加密的基于 LVM 的提案</b>。</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6315
+#: src/modules/StorageProposal.rb:6337
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"
@@ -6697,47 +6570,45 @@
"这也将增加根分区的大小。</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6324
+#: src/modules/StorageProposal.rb:6346
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 ""
-"<p>该提案可创建一个独立 home 分区。可使用相应复选框选择 home 分区的文件系统。"
-"</p>"
+msgstr "<p>该提案可创建一个独立 home 分区。可使用相应复选框选择 home 分区的文件系统。</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6331
+#: src/modules/StorageProposal.rb:6353
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 "<p>多数时候 swap 分区可分大一些以用于将系统挂起到硬盘。</p>"
-#: src/modules/StorageProposal.rb:6356
+#: src/modules/StorageProposal.rb:6378
msgid "Enter your password for the proposal encryption."
msgstr "请输入您的密码以在提案中应用加密。"
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6363
+#: src/modules/StorageProposal.rb:6385
msgid "Password:"
msgstr "密码:"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6374
+#: src/modules/StorageProposal.rb:6396
msgid "Reenter the password for verification:"
msgstr "请再次确认密码:"
#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6572
+#: src/modules/StorageProposal.rb:6594
msgid "&Partition-based Proposal"
msgstr "基于分区的提案(&P)"
-#: src/modules/StorageProposal.rb:6574
+#: src/modules/StorageProposal.rb:6596
msgid "&LVM-based Proposal"
msgstr "基于 &LVM 的提案"
-#: src/modules/StorageProposal.rb:6576
+#: src/modules/StorageProposal.rb:6598
msgid "&Encrypted LVM-based Proposal"
msgstr "加密的基于 LVM 的提案(&E)"
@@ -6850,16 +6721,13 @@
#~ msgid ""
#~ "You have mounted a partition with Btrfs to the\n"
-#~ "mount point /. This will very likely cause problems. Use a Linux file "
-#~ "system,\n"
-#~ "such as ext3 or ext4, for this mount point or an extra partition for /"
-#~ "boot.\n"
+#~ "mount point /. This will very likely cause problems. Use a Linux file system,\n"
+#~ "such as ext3 or ext4, for this mount point or an extra partition for /boot.\n"
#~ "\n"
#~ "Really use this setup?\n"
#~ msgstr ""
#~ "您试图在挂载点 / 挂载 Btrfs 分区。这很容易造成问题。\n"
-#~ "对于这个挂载点,请使用 Linux 文件系统,如 ext3 或 ext4,或为 /boot 使用额外"
-#~ "的分区。\n"
+#~ "对于这个挂载点,请使用 Linux 文件系统,如 ext3 或 ext4,或为 /boot 使用额外的分区。\n"
#~ "\n"
#~ "真的使用此设置吗?\n"
@@ -6917,12 +6785,9 @@
#~ msgid ""
#~ "<p><b>Mount in /etc/fstab By:</b>\n"
#~ "Normally, a file system to mount is identified in /etc/fstab\n"
-#~ "by the device name. This identification can be changed so the file system "
-#~ "to mount\n"
-#~ "is found by searching for a UUID or a volume label. Not all file systems "
-#~ "can be\n"
-#~ "mounted by UUID or a volume label. If an option is disabled, it is not "
-#~ "possible.\n"
+#~ "by the device name. This identification can be changed so the file system to mount\n"
+#~ "is found by searching for a UUID or a volume label. Not all file systems can be\n"
+#~ "mounted by UUID or a volume label. If an option is disabled, it is not possible.\n"
#~ msgstr ""
#~ "<p><b>挂载 /etc/fstab 的方式:</b>\n"
#~ "通常情况下,在 /etc/fstab\n"
@@ -6957,12 +6822,9 @@
#~ msgid ""
#~ "<p>\n"
-#~ "This mount point corresponds to a temporary filesystem like /tmp or /var/"
-#~ "tmp.\n"
-#~ "You may leave the crypt password empty. If you do this, the system will "
-#~ "create \n"
-#~ "a random password at system startup for you. This means, you will lose "
-#~ "all \n"
+#~ "This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
+#~ "You may leave the crypt password empty. If you do this, the system will create \n"
+#~ "a random password at system startup for you. This means, you will lose all \n"
#~ "data on these filesystems at system shutdown.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -7095,12 +6957,9 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Depending on the size of your hard disk and your processor speed, this "
-#~ "action\n"
-#~ "might take some time. Several minutes are not unusual for really large "
-#~ "disks.\n"
-#~ "Often, the progress meter does not show a linear progress. Even if it "
-#~ "looks\n"
+#~ "Depending on the size of your hard disk and your processor speed, this action\n"
+#~ "might take some time. Several minutes are not unusual for really large disks.\n"
+#~ "Often, the progress meter does not show a linear progress. Even if it looks\n"
#~ "slow near the end (\"95 %\"), please be patient. The formatting tool \n"
#~ "performs various checks. </p>"
#~ msgstr ""
@@ -7550,9 +7409,7 @@
#~ msgid "Create file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"
#~ msgstr "使用 %4$s 将文件 %2$s 的基于文件的设备 %1$s(%3$s) 创建为 %5$s"
-#~ msgid ""
-#~ "Create encrypted file-based device %1$s of file %2$s (%3$s) as %5$s with "
-#~ "%4$s"
+#~ msgid "Create encrypted file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"
#~ msgstr "使用 %4$s 将文件 %2$s 的加密且基于文件的设备 %1$s(%3$s) 创建为 %5$s"
#~ msgid "Create file-based device %1$s of file %2$s (%3$s)"
@@ -7564,8 +7421,7 @@
#~ msgid "Format file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"
#~ msgstr "使用 %4$s 将 %2$s 的基于文件的设备 %1$s(%3$s) 格式化为 %5$s"
-#~ msgid ""
-#~ "Format encrypted file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"
+#~ msgid "Format encrypted file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"
#~ msgstr "使用 %4$s 将 %2$s 加密且基于文件的设备 %1$s(%3$s) 格式化为 %5$s"
#~ msgid "Format file-based device %1$s of %2$s (%3$s) with %4$s"
@@ -7661,8 +7517,7 @@
#, fuzzy
#~| msgid "Create encrypted software RAID %1$s (%2$s) for %4$s with %3$s"
-#~ msgid ""
-#~ "Create encrypted software RAID %1$s (%2$s) from %5$s for %4$s with %3$s"
+#~ msgid "Create encrypted software RAID %1$s (%2$s) from %5$s for %4$s with %3$s"
#~ msgstr "使用 %3$s 创建加密软件 RAID %1$s(%2$s) 以作为 %4$s"
#, fuzzy
@@ -7882,8 +7737,7 @@
#~ msgstr "可用空间 (%1)"
#~ msgid ""
-#~ "Your NTFS file system has %1 %3 free space available. Due to limitations "
-#~ "in\n"
+#~ "Your NTFS file system has %1 %3 free space available. Due to limitations in\n"
#~ "the NTFS resizer, the file system can only be shrunk by up to %2 %3.\n"
#~ "To be able to shrink the file system more, boot your Windows\n"
#~ "system and run a disk defragmentation program under Windows to move\n"
@@ -8194,46 +8048,31 @@
#~ "<p>对于现有分区,您可以更改除了分区起始位置和分区大小\n"
#~ "之外的所有参数。</p>"
-#~ msgid ""
-#~ "<p>First, choose the type of the partition and whether this partition "
-#~ "should be formatted.</p>"
+#~ msgid "<p>First, choose the type of the partition and whether this partition should be formatted.</p>"
#~ msgstr "<p>首先,选择分区的类型以及是否应对此分区进行格式化。</p>"
#~ msgid "<p>Then, enter the mount point ( /, /boot, /usr, /var, etc.)</p>"
#~ msgstr "<p>然后,输入挂载点(/、/boot、/usr、/var 等)。</p>"
-#~ msgid ""
-#~ "<p>To change the start or end cylinder, delete this partition then create "
-#~ "a new one with the new parameters. All data on this partition will be "
-#~ "lost.</p>"
-#~ msgstr ""
-#~ "<p>要更改起始或结束柱面,应删除此分区,然后用新参数创建新分区。该操作将导"
-#~ "致此分区上的所有数据全部丢失。</p>"
+#~ msgid "<p>To change the start or end cylinder, delete this partition then create a new one with the new parameters. All data on this partition will be lost.</p>"
+#~ msgstr "<p>要更改起始或结束柱面,应删除此分区,然后用新参数创建新分区。该操作将导致此分区上的所有数据全部丢失。</p>"
-#~ msgid ""
-#~ "<p>Now, enter the location of the new partition on your hard disk. </p>"
+#~ msgid "<p>Now, enter the location of the new partition on your hard disk. </p>"
#~ msgstr "<p>现在,输入新分区在硬盘上所处的位置。</p>"
#~ msgid "<p>Please enter the starting cylinder number of the partition. </p>"
#~ msgstr "<p>请输入该分区的起始柱面值。</p>"
-#~ msgid ""
-#~ "<p>After that, either specify an ending cylinder number or an offset from "
-#~ "the first cylinder (e.g., +66).</p>"
-#~ msgstr ""
-#~ "<p>然后,可指定结束柱面值或者从起始柱面开始计算的偏移量(如 +66)。</p>"
+#~ msgid "<p>After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66).</p>"
+#~ msgstr "<p>然后,可指定结束柱面值或者从起始柱面开始计算的偏移量(如 +66)。</p>"
-#~ msgid ""
-#~ "<p>It is also possible to specify the size of the partition directly (e."
-#~ "g., +100M or +20000K).</p>"
+#~ msgid "<p>It is also possible to specify the size of the partition directly (e.g., +100M or +20000K).</p>"
#~ msgstr "<p>也可以直接指定分区的大小(如 +100M 或 +20000K)。</p>"
#~ msgid ""
#~ "<p>Enter the starting cylinder number of the partition.\n"
-#~ "After that, either specify an ending cylinder number or an offset from "
-#~ "the first cylinder (e.g., +66).\n"
-#~ "It is also possible to specify the size of the partition directly (e.g., "
-#~ "+2G, +100M, or +20000K).</p>\n"
+#~ "After that, either specify an ending cylinder number or an offset from the first cylinder (e.g., +66).\n"
+#~ "It is also possible to specify the size of the partition directly (e.g., +2G, +100M, or +20000K).</p>\n"
#~ msgstr ""
#~ "<p>输入分区的起始柱面值。\n"
#~ "然后,可指定结束柱面值或者从起始柱面开始计算的偏移量(如 +66)。\n"
@@ -8246,8 +8085,7 @@
#~ "<p>\n"
#~ "This is intended for <b>experts</b>.\n"
#~ "If you are not familiar with the concepts of hard disk <b>partitions</b>\n"
-#~ "and how to use them, you might want to go back and select <b>automatic</"
-#~ "b>\n"
+#~ "and how to use them, you might want to go back and select <b>automatic</b>\n"
#~ "partitioning.\n"
#~ "</p>"
#~ msgstr ""
@@ -8261,8 +8099,7 @@
#~ msgid ""
#~ "<p>\n"
#~ "Please note that <b>nothing will be written to your hard disk</b>\n"
-#~ "until you confirm the entire installation in the last installation "
-#~ "dialog.\n"
+#~ "until you confirm the entire installation in the last installation dialog.\n"
#~ "Until that point, you can safely abort the installation.\n"
#~ "</p>"
#~ msgstr ""
@@ -8298,8 +8135,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "The table to the right shows the current partitions on all your hard "
-#~ "disks.\n"
+#~ "The table to the right shows the current partitions on all your hard disks.\n"
#~ "</p>\n"
#~ msgstr ""
#~ "<p>\n"
@@ -8346,10 +8182,8 @@
#~ msgstr "<p><tt>/dev/sda2 </tt>第 1 个磁盘上的第 2 个主分区。</p>"
#~ msgid ""
-#~ "<p><tt>/dev/sda5 </tt>1st logical partition within the extended partition "
-#~ "on\n"
-#~ "the first disk. <b>Note:</b> this is always #5, even if there are less "
-#~ "than four\n"
+#~ "<p><tt>/dev/sda5 </tt>1st logical partition within the extended partition on\n"
+#~ "the first disk. <b>Note:</b> this is always #5, even if there are less than four\n"
#~ "primary partitions.</p>"
#~ msgstr ""
#~ "<p><tt>/dev/sda5 </tt>第 1 个磁盘上的扩展分区中的第 1 个逻辑分区。\n"
@@ -8361,8 +8195,7 @@
#~ msgid ""
#~ "<p>\n"
#~ "On the i386 platform (i.e., normal PCs), there cannot be more than four\n"
-#~ "<b>primary partitions</b> on any hard disk, because the respective table "
-#~ "in the\n"
+#~ "<b>primary partitions</b> on any hard disk, because the respective table in the\n"
#~ "master boot record cannot contain more than four entries.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -8385,11 +8218,9 @@
#~ msgid ""
#~ "<p>\n"
-#~ "If you have an older PC and want to boot from a partition, make sure it "
-#~ "ends below this\n"
+#~ "If you have an older PC and want to boot from a partition, make sure it ends below this\n"
#~ "1024 cylinder boundary. Create a separate partition and mount it as\n"
-#~ "<b>/boot</b>, if necessary. A partition consisting of one single "
-#~ "cylinder\n"
+#~ "<b>/boot</b>, if necessary. A partition consisting of one single cylinder\n"
#~ "(at least 64 MB) is usually sufficient for that.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -8403,8 +8234,7 @@
#~ msgid ""
#~ "<p>\n"
#~ "One of the four primary partitions may be an <b>extended partition</b>.\n"
-#~ "This extended partition can contain one or more <b>logical partitions</"
-#~ "b>.\n"
+#~ "This extended partition can contain one or more <b>logical partitions</b>.\n"
#~ "</p>"
#~ msgstr ""
#~ "<p>\n"
@@ -8431,8 +8261,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "In connection with advanced boot managers such as <b>GRUB</b>, you can "
-#~ "even\n"
+#~ "In connection with advanced boot managers such as <b>GRUB</b>, you can even\n"
#~ "boot your computer from a logical partition.\n"
#~ "</p>"
#~ msgstr ""
@@ -8445,8 +8274,7 @@
#~ "<p>\n"
#~ "The extended partition will <b>overlap</b> with the logical\n"
#~ "partitions: for an extended partition from cylinder 200 to 500, logical\n"
-#~ "partitions could range from, for example, 200 to 250, 251 to 400, and 401 "
-#~ "to 500.\n"
+#~ "partitions could range from, for example, 200 to 250, 251 to 400, and 401 to 500.\n"
#~ "</p>\n"
#~ msgstr ""
#~ "<p>\n"
@@ -8458,20 +8286,17 @@
#~ msgid ""
#~ "<p>\n"
#~ "An asterisk (*) after the mount point indicates a file system that is\n"
-#~ "currently not mounted (for example, because it has the <tt>noauto</tt> "
-#~ "option set in <tt>/etc/fstab</tt>).\n"
+#~ "currently not mounted (for example, because it has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>).\n"
#~ "</p>\n"
#~ msgstr ""
#~ "<p>\n"
#~ "挂载点后面的星号 (*) 表示此文件系统\n"
-#~ "当前未挂载(例如由于在 <tt>/etc/fstab</tt> 中设置了它的 <tt>noauto</tt> 选"
-#~ "项)。\n"
+#~ "当前未挂载(例如由于在 <tt>/etc/fstab</tt> 中设置了它的 <tt>noauto</tt> 选项)。\n"
#~ " </p>\n"
#~ msgid ""
#~ "<p>\n"
-#~ "The column labeled <b>F</b> contains flags. <tt>C</tt> means the "
-#~ "partition is encrypted. \n"
+#~ "The column labeled <b>F</b> contains flags. <tt>C</tt> means the partition is encrypted. \n"
#~ "<tt>F</tt> means the partition is selected to be formatted.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -8483,8 +8308,7 @@
#, fuzzy
#~ msgid ""
#~ "<p>\n"
-#~ "<b>Used By</b> tells if a device is used by LVM or RAID. If you do not "
-#~ "use such\n"
+#~ "<b>Used By</b> tells if a device is used by LVM or RAID. If you do not use such\n"
#~ "things, it is perfectly normal for this column to be empty.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -8495,8 +8319,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "<b>Mount By</b> indicates how the file system is mounted: (K) by Kernel "
-#~ "Name,\n"
+#~ "<b>Mount By</b> indicates how the file system is mounted: (K) by Kernel Name,\n"
#~ "(L) by Label, (U) by UUID, (I) by Device ID, and (P) by Device Path.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -8516,11 +8339,9 @@
#~ msgid ""
#~ "<p>\n"
-#~ "The table to the right shows the current partitions on all your hard "
-#~ "disks.\n"
+#~ "The table to the right shows the current partitions on all your hard disks.\n"
#~ "<b>Nothing will be written to your hard disk</b>\n"
-#~ "until you confirm the entire installation in the last installation "
-#~ "dialog.\n"
+#~ "until you confirm the entire installation in the last installation dialog.\n"
#~ "Until that point, you can safely abort the installation.</p>"
#~ msgstr ""
#~ "<p>\n"
@@ -8785,8 +8606,7 @@
#~ "<p>\n"
#~ "Logical volumes are\n"
#~ "usable almost everywhere normal <b>disk partitions</b> can be used.\n"
-#~ "You can create file systems on logical volumes and use them, for example, "
-#~ "as swap \n"
+#~ "You can create file systems on logical volumes and use them, for example, as swap \n"
#~ "or as raw partitions for databases.</p>\n"
#~ msgstr ""
#~ "<p>\n"
@@ -8798,8 +8618,7 @@
#~ msgid ""
#~ "<p>\n"
#~ "If there is still unallocated\n"
-#~ "physical storage in a volume group and you use <b>reiserfs</b> as your "
-#~ "file system,\n"
+#~ "physical storage in a volume group and you use <b>reiserfs</b> as your file system,\n"
#~ "extend a logical volume and the underlying file system while it\n"
#~ "is <b>mounted</b> and in <b>use</b>.</p>\n"
#~ msgstr ""
@@ -8813,8 +8632,7 @@
#~ "<p>\n"
#~ "The logical volumes need to be large enough\n"
#~ "to hold all the files to install now, but you do not necessarily need to\n"
-#~ "allocate all your physical storage now. The file systems can be "
-#~ "increased \n"
+#~ "allocate all your physical storage now. The file systems can be increased \n"
#~ "later while your system is in use.\n"
#~ "</p>\n"
#~ msgstr ""
@@ -8825,15 +8643,12 @@
#~ "可随时扩展文件系统。\n"
#~ "</p>\n"
-#~ msgid ""
-#~ "<p><b>Add partitions</b> (called physical volumes) to your volume group.</"
-#~ "p>"
+#~ msgid "<p><b>Add partitions</b> (called physical volumes) to your volume group.</p>"
#~ msgstr "<p>向卷组<b>添加分区</b>(称为物理卷)</p>"
#~ msgid ""
#~ "<p>\n"
-#~ "The volume group forms the <b>storage pool</b> from which your logical "
-#~ "volumes,\n"
+#~ "The volume group forms the <b>storage pool</b> from which your logical volumes,\n"
#~ "like virtual partitions, are allocated.</p>\n"
#~ msgstr ""
#~ "<p>\n"
@@ -8842,8 +8657,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Under normal circumstances, there is no need to have more than one "
-#~ "volume \n"
+#~ "Under normal circumstances, there is no need to have more than one volume \n"
#~ "group. If you need more than one volume group for special reasons,\n"
#~ "create them here. Each volume group must have at least one partition \n"
#~ "that belongs to that volume group.</p>\n"
@@ -8856,8 +8670,7 @@
#~ msgid ""
#~ "<p>\n"
-#~ "Each physical volume belongs <b>to exactly one</b> volume group. Assign "
-#~ "all\n"
+#~ "Each physical volume belongs <b>to exactly one</b> volume group. Assign all\n"
#~ "partitions to use with Linux LVM to volume groups.</p>\n"
#~ msgstr ""
#~ "<p>\n"
Modified: trunk/yast/zh_CN/po/update.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/update.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/update.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2015-10-18 12:10+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n"
@@ -427,7 +427,7 @@
msgstr "这些文件均不存在:%1"
#. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -868,13 +868,13 @@
#. -----------------------------------------------------------------------
#. GLOBAL FUNCTIONS
#. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
msgid "Unknown Product"
msgstr "未知产品"
#. If the current default desktop is not installed, it's a valid use case
#. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
msgid ""
"Cannot select these patterns required for installation:\n"
"%{patterns}"
@@ -882,7 +882,7 @@
"无法选择这些安装所需的软件集:\n"
"%{patterns}"
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
msgid ""
"Cannot select these packages required for installation:\n"
"%{packages}"
Modified: trunk/yast/zh_CN/po/users.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/users.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/users.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2016-06-05 16:44+0800\n"
"Last-Translator: marguerite <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese <opensuse-zh(a)opensuse.org>\n"
@@ -102,9 +102,7 @@
#. translators: command line help text for 'user' option
#: src/clients/groups.rb:218
-msgid ""
-"List of group members, usually usernames, separated by commas. The list of "
-"LDAP user DNs must be separated by colons."
+msgid "List of group members, usually usernames, separated by commas. The list of LDAP user DNs must be separated by colons."
msgstr "组成员(通常是用户名)列表,用逗号隔开。LDAP 用户判别名列表必须用冒号隔开。"
#. translators: command line help text for new_groupname option
@@ -259,8 +257,7 @@
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
"<p>\n"
-"Here, see the table of all allowed attributes for the current LDAP entry "
-"that were not set in previous dialogs.</p>"
+"Here, see the table of all allowed attributes for the current LDAP entry that were not set in previous dialogs.</p>"
msgstr ""
"<p>\n"
"在此可以看到在上一个对话框中未设置的当前 LDAP 项的所有允许属性的表。</p>"
@@ -286,8 +283,7 @@
msgid ""
"<p>\n"
"Edit each attribute using <b>Edit</b>. Some attributes \n"
-"could be required, as defined in the user template in the <b>LDAP Client "
-"Module</b>.</p>\n"
+"could be required, as defined in the user template in the <b>LDAP Client Module</b>.</p>\n"
msgstr ""
"<p>\n"
"使用<b>编辑</b>编辑每个属性。根据在 <b>LDAP 客户机模块</b>中\n"
@@ -310,13 +306,8 @@
#. helptext
#: src/clients/users_plugin_ldap_passwordpolicy.rb:91
-msgid ""
-"<p>Assign a password policy object to this user in <b>DN of Password Policy "
-"object</b>. Activate <b>Reset Password</b> to reset the password of modified "
-"user.</p>"
-msgstr ""
-"<p>在<b>密码策略对象的判别名</b> 中将一个密码策略对象指派给此用户。 激活<b>重"
-"置密码</b>重置已修改用户的密码。</p>"
+msgid "<p>Assign a password policy object to this user in <b>DN of Password Policy object</b>. Activate <b>Reset Password</b> to reset the password of modified user.</p>"
+msgstr "<p>在<b>密码策略对象的判别名</b> 中将一个密码策略对象指派给此用户。 激活<b>重置密码</b>重置已修改用户的密码。</p>"
#. check box label
#: src/clients/users_plugin_ldap_passwordpolicy.rb:107
@@ -418,34 +409,20 @@
#: src/clients/users_plugin_quota.rb:101
msgid ""
"<p>Define a size limit by specifying the number of 1 KB blocks the\n"
-"user may have on this file system. Additionally, you can define an inode "
-"limit specifying the number of inodes the user may have on the file system.</"
-"p>\n"
+"user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.</p>\n"
msgstr ""
"<p>设定大小限制,请指定用户在文件系统中可用的 1 kB 块的个数。\n"
"或者,您也可以设置 inode 限制,指定用户在文件系统可用的 inode 个数。</p>\n"
#. helptext for quota, cont.
#: src/clients/users_plugin_quota.rb:105
-msgid ""
-"<p>You can specify both soft and hard limits for size and number of inodes. "
-"The soft limits define a warning level at which users are informed they are "
-"nearing their limit, whereas the hard limits define the limit at which write "
-"requests are denied.</p>"
-msgstr ""
-"<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别,当快要到"
-"达限制的时候通知用户。而硬限制的限制是,一旦到达,就不能再写入。</p>"
+msgid "<p>You can specify both soft and hard limits for size and number of inodes. The soft limits define a warning level at which users are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>"
+msgstr "<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别,当快要到达限制的时候通知用户。而硬限制的限制是,一旦到达,就不能再写入。</p>"
#. helptext for quota, cont.
#: src/clients/users_plugin_quota.rb:109
-msgid ""
-"<p>As soon as the user has reached the soft limit, the input fields for the "
-"grace interval are activated. Specify the time period for which the user is "
-"allowed to exceed the soft limits set above. The countdown of the grace "
-"interval starts immediately.</p>"
-msgstr ""
-"<p>一旦用户到达了软限制,赦免间隔的输入区域就会被激活。指定允许用户超出软限制"
-"的时间。赦免间隔的倒计时会立刻开始。</p>"
+msgid "<p>As soon as the user has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the user is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately.</p>"
+msgstr "<p>一旦用户到达了软限制,赦免间隔的输入区域就会被激活。指定允许用户超出软限制的时间。赦免间隔的倒计时会立刻开始。</p>"
#. helptext for quota
#: src/clients/users_plugin_quota.rb:115
@@ -456,34 +433,20 @@
#: src/clients/users_plugin_quota.rb:119
msgid ""
"<p>Define a size limit by specifying the number of 1 kB blocks the\n"
-"group may use on this file system. Additionally, you can define an inode "
-"limit specifying the number of inodes the group may use on the file system.</"
-"p>\n"
+"group may use on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may use on the file system.</p>\n"
msgstr ""
"<p>设定大小限制,请指定组在文件系统中可用的 1 kB 块的个数。\n"
"另外,您也可以设置 inode 限制,指定组在文件系统可用的 inode 个数。</p>\n"
#. helptext for quota, cont.
#: src/clients/users_plugin_quota.rb:123
-msgid ""
-"<p>You can specify both soft and hard limits for size and number of inodes. "
-"The soft limits define a warning level at which groups are informed they are "
-"nearing their limit, whereas the hard limits define the limit at which write "
-"requests are denied.</p>"
-msgstr ""
-"<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别,当快要到"
-"达限制的时候通知组。而硬限制的限制是,一旦到达,就不能再写入。</p>"
+msgid "<p>You can specify both soft and hard limits for size and number of inodes. The soft limits define a warning level at which groups are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>"
+msgstr "<p>您可以指定 inodes 的大小和个数的软硬限制。软限制设定一个警告级别,当快要到达限制的时候通知组。而硬限制的限制是,一旦到达,就不能再写入。</p>"
#. helptext for quota, cont.
#: src/clients/users_plugin_quota.rb:127
-msgid ""
-"<p>As soon as the group has reached the soft limit, the input fields for the "
-"grace interval are activated. Specify the time period for which the group is "
-"allowed to exceed the soft limits set above. The countdown of the grace "
-"interval starts immediately.</p>"
-msgstr ""
-"<p>一旦组到达了软限制,赦免间隔的输入区域就会被激活。指定允许组超出软限制的时"
-"间。赦免间隔的倒计时会立刻开始。</p>"
+msgid "<p>As soon as the group has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the group is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately.</p>"
+msgstr "<p>一旦组到达了软限制,赦免间隔的输入区域就会被激活。指定允许组超出软限制的时间。赦免间隔的倒计时会立刻开始。</p>"
#. combo box label
#: src/clients/users_plugin_quota.rb:188
@@ -716,7 +679,7 @@
#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
#: src/include/users/dialogs.rb:2364
#: src/lib/users/dialogs/inst_root_first.rb:193
-#: src/lib/users/dialogs/inst_user_first.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:471
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -731,8 +694,7 @@
"'%1' and '%2'\n"
"were found. Use them for current user?\n"
"\n"
-"This means that data from this image will be used instead of current home "
-"directory."
+"This means that data from this image will be used instead of current home directory."
msgstr ""
"找到加密目录映像 '%1' 和密钥文件 '%2'。以当前用户使用它们吗?\n"
"\n"
@@ -755,7 +717,7 @@
#. text entry
#. text entry
#: src/include/users/dialogs.rb:403
-#: src/lib/users/dialogs/inst_user_first.rb:582
+#: src/lib/users/dialogs/inst_user_first.rb:583
msgid "User's &Full Name"
msgstr "用户的完整名称(&F)"
@@ -777,7 +739,7 @@
#. input field for login name
#. input field for login name
#: src/include/users/dialogs.rb:433
-#: src/lib/users/dialogs/inst_user_first.rb:589
+#: src/lib/users/dialogs/inst_user_first.rb:590
msgid "&Username"
msgstr "用户名(&U)"
@@ -794,7 +756,7 @@
#. checkbox label
#. checkbox label
#: src/include/users/dialogs.rb:470
-#: src/lib/users/dialogs/inst_user_first.rb:613
+#: src/lib/users/dialogs/inst_user_first.rb:614
msgid "U&se this password for system administrator"
msgstr "系统管理员使用此密码(&S)"
@@ -990,7 +952,7 @@
#. User can confirm using "invalid" password confirming all the errors
#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
#: src/lib/users/dialogs/inst_root_first.rb:212
-#: src/lib/users/dialogs/inst_user_first.rb:482
+#: src/lib/users/dialogs/inst_user_first.rb:483
msgid "Really use this password?"
msgstr "确实要使用此密码吗?"
@@ -1106,8 +1068,7 @@
msgid ""
"<p>\n"
"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or "
-"umlauts. \n"
+"lowercase. Passwords should not contain any accented characters or umlauts. \n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -1119,8 +1080,7 @@
#: src/include/users/helps.rb:73
msgid ""
"<p>\n"
-"With the current password encryption (%1), the password length should be "
-"between\n"
+"With the current password encryption (%1), the password length should be between\n"
" %2 and %3 characters.\n"
"</p>"
msgstr ""
@@ -1130,7 +1090,7 @@
"</p>"
#. help text 4/4
-#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:159
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
msgid ""
"<p>\n"
"To ensure that the password was entered correctly,\n"
@@ -1183,8 +1143,7 @@
#: src/include/users/helps.rb:123
msgid ""
"<p><b>Default Login Shell</b><br>\n"
-"The name of the new user's login shell. Select one from the list or enter "
-"your own path to the shell.</P>\n"
+"The name of the new user's login shell. Select one from the list or enter your own path to the shell.</P>\n"
msgstr ""
"<p><b>默认登录壳层</b><br>\n"
"新用户的登录壳层的名称。请从列表中选择一个壳层,或输入自己的壳层路径。</P>\n"
@@ -1193,8 +1152,7 @@
#: src/include/users/helps.rb:127
msgid ""
"<p><b>Default Home</b><br>\n"
-"The initial path prefix for a new user's home directory. The username is "
-"added\n"
+"The initial path prefix for a new user's home directory. The username is added\n"
"to the end of this value to create the default name of the home directory.\n"
"</P>\n"
msgstr ""
@@ -1207,8 +1165,7 @@
#: src/include/users/helps.rb:134
msgid ""
"<p><b>Skeleton Directory</b><br>\n"
-"The contents of this directory are copied to a user's home directory when a "
-"new user is added. </p>\n"
+"The contents of this directory are copied to a user's home directory when a new user is added. </p>\n"
msgstr ""
"<p><b>目录主干</b><br>\n"
"此目录的内容将在添加新用户时被复制到用户的主目录。</p>\n"
@@ -1227,8 +1184,7 @@
#: src/include/users/helps.rb:143
msgid ""
"<p><b>Expiration Date</b><br>\n"
-"The date on which the user account is disabled. The date must be in the "
-"format\n"
+"The date on which the user account is disabled. The date must be in the format\n"
"YYYY-MM-DD. Leave it empty if this account never expires.</P>\n"
msgstr ""
"<p><b>默认失效日期</b><br>\n"
@@ -1311,7 +1267,7 @@
"</p>\n"
#. alternative help text 1/7
-#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:138
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
msgid ""
"<p>\n"
"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
@@ -1329,11 +1285,9 @@
"Create the <b>Username</b> from components of the full name by\n"
"clicking <b>Suggestion</b>. It may be modified, but use only\n"
"letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are "
-"doing.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for "
-"information.\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -1351,11 +1305,9 @@
"<p>\n"
"For the <b>Username</b>, use only\n"
"letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are "
-"doing.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for "
-"information.\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -1368,32 +1320,26 @@
#. these are used only during installation time
#. help text 4/7 (only during installation)
-#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:175
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
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"
+"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"
msgstr ""
"<p>\n"
-"需要使用在此处创建的用户名和密码来登录并使用 Linux 系统。如果启用<b>自动登录"
-"</b>,则会跳过登录过程。该用户会自动登录。</p>\n"
+"需要使用在此处创建的用户名和密码来登录并使用 Linux 系统。如果启用<b>自动登录</b>,则会跳过登录过程。该用户会自动登录。</p>\n"
#. help text 5/7 (only during installation)
#: 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"
+"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
msgstr ""
"<p>\n"
"通过选中<b>接收系统邮件</b>将 root 用户的邮件转发给该用户。</p>\n"
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
-msgid ""
-"<p>Press <b>User Management</b> to add more users or groups to your system.</"
-"p>"
+msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
msgstr "<p>按<b>用户管理</b>向系统添加更多用户或组。</p>"
#. alternative help text 4/7
@@ -1413,8 +1359,7 @@
#: src/include/users/helps.rb:286
msgid ""
"<p>\n"
-"To edit various password settings of this user, such as expiration date, "
-"click <b>Password Settings</b>.</p>\n"
+"To edit various password settings of this user, such as expiration date, click <b>Password Settings</b>.</p>\n"
msgstr ""
"<p>\n"
"要编辑此用户的多个密码设置(例如失效日期),请单击<b>密码设置</b>。</p>\n"
@@ -1482,8 +1427,7 @@
msgid ""
"<p>\n"
"<b>Password:</b>\n"
-"To require users who are not members of the group to identify themselves "
-"when\n"
+"To require users who are not members of the group to identify themselves when\n"
"switching to this group (see the man page of <tt>newgrp</tt>), assign a\n"
"password to this group. For security reasons, this password is not shown\n"
"here. This entry is not required.\n"
@@ -1596,9 +1540,7 @@
#. help text for user's home directory mode
#: src/include/users/helps.rb:430
-msgid ""
-"<p>Optionally, set the <b>Home Directory Permission Mode</b> for this user's "
-"home directory different from the default.</p>"
+msgid "<p>Optionally, set the <b>Home Directory Permission Mode</b> for this user's home directory different from the default.</p>"
msgstr "<p>或者,可以将该用户的主目录的<b>主目录权限模式</b>设置为与默认值不同。</p>"
#. alternate helptext 4.5/8; %1 is directory (e.g. '/etc/skel')
@@ -1614,42 +1556,23 @@
#. help text for Move to new location checkbox
#: src/include/users/helps.rb:452
-msgid ""
-"<p>If changing the location of a user's home directory, move the contents of "
-"the current directory with <b>Move to New Location</b>, activated by "
-"default. Otherwise a new home directory is created without any of the "
-"existing data.</p>"
-msgstr ""
-"<p>如果更改用户主目录的位置,则将默认激活<b>移动到新位置</b>以移动当前目录的"
-"内容。否则,将创建不含任何现有数据的新用户主目录。</p>"
+msgid "<p>If changing the location of a user's home directory, move the contents of the current directory with <b>Move to New Location</b>, activated by default. Otherwise a new home directory is created without any of the existing data.</p>"
+msgstr "<p>如果更改用户主目录的位置,则将默认激活<b>移动到新位置</b>以移动当前目录的内容。否则,将创建不含任何现有数据的新用户主目录。</p>"
#. help text for directory encryption
#: src/include/users/helps.rb:464
msgid ""
"<p>To encrypt the user's home directory, enable <b>Use Encrypted Home\n"
-"Directory</b> and set the directory size. Encrypting a user's home "
-"directory\n"
-"does not provide strong security from other users. If this machine is "
-"shared\n"
+"Directory</b> and set the directory size. Encrypting a user's home directory\n"
+"does not provide strong security from other users. If this machine is shared\n"
"among multiple users, it may be possible for a user to compromise system\n"
-"security by obtaining another user's key and gaining access to the encrypted "
-"data. If strong security is required, the system should not be physically "
-"shared.</p>"
-msgstr ""
-"<p>要对用户主目录进行加密,请启用<b>使用加密的用户主目录</b>并设置目录的大"
-"小。对某个用户主目录加密并不能保护它免遭其它用户的侵入。如果此计算机由多名用"
-"户共享,其中一名用户获取另一个用户的密钥并访问加密的数据,则可能危及系统安"
-"全。如果安全性要求很高,则系统不应物理共享。</p>"
+"security by obtaining another user's key and gaining access to the encrypted data. If strong security is required, the system should not be physically shared.</p>"
+msgstr "<p>要对用户主目录进行加密,请启用<b>使用加密的用户主目录</b>并设置目录的大小。对某个用户主目录加密并不能保护它免遭其它用户的侵入。如果此计算机由多名用户共享,其中一名用户获取另一个用户的密钥并访问加密的数据,则可能危及系统安全。如果安全性要求很高,则系统不应物理共享。</p>"
#. help text for directory encryption
#: src/include/users/helps.rb:476
-msgid ""
-"<p>Home directories cannot be encrypted if a fingerprint reader device is "
-"used. To encrypt the user's home directory, disable fingerprint "
-"configuration first.</p>"
-msgstr ""
-"<p>当使用指纹识别装置的时候,用户主目录不能加密。要加密用户的主目录,请先禁用"
-"指纹配置。</p>"
+msgid "<p>Home directories cannot be encrypted if a fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first.</p>"
+msgstr "<p>当使用指纹识别装置的时候,用户主目录不能加密。要加密用户的主目录,请先禁用指纹配置。</p>"
#. alternate helptext 5/8
#: src/include/users/helps.rb:487
@@ -1742,9 +1665,7 @@
#. helptext for plugin dialog 3/3
#: src/include/users/helps.rb:552
-msgid ""
-"<p>Start the detailed configuration of a particular plug-in by selecting "
-"<b>Launch</b>.</p>"
+msgid "<p>Start the detailed configuration of a particular plug-in by selecting <b>Launch</b>.</p>"
msgstr "<p>通过选择<b>起动</b>启动特定插件的详细配置。</p>"
#. help texts 1/1
@@ -1764,9 +1685,7 @@
"<p>Activate <b>Force Password Change</b> to force the user to change the\n"
"password at the next login. If <b>Last Password Change</b> is set to\n"
"<i>Never</i>, the user will be forced to change the password.</p>"
-msgstr ""
-"<p>激活<b>强制更改密码</b>将让用户在下一次登录的时候修改密码。如果<b>上次密码"
-"更改</b>设为<i>永不</i>,用户将必须更改密码。</p>"
+msgstr "<p>激活<b>强制更改密码</b>将让用户在下一次登录的时候修改密码。如果<b>上次密码更改</b>设为<i>永不</i>,用户将必须更改密码。</p>"
#. Help text 2/6
#: src/include/users/helps.rb:579
@@ -1801,8 +1720,7 @@
#. Help text 4/6
#: src/include/users/helps.rb:595
msgid ""
-"<P><B>Maximum Number of Days for the Same Password</B><BR>Set how many days "
-"a user \n"
+"<P><B>Maximum Number of Days for the Same Password</B><BR>Set how many days a user \n"
"can use the same password before it expires.</P>\n"
msgstr ""
"<P><B>相同密码的最大使用天数</B><BR>设置用户\n"
@@ -1811,12 +1729,10 @@
#. Help text 5/6
#: src/include/users/helps.rb:599
msgid ""
-"<P><B>Minimum Number of Days for the Same Password</B><BR>Set the minimum "
-"age of \n"
+"<P><B>Minimum Number of Days for the Same Password</B><BR>Set the minimum age of \n"
"a password before a user is allowed to change it.</P>\n"
msgstr ""
-"<P><B>相同密码的最小有效天数</B><BR>设置密码的最小有效期,只有在这段时间过"
-"后\n"
+"<P><B>相同密码的最小有效天数</B><BR>设置密码的最小有效期,只有在这段时间过后\n"
"用户才能更改密码。</P>\n"
#. Help text 6/6 : Don't reorder letters YYYY-MM-DD, date must be set in this format
@@ -1850,8 +1766,7 @@
msgid ""
"<p>\n"
"<b>Changing the Values</b><br>\n"
-"You can configure these settings by running appropriate modules. Select the "
-"module with <b>Configure</b>.\n"
+"You can configure these settings by running appropriate modules. Select the module with <b>Configure</b>.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -1861,139 +1776,78 @@
#. help text for Password Policy Dialog
#: src/include/users/ldap_dialogs.rb:62
-msgid ""
-"<p>Select the <b>Password Change Policies</b>, <b>Password Aging Policies</"
-"b>, and <b>Lockout Policies</b> tabs to choose LDAP password policy groups "
-"of attributes to configure.</p>"
-msgstr ""
-"<p>请选择<b>密码更改策略</b>、<b>密码过期策略</b>和<b>锁定策略</b>选项卡,以"
-"选择要配置属性的 LDAP 密码策略组。</p>"
+msgid "<p>Select the <b>Password Change Policies</b>, <b>Password Aging Policies</b>, and <b>Lockout Policies</b> tabs to choose LDAP password policy groups of attributes to configure.</p>"
+msgstr "<p>请选择<b>密码更改策略</b>、<b>密码过期策略</b>和<b>锁定策略</b>选项卡,以选择要配置属性的 LDAP 密码策略组。</p>"
#. help text for pwdInHistory attribute
#: src/include/users/ldap_dialogs.rb:70
-msgid ""
-"<p>Specify the <b>Maximum Number of Passwords Stored in History</b> to set "
-"how many previously used passwords should be saved. Saved passwords may not "
-"be used.</p>"
-msgstr ""
-"<p>请指定<b>历史中储存密码的最大数量</b>,以设置应保存的以前所用密码的数量。"
-"不能使用已保存的密码。</p>"
+msgid "<p>Specify the <b>Maximum Number of Passwords Stored in History</b> to set how many previously used passwords should be saved. Saved passwords may not be used.</p>"
+msgstr "<p>请指定<b>历史中储存密码的最大数量</b>,以设置应保存的以前所用密码的数量。不能使用已保存的密码。</p>"
#. help text for pwdMustChange attribute
#: src/include/users/ldap_dialogs.rb:74
-msgid ""
-"<p>Check <b>User Must Change Password after Reset</b> to force users to "
-"change their passwords after the the password is reset or changed by an "
-"administrator.</p>"
-msgstr ""
-"<p>请选中<b>用户必须在重置后更改密码</b>,以强制用户在管理员重置或更改密码后"
-"更改其密码。</p>"
+msgid "<p>Check <b>User Must Change Password after Reset</b> to force users to change their passwords after the the password is reset or changed by an administrator.</p>"
+msgstr "<p>请选中<b>用户必须在重置后更改密码</b>,以强制用户在管理员重置或更改密码后更改其密码。</p>"
#. help text for pwdAllowUserChange attribute
#: src/include/users/ldap_dialogs.rb:78
-msgid ""
-"<p>Check <b>User Can Change Password</b> to allow users to change their "
-"passwords.</p>"
+msgid "<p>Check <b>User Can Change Password</b> to allow users to change their passwords.</p>"
msgstr "<p>请选中<b>用户可以更改密码</b>,以允许用户更改其密码。</p>"
#. help text for pwdSafeModify attribute
#: src/include/users/ldap_dialogs.rb:82
-msgid ""
-"<p>If the existing password must be provided along with the new password, "
-"check <b>Old Password Required for Password Change</b>.</p>"
-msgstr ""
-"<p>如果提供新密码的同时还必须提供现有密码,则选中<b>更改密码时要求提供旧密码"
-"</b>。</p>"
+msgid "<p>If the existing password must be provided along with the new password, check <b>Old Password Required for Password Change</b>.</p>"
+msgstr "<p>如果提供新密码的同时还必须提供现有密码,则选中<b>更改密码时要求提供旧密码</b>。</p>"
#. help text for pwdCheckQuality attribute
#: src/include/users/ldap_dialogs.rb:86
-msgid ""
-"<p>Select whether the password quality should be verified while passwords "
-"are modified or added. Select <b>No Checking</b> if passwords should not be "
-"checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are "
-"accepted even if the check cannot be performed, for example, if the user has "
-"provided an encrypted password. With <b>Only Accept Checked Passwords</b> "
-"passwords are refused if the quality test fails or the password cannot be "
-"checked.</p>"
-msgstr ""
-"<p>请选择修改或添加密码时是否应校验密码的强度。如果根本不用检查密码,请选择"
-"<b>不检查</b>。如果选择了<b>接受不可检查的密码</b>,则即使无法执行检查(例"
-"如,用户提供的密码是加密的),密码也将被接受。如果选择<b>只接受已检查的密码</"
-"b>,则当密码强度测试失败或无法检查密码时,将拒绝该密码。<p>"
+msgid "<p>Select whether the password quality should be verified while passwords are modified or added. Select <b>No Checking</b> if passwords should not be checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With <b>Only Accept Checked Passwords</b> passwords are refused if the quality test fails or the password cannot be checked.</p>"
+msgstr "<p>请选择修改或添加密码时是否应校验密码的强度。如果根本不用检查密码,请选择<b>不检查</b>。如果选择了<b>接受不可检查的密码</b>,则即使无法执行检查(例如,用户提供的密码是加密的),密码也将被接受。如果选择<b>只接受已检查的密码</b>,则当密码强度测试失败或无法检查密码时,将拒绝该密码。<p>"
#. help text for pwdMinLength attribute
#: src/include/users/ldap_dialogs.rb:90
-msgid ""
-"Set the minimum number of characters that must be used in a password in "
-"<b>Minimum Password Length</b>.</p>"
+msgid "Set the minimum number of characters that must be used in a password in <b>Minimum Password Length</b>.</p>"
msgstr "在<b>最小密码长度</b>中设置密码必须使用的字符的最小数量。</p>"
#. help text for pwdMinAge attribute
#: src/include/users/ldap_dialogs.rb:94
-msgid ""
-"<p><b>Minimum Password Age</b> sets how much time must pass between "
-"modifications to the password.</p>"
+msgid "<p><b>Minimum Password Age</b> sets how much time must pass between modifications to the password.</p>"
msgstr "<p><b>最小密码有效期</b>设置修改密码的最小时间间隔。</p>"
#. help text for pwdMaxAge attribute
#: src/include/users/ldap_dialogs.rb:98
-msgid ""
-"<p><b>Maximum Password Age</b> sets how long after modification a password "
-"expires.</p>"
+msgid "<p><b>Maximum Password Age</b> sets how long after modification a password expires.</p>"
msgstr "<p><b>最大密码有效期</b>用于设置密码在修改后多长时间过期。</p>"
#. help text for pwdExpireWarning attribute
#: src/include/users/ldap_dialogs.rb:102
-msgid ""
-"<p>In <b>Time before Password Expiration to Issue Warning</b> set how long "
-"before a password is due to expire that an expiration warning messages "
-"should be given to an authenticating user.</p>"
-msgstr ""
-"<p><b>提前多长时间发出密码失效警告</b>设置在密码失效前多长时间向认证中的用户"
-"发出失效警告消息。</p>"
+msgid "<p>In <b>Time before Password Expiration to Issue Warning</b> set how long before a password is due to expire that an expiration warning messages should be given to an authenticating user.</p>"
+msgstr "<p><b>提前多长时间发出密码失效警告</b>设置在密码失效前多长时间向认证中的用户发出失效警告消息。</p>"
#. help text for pwdGraceAuthNLimit attribute
#: src/include/users/ldap_dialogs.rb:106
-msgid ""
-"<p>Set the number of times an expired password can be used to authenticate "
-"in <b>Allowed Uses of an Expired Password</b>.</p>"
+msgid "<p>Set the number of times an expired password can be used to authenticate in <b>Allowed Uses of an Expired Password</b>.</p>"
msgstr "<p>在<b>失效密码的允许使用次数</b>中设置允许使用失效密码进行认证的次数。</p>"
#. help text for pwdLockout attribute
#: src/include/users/ldap_dialogs.rb:110
-msgid ""
-"<p>Check <b>Enable Password Locking</b> to forbid use of a password after a "
-"specified number of consecutive failed bind attempts.</p>"
-msgstr ""
-"<p>选中<b>启用密码锁定</b>,以禁止在指定次数的连续联结尝试失败后使用密码。</"
-"p>"
+msgid "<p>Check <b>Enable Password Locking</b> to forbid use of a password after a specified number of consecutive failed bind attempts.</p>"
+msgstr "<p>选中<b>启用密码锁定</b>,以禁止在指定次数的连续联结尝试失败后使用密码。</p>"
#. help text for pwdMaxFailure attribute
#: src/include/users/ldap_dialogs.rb:114
-msgid ""
-"<p>Set the number of consecutive failed bind attempts after which the "
-"password may not be used to authenticate in <b>Bind Failures to Lock the "
-"Password</b>.</p>"
-msgstr ""
-"<p>在<b>锁定密码的联结失败次数</b>中设置在多少次连续联结尝试失败后禁止使用密"
-"码进行认证。</p>"
+msgid "<p>Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in <b>Bind Failures to Lock the Password</b>.</p>"
+msgstr "<p>在<b>锁定密码的联结失败次数</b>中设置在多少次连续联结尝试失败后禁止使用密码进行认证。</p>"
#. help text for pwdLockoutDuration attribute
#: src/include/users/ldap_dialogs.rb:118
-msgid ""
-"<p>Set how long the password cannot be used in <b>Password Lock Duration</b>."
-"</p>"
+msgid "<p>Set how long the password cannot be used in <b>Password Lock Duration</b>.</p>"
msgstr "<p>在<b>密码锁定持续时间</b>中设置无法使用密码的持续时间。</p>"
#. help text for pwdFailureCountInterval attribute
#: src/include/users/ldap_dialogs.rb:122
-msgid ""
-"<p><b>Bind Failures Cache Duration</b> sets how long before password "
-"failures are purged from the failure counter even though no successful "
-"authentication has occurred.</p>"
-msgstr ""
-"<p><b>联结失败缓存持续时间</b>设置从失败计数器清除密码失败次数的时间间隔(即"
-"使未成功认证)。</p>"
+msgid "<p><b>Bind Failures Cache Duration</b> sets how long before password failures are purged from the failure counter even though no successful authentication has occurred.</p>"
+msgstr "<p><b>联结失败缓存持续时间</b>设置从失败计数器清除密码失败次数的时间间隔(即使未成功认证)。</p>"
#. tab label
#: src/include/users/ldap_dialogs.rb:171
@@ -2129,8 +1983,7 @@
#: src/include/users/ldap_dialogs.rb:675
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"
+"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>按<b>配置</b>,可以配置存储在\n"
@@ -2145,12 +1998,9 @@
#. password policy help
#: src/include/users/ldap_dialogs.rb:683
msgid ""
-"<p>Configure the selected password policy with <b>Edit</b>. Use <b>Add</b> "
-"to add a new password policy. The configuration is only possible,\n"
+"<p>Configure the selected password policy with <b>Edit</b>. Use <b>Add</b> to add a new password policy. The configuration is only possible,\n"
" if the password policies are already enabled on the LDAP server.</p>"
-msgstr ""
-"<p>使用<b>编辑</b>配置选中的密码策略。使用<b>添加</b>可添加新的密码策略。仅仅"
-"在 LDAP 服务器上启用密码策略的情况下,配置才会生效。</p>"
+msgstr "<p>使用<b>编辑</b>配置选中的密码策略。使用<b>添加</b>可添加新的密码策略。仅仅在 LDAP 服务器上启用密码策略的情况下,配置才会生效。</p>"
#. checkbox label
#: src/include/users/ldap_dialogs.rb:693
@@ -2235,7 +2085,7 @@
#. the type of user set
#. New user is the default option
-#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:274
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
msgid "Local Users"
msgstr "本地用户"
@@ -2444,8 +2294,7 @@
msgid ""
"<p>\n"
"Choose a password encryption method for local and system users.\n"
-"<b>DES</b>, the Linux default method, works in all network environments, but "
-"it\n"
+"<b>DES</b>, the Linux default method, works in all network environments, but it\n"
"restricts passwords to eight characters or less.\n"
"</p>\n"
msgstr ""
@@ -2470,12 +2319,8 @@
#. Help text for password expert dialog 4/5
#: 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 ""
-"<p><b>SHA-512</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其他算"
-"法。</p>"
+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 "<p><b>SHA-512</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其他算法。</p>"
#. Label
#: src/include/users/widgets.rb:499
@@ -2519,8 +2364,7 @@
#. help text 2/3
#: src/include/users/widgets.rb:586
msgid ""
-"<p>It seems that you are running a NIS server. In some network "
-"environments,\n"
+"<p>It seems that you are running a NIS server. In some network environments,\n"
"you might be unable to log in to a NIS client when a user password is\n"
"encrypted with a method other than DES.\n"
"</p>\n"
@@ -2552,17 +2396,14 @@
#. helptext 2/4
#: src/include/users/widgets.rb:730
-msgid ""
-"<p>Here, extend the search filters for users and groups beyond the default "
-"search filters.</p>"
+msgid "<p>Here, extend the search filters for users and groups beyond the default search filters.</p>"
msgstr "<p>在此将用户和组的搜索过滤器扩展到默认搜索过滤器之外。</p>"
#. helptext 3/4
#: src/include/users/widgets.rb:734
msgid ""
"<p>With <b>Default</b>, load the default filter from the user and group\n"
-"configuration modules saved on the LDAP server (values of 'suseSearchFilter' "
-"attributes).\n"
+"configuration modules saved on the LDAP server (values of 'suseSearchFilter' attributes).\n"
"If you are not connected yet, you are prompted for the password.</p>\n"
msgstr ""
"<p>如果选择<b>默认</b>,将从用户和组配置模块装载默认过滤器,\n"
@@ -2664,8 +2505,7 @@
#: src/include/users/widgets.rb:969
msgid ""
"<p>\n"
-"The features described below are only available if you are using KDM or GDM "
-"as the login manager.\n"
+"The features described below are only available if you are using KDM or GDM as the login manager.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -2676,8 +2516,7 @@
#: src/include/users/widgets.rb:975
msgid ""
"<p><b>Auto Login</b><br>\n"
-"By setting <b>Auto Login</b>, skip the login procedure. The user chosen from "
-"the list is logged in automatically.</p>\n"
+"By setting <b>Auto Login</b>, skip the login procedure. The user chosen from the list is logged in automatically.</p>\n"
msgstr ""
"<p><b>自动登录</b><br>\n"
"通过设置<b>自动登录</b>可跳过登录过程。从列表中选择的用户将自动登录。</p>\n"
@@ -2687,13 +2526,11 @@
msgid ""
"<p><b>Passwordless Logins</b><br>\n"
"If this option is checked, all users are allowed to log in without entering\n"
-"passwords. Otherwise, you are asked for the password even if you set a user "
-"to log in automatically.</p>\n"
+"passwords. Otherwise, you are asked for the password even if you set a user to log in automatically.</p>\n"
msgstr ""
"<p><b>无密码登录</b><br>\n"
"如果选中了此选项,则允许所有用户\n"
-"无须输入密码即可登录。否则,即使设置某个用户自动登录,系统也会要求您提供密"
-"码。</p>\n"
+"无须输入密码即可登录。否则,即使设置某个用户自动登录,系统也会要求您提供密码。</p>\n"
#. dialog label
#: src/include/users/widgets.rb:1004
@@ -2865,8 +2702,7 @@
#: src/include/users/widgets.rb:1518
msgid ""
"<p>\n"
-"Linux is a multiuser system. Several different users can be logged in to "
-"the\n"
+"Linux is a multiuser system. Several different users can be logged in to the\n"
"system at the same time. To avoid confusion, each user must have\n"
"a unique identity. Additionally, every user belongs to at least one group.\n"
"</p>\n"
@@ -2882,13 +2718,11 @@
#: src/include/users/widgets.rb:1535
msgid ""
"<p>\n"
-"Users and groups are arranged in various sets. Change the set currently "
-"shown in the table with <b>Set Filter</b>.\n"
+"Users and groups are arranged in various sets. Change the set currently shown in the table with <b>Set Filter</b>.\n"
"Customize your view with <b>Customize Filter</b>.</p>\n"
msgstr ""
"<p>\n"
-"通过不同的集合对用户和组进行组织。使用<b>集合过滤器</b>更改表中当前显示的集"
-"合。\n"
+"通过不同的集合对用户和组进行组织。使用<b>集合过滤器</b>更改表中当前显示的集合。\n"
"使用<b>自定义过滤器</b>自定义视图。</p>\n"
#. help text 2/3
@@ -2896,8 +2730,7 @@
msgid ""
"<p>\n"
"Click <b>Expert Options</b> to edit various expert settings, such as\n"
-"password encryption type, user authentication method, default values for "
-"new\n"
+"password encryption type, user authentication method, default values for new\n"
"users, or login settings. With <b>Write Changes Now</b>, save\n"
"all changes made so far without exiting the configuration module.</p>\n"
msgstr ""
@@ -2976,8 +2809,7 @@
msgid ""
"\n"
"<p>\n"
-"Use this dialog to get information about existing groups and add or modify "
-"groups.\n"
+"Use this dialog to get information about existing groups and add or modify groups.\n"
"</p>\n"
msgstr ""
"\n"
@@ -3229,12 +3061,8 @@
#. TRANSLATORS: %s is the name of the recommended encryption method
#: src/lib/users/dialogs/encryption_method.rb:41
-msgid ""
-"<p><b>%s</b> is the current standard hash method. Using other algorithms is "
-"not recommended unless needed for compatibility purposes.</p>"
-msgstr ""
-"<p><b>%s</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其它算"
-"法。</p>"
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>%s</b>是当前标准加密方法。除非为了兼容性考虑否则不推荐使用其它算法。</p>"
#. Let's add some vertical space after each widget
#. TRANSLATORS: rich text label
@@ -3287,8 +3115,7 @@
msgid ""
"<p>\n"
"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and "
-"numbers\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
"is recommended. To ensure that the password was entered correctly,\n"
"reenter it in a second field.\n"
"</p>\n"
@@ -3306,8 +3133,7 @@
"<p>\n"
"All the rules for user passwords apply to the \"root\" password:\n"
"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or "
-"umlauts.\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -3343,7 +3169,7 @@
"请重试。"
#. reenable suggestion
-#: src/lib/users/dialogs/inst_user_first.rb:133
+#: src/lib/users/dialogs/inst_user_first.rb:134
msgid ""
"<p>\n"
"Use one of the available options to add local users to the system.\n"
@@ -3355,11 +3181,11 @@
"本地用户存储在 <i>/etc/passwd</i> 和 </i>/etc/shadow</i>。\n"
"</p>\n"
-#: src/lib/users/dialogs/inst_user_first.rb:137
+#: src/lib/users/dialogs/inst_user_first.rb:138
msgid "Create new user"
msgstr "创建新用户"
-#: src/lib/users/dialogs/inst_user_first.rb:141
+#: src/lib/users/dialogs/inst_user_first.rb:142
msgid ""
"<p>\n"
"When entering a password, distinguish between uppercase and\n"
@@ -3372,7 +3198,7 @@
"</p>\n"
#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
-#: src/lib/users/dialogs/inst_user_first.rb:148
+#: src/lib/users/dialogs/inst_user_first.rb:149
msgid ""
"<p>\n"
"The password length should be between %{min}\n"
@@ -3383,16 +3209,13 @@
"密码长度应介于 %{min} 和 %{max} 个字符之间。\n"
"</p>\n"
-#: src/lib/users/dialogs/inst_user_first.rb:164
+#: src/lib/users/dialogs/inst_user_first.rb:165
msgid ""
"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, "
-"and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are "
-"doing.\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for "
-"information.\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
"</p>\n"
msgstr ""
"<p>\n"
@@ -3402,46 +3225,38 @@
"重新定义这些限制。请参阅其手册页了解相关信息。\n"
"</p>\n"
-#: src/lib/users/dialogs/inst_user_first.rb:171
-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>如果要让 root 使用第一个用户的密码,请勾选 <b>系统管理员使用此密码</b>。</"
-"p>"
+#: src/lib/users/dialogs/inst_user_first.rb:172
+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>如果要让 root 使用第一个用户的密码,请勾选 <b>系统管理员使用此密码</b>。</p>"
-#: src/lib/users/dialogs/inst_user_first.rb:182
+#: src/lib/users/dialogs/inst_user_first.rb:183
msgid "Import User Data from a Previous Installation"
msgstr "从以前安装的系统导入用户数据"
-#: src/lib/users/dialogs/inst_user_first.rb:183
+#: src/lib/users/dialogs/inst_user_first.rb:184
msgid ""
"<p>\n"
"A previous Linux installation with local users has been detected.\n"
-"The information there can be used to create users in the system being "
-"installed.\n"
-"Use the <b>Choose Users</b> button to select some users. Their basic "
-"information will\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
"be imported.\n"
"</p>\n"
msgstr ""
"<p>\n"
"检测到了以前安装的 Linux。\n"
"其本地用户信息可用于为正在安装的系统创建用户。\n"
-"使用 <b>选择用户</b> 按钮来选择这些用户。"
-"它们的基本信息将被导入。\n"
+"使用 <b>选择用户</b> 按钮来选择这些用户。它们的基本信息将被导入。\n"
"</p>\n"
-#: src/lib/users/dialogs/inst_user_first.rb:191
+#: src/lib/users/dialogs/inst_user_first.rb:192
msgid "Skip User Creation"
msgstr "跳过创建用户"
-#: src/lib/users/dialogs/inst_user_first.rb:192
+#: src/lib/users/dialogs/inst_user_first.rb:193
msgid ""
"<p>\n"
"Sometimes root is the only needed local user, like in network environments\n"
-"with an authentication server. Select this option to proceed without "
-"creating\n"
+"with an authentication server. Select this option to proceed without creating\n"
"a local user.\n"
"</p>\n"
msgstr ""
@@ -3450,12 +3265,12 @@
"选择此选项来继续而不创建本地用户。\n"
"</p>\n"
-#: src/lib/users/dialogs/inst_user_first.rb:274
+#: src/lib/users/dialogs/inst_user_first.rb:275
msgid "Local User"
msgstr "本地用户"
#. TRANSLATORS: Error popup
-#: src/lib/users/dialogs/inst_user_first.rb:329
+#: src/lib/users/dialogs/inst_user_first.rb:330
msgid ""
"The new username cannot be blank.\n"
"If you don't want to create a user now, select\n"
@@ -3465,7 +3280,7 @@
"若您不想要立即创建用户,请选择'跳过创建用户'。"
#. TRANSLATORS: error popup
-#: src/lib/users/dialogs/inst_user_first.rb:386
+#: src/lib/users/dialogs/inst_user_first.rb:387
msgid ""
"No users from the previous installation were choosen.\n"
"If you don't want to create a user now, select\n"
@@ -3475,34 +3290,34 @@
"若您不想要立即创建用户,请选择'跳过创建用户'。"
#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:513
+#: src/lib/users/dialogs/inst_user_first.rb:514
msgid "&Create New User"
msgstr "创建本地用户(&C)"
#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:536
+#: src/lib/users/dialogs/inst_user_first.rb:537
msgid "&Import User Data from a Previous Installation"
msgstr "从以前安装的系统导入用户数据(&I)"
-#: src/lib/users/dialogs/inst_user_first.rb:546
+#: src/lib/users/dialogs/inst_user_first.rb:547
msgid "Choose Users"
msgstr "选择用户"
#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:562
+#: src/lib/users/dialogs/inst_user_first.rb:563
msgid "&Skip User Creation"
msgstr "跳过创建用户(&S)"
#. checkbox label
-#: src/lib/users/dialogs/inst_user_first.rb:618
+#: src/lib/users/dialogs/inst_user_first.rb:619
msgid "&Automatic Login"
msgstr "自动登录(&A)"
-#: src/lib/users/dialogs/inst_user_first.rb:625
+#: src/lib/users/dialogs/inst_user_first.rb:626
msgid "No users selected"
msgstr "未选择用户"
-#: src/lib/users/dialogs/inst_user_first.rb:627
+#: src/lib/users/dialogs/inst_user_first.rb:628
msgid "%d user will be imported"
msgid_plural "%d users will be imported"
msgstr[0] "将导入 %d 个用户"
@@ -4050,7 +3865,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:716
+#: src/modules/Users.pm:722
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -4069,185 +3884,185 @@
"这些目录不可访问。是否继续用户配置?"
#. error message
-#: src/modules/Users.pm:964
+#: src/modules/Users.pm:970
msgid "Multiple users satisfy the input conditions."
msgstr "有多个用户满足输入条件。"
#. progress caption
-#: src/modules/Users.pm:1542
+#: src/modules/Users.pm:1548
msgid "Initializing User and Group Configuration"
msgstr "初始化用户和组配置"
#. progress stage label
-#: src/modules/Users.pm:1549
+#: src/modules/Users.pm:1555
msgid "Read the default login settings"
msgstr "读取默认登录设置"
#. progress stage label
-#: src/modules/Users.pm:1551
+#: src/modules/Users.pm:1557
msgid "Read the default system settings"
msgstr "读取默认系统设置"
#. progress stage label
-#: src/modules/Users.pm:1553
+#: src/modules/Users.pm:1559
msgid "Read the configuration type"
msgstr "读取配置类型"
#. progress stage label
-#: src/modules/Users.pm:1555
+#: src/modules/Users.pm:1561
msgid "Read the user custom settings"
msgstr "读取用户自定义设置"
#. progress stage label
-#: src/modules/Users.pm:1557
+#: src/modules/Users.pm:1563
msgid "Read users and groups"
msgstr "读取用户和组"
#. progress stage label
-#: src/modules/Users.pm:1559
+#: src/modules/Users.pm:1565
msgid "Build the cache structures"
msgstr "构建缓存结构"
#. progress step label
-#: src/modules/Users.pm:1563
+#: src/modules/Users.pm:1569
msgid "Reading the default login settings..."
msgstr "正在读取默认登录设置..."
#. progress step label
-#: src/modules/Users.pm:1565
+#: src/modules/Users.pm:1571
msgid "Reading the default system settings..."
msgstr "正在读取默认系统设置..."
#. progress step label
-#: src/modules/Users.pm:1567
+#: src/modules/Users.pm:1573
msgid "Reading the configuration type..."
msgstr "正在读取配置类型..."
#. progress step label
-#: src/modules/Users.pm:1569
+#: src/modules/Users.pm:1575
msgid "Reading custom settings..."
msgstr "正在读取自定义设置..."
#. progress step label
-#: src/modules/Users.pm:1571
+#: src/modules/Users.pm:1577
msgid "Reading users and groups..."
msgstr "正在读取用户和组..."
#. progress step label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1579
msgid "Building the cache structures..."
msgstr "正在构建缓存结构..."
#. final progress step label
-#: src/modules/Users.pm:1575 src/modules/Users.pm:4290
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
msgid "Finished"
msgstr "已完成"
#. error message
-#: src/modules/Users.pm:2131
+#: src/modules/Users.pm:2137
msgid "User does not exist."
msgstr "用户不存在。"
#. error message
-#: src/modules/Users.pm:2383
+#: src/modules/Users.pm:2389
msgid "Group does not exist."
msgstr "组不存在。"
#. progress caption
-#: src/modules/Users.pm:4252
+#: src/modules/Users.pm:4258
msgid "Writing User and Group Configuration"
msgstr "写入用户和组配置"
#. progress stage label
-#: src/modules/Users.pm:4261
+#: src/modules/Users.pm:4267
msgid "Write LDAP users and groups"
msgstr "写入 LDAP 用户和组"
#. progress stage label
-#: src/modules/Users.pm:4263
+#: src/modules/Users.pm:4269
msgid "Write groups"
msgstr "写入组"
#. progress stage label
-#: src/modules/Users.pm:4265
+#: src/modules/Users.pm:4271
msgid "Check for deleted users"
msgstr "检查删除的用户"
#. progress stage label
-#: src/modules/Users.pm:4267
+#: src/modules/Users.pm:4273
msgid "Write users"
msgstr "写入用户"
#. progress stage label
-#: src/modules/Users.pm:4269
+#: src/modules/Users.pm:4275
msgid "Write passwords"
msgstr "写入密码"
#. progress stage label
-#: src/modules/Users.pm:4271
+#: src/modules/Users.pm:4277
msgid "Write the custom settings"
msgstr "写入自定义设置"
#. progress stage label
-#: src/modules/Users.pm:4273
+#: src/modules/Users.pm:4279
msgid "Write the default login settings"
msgstr "写入默认登录设置"
#. progress step label
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4282
msgid "Writing LDAP users and groups..."
msgstr "正在写入 LDAP 用户和组..."
#. progress step label
-#: src/modules/Users.pm:4278
+#: src/modules/Users.pm:4284
msgid "Writing groups..."
msgstr "正在写入组..."
#. progress step label
-#: src/modules/Users.pm:4280
+#: src/modules/Users.pm:4286
msgid "Checking deleted users..."
msgstr "正在检查删除的用户..."
#. progress step label
-#: src/modules/Users.pm:4282
+#: src/modules/Users.pm:4288
msgid "Writing users..."
msgstr "正在写入用户..."
#. progress step label
-#: src/modules/Users.pm:4284
+#: src/modules/Users.pm:4290
msgid "Writing passwords..."
msgstr "正在写入密码..."
#. progress step label
-#: src/modules/Users.pm:4286
+#: src/modules/Users.pm:4292
msgid "Writing the custom settings..."
msgstr "正在写入自定义设置..."
#. progress step label
-#: src/modules/Users.pm:4288
+#: src/modules/Users.pm:4294
msgid "Writing the default login settings..."
msgstr "正在写入默认登录设置..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4373
+#: src/modules/Users.pm:4379
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr "未正确读取文件 %s,因此无法写入此文件。"
#. error popup
-#: src/modules/Users.pm:4409 src/modules/Users.pm:4444
-#: src/modules/Users.pm:4720
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
msgid "An error occurred while removing users."
msgstr "在删除用户时出错。"
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4422 src/modules/Users.pm:4570
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr "未正确读取文件 %s,因此无法写入此文件。"
#. error message
-#: src/modules/Users.pm:4559
+#: src/modules/Users.pm:4565
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
@@ -4256,17 +4071,17 @@
"未安装加密支持,无法加密 home 文件夹。"
#. error popup
-#: src/modules/Users.pm:4761 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
msgid "An error occurred while setting forwarding for root's mail."
msgstr "设置 root 用户邮件转发时出错。"
#. error popup
-#: src/modules/Users.pm:4837
+#: src/modules/Users.pm:4843
msgid "No UID is available for this type of user."
msgstr "此类型的用户没有可用的 UID。"
#. error popup
-#: src/modules/Users.pm:4868
+#: src/modules/Users.pm:4874
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4276,7 +4091,7 @@
"请选择 %i 到 %i 之间的有效整数。"
#. popup question
-#: src/modules/Users.pm:4899
+#: src/modules/Users.pm:4905
msgid ""
"The user ID entered is already in use.\n"
"Really use it?"
@@ -4285,7 +4100,7 @@
"是否确实要使用它?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4912
+#: src/modules/Users.pm:4918
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4297,7 +4112,7 @@
"是否确实要使用它?"
#. popup question
-#: src/modules/Users.pm:4927
+#: src/modules/Users.pm:4933
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4309,7 +4124,7 @@
"是否确实要将用户类型更改为\"本地\"?"
#. popup question
-#: src/modules/Users.pm:4941
+#: src/modules/Users.pm:4947
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4320,7 +4135,7 @@
"这是因为该 ID 小于 %i。\n"
"是否确实要将用户类型更改为\"系统\"?"
-#: src/modules/Users.pm:4975
+#: src/modules/Users.pm:4981
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
@@ -4329,7 +4144,7 @@
"已有用户名可能属于 NIS 或 LDAP 用户。\n"
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:4979
+#: src/modules/Users.pm:4985
msgid ""
"There is a conflict between the entered\n"
"username and an existing username. %1\n"
@@ -4340,7 +4155,7 @@
"请尝试使用其它名称。"
#. error popup
-#: src/modules/Users.pm:5009
+#: src/modules/Users.pm:5015
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
@@ -4349,7 +4164,7 @@
"不能包含冒号 (:)。请重试。"
#. error popup
-#: src/modules/Users.pm:5016
+#: src/modules/Users.pm:5022
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4360,7 +4175,7 @@
"请删除多余部分。"
#. error popup
-#: src/modules/Users.pm:5079
+#: src/modules/Users.pm:5085
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4371,7 +4186,7 @@
"请重试。"
#. error popup
-#: src/modules/Users.pm:5102
+#: src/modules/Users.pm:5108
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4381,7 +4196,7 @@
"请为主目录选择另一个路径。"
#. error message
-#: src/modules/Users.pm:5113
+#: src/modules/Users.pm:5119
msgid ""
"The home directory is used by another user.\n"
"Try again."
@@ -4390,7 +4205,7 @@
"请重试。"
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5155
+#: src/modules/Users.pm:5161
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4401,7 +4216,7 @@
"确实要使用该路径吗?"
#. yes/no popup
-#: src/modules/Users.pm:5166
+#: src/modules/Users.pm:5172
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4411,7 +4226,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5173
+#: src/modules/Users.pm:5179
#, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4423,7 +4238,7 @@
"是否使用此目录?\n"
#. yes/no popup
-#: src/modules/Users.pm:5182
+#: src/modules/Users.pm:5188
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4437,7 +4252,7 @@
"是否使用此目录?"
#. popup question
-#: src/modules/Users.pm:5210
+#: src/modules/Users.pm:5216
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
@@ -4446,12 +4261,12 @@
"是否使用该壳层?"
#. error popup
-#: src/modules/Users.pm:5230
+#: src/modules/Users.pm:5236
msgid "No GID is available for this type of group."
msgstr "此类型的组没有可用的 GID。"
#. error popup
-#: src/modules/Users.pm:5263
+#: src/modules/Users.pm:5269
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4461,7 +4276,7 @@
"请选择 %i 到 %i 之间的有效整数。"
#. popup question
-#: src/modules/Users.pm:5293
+#: src/modules/Users.pm:5299
msgid ""
"The group ID entered is already in use.\n"
"Really use it?"
@@ -4470,7 +4285,7 @@
"是否确实要使用它?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5305
+#: src/modules/Users.pm:5311
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4482,7 +4297,7 @@
"是否确实要使用它?"
#. popup question
-#: src/modules/Users.pm:5320
+#: src/modules/Users.pm:5326
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4494,7 +4309,7 @@
"是否确实要将组类型更改为\"本地\"?"
#. popup question
-#: src/modules/Users.pm:5334
+#: src/modules/Users.pm:5340
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4506,7 +4321,7 @@
"是否确实要将组类型更改为\"系统\"?"
#. error popup
-#: src/modules/Users.pm:5353
+#: src/modules/Users.pm:5359
msgid ""
"No group name entered.\n"
"Try again."
@@ -4515,7 +4330,7 @@
"请重试。"
#. error popup
-#: src/modules/Users.pm:5370
+#: src/modules/Users.pm:5376
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4525,7 +4340,7 @@
"请重试。"
#. error popup
-#: src/modules/Users.pm:5383
+#: src/modules/Users.pm:5389
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4538,7 +4353,7 @@
"请重试。"
#. error popup
-#: src/modules/Users.pm:5391
+#: src/modules/Users.pm:5397
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
@@ -4548,13 +4363,13 @@
"组名之间存在冲突。\n"
"请尝试使用其它名称。"
-#: src/modules/Users.pm:5507
+#: src/modules/Users.pm:5513
#, perl-format
msgid "User %s does not exist."
msgstr "用户 %s 不存在。"
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5561
+#: src/modules/Users.pm:5567
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4565,7 +4380,7 @@
"其默认组。"
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5568
+#: src/modules/Users.pm:5574
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4576,22 +4391,22 @@
"请先删除组中的这些用户。"
#. summary label
-#: src/modules/Users.pm:6581
+#: src/modules/Users.pm:6587
msgid "<h3>Users</h3>"
msgstr "<h3>用户</h3>"
#. summary label
-#: src/modules/Users.pm:6591
+#: src/modules/Users.pm:6597
msgid "<h3>Groups</h3>"
msgstr "<h3>组</h3>"
#. summary label
-#: src/modules/Users.pm:6602
+#: src/modules/Users.pm:6608
msgid "<h3>Login Settings</h3>"
msgstr "<h3>登录设置</h3>"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6604
+#: src/modules/Users.pm:6610
msgid "User %1 configured for automatic login"
msgstr "用户 %1 已设为自动登录"
@@ -4755,7 +4570,7 @@
"%2"
#. the ']' is or-ed...
-#. error popup
+#. error popup
#: src/modules/UsersSimple.pm:379
msgid ""
"The password may only contain the following characters:\n"
@@ -4770,8 +4585,7 @@
#: src/modules/UsersSimple.pm:414
msgid ""
"<p>\n"
-"For the password, use only characters that can be found on an English "
-"keyboard\n"
+"For the password, use only characters that can be found on an English keyboard\n"
"layout. In cases of system error, it may be necessary to log in without a\n"
"localized keyboard layout.\n"
"</p>"
@@ -4979,16 +4793,8 @@
#~ "选择对系统中用户使用的身份验证方法。\n"
#~ "</p>"
-#~ msgid ""
-#~ "If you have a previous installation or alternative system, it is possible "
-#~ "to create users based on this source. To do so, select <b>Read User Data "
-#~ "from a Previous Installation</b>. This option uses an existing or creates "
-#~ "a new home directory for each user in the location specified for this "
-#~ "installation."
-#~ msgstr ""
-#~ "如果先前安装了一个系统或有备用系统,则可以基于此源创建用户。要这样做,请选"
-#~ "择<b>请从先前安装读取用户数据</b>。此选项使用现有主目录,或在对此安装指定"
-#~ "的位置为每个用户创建一个新的主目录。"
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "如果先前安装了一个系统或有备用系统,则可以基于此源创建用户。要这样做,请选择<b>请从先前安装读取用户数据</b>。此选项使用现有主目录,或在对此安装指定的位置为每个用户创建一个新的主目录。"
#~ msgid "&LDAP"
#~ msgstr "LDAP(&L)"
@@ -5006,10 +4812,8 @@
#~ msgstr "eDirectory LDAP"
#~ msgid ""
-#~ "<p>If you are using a NIS or LDAP server to store user data or if you "
-#~ "want\n"
-#~ "to authenticate users against an NT server, choose the appropriate value. "
-#~ "Then\n"
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
#~ "press <b>Next</b> to continue with configuration of your client.</p>"
#~ msgstr ""
#~ "<p>如果使用 NIS 服务器或 LDAP 服务器来存储用户数据,或者\n"
@@ -5018,16 +4822,14 @@
#~ msgid ""
#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-#~ "appropriate value. Then press <b>Next</b> to continue with configuration "
-#~ "of your client.</p>"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
#~ msgstr ""
#~ "<p>如果使用 NIS 或 LDAP 服务器来存储用户数据,请选择相应的值。\n"
#~ "然后按<b>下一步</b>继续配置客户机。</p>"
#~ msgid ""
#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
-#~ "authenticate users against an NT server, choose the appropriate value. "
-#~ "Then\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
#~ "press <b>Next</b> to continue with configuration of your client.</p>"
#~ msgstr ""
#~ "<p>如果使用 LDAP 服务器来存储用户数据,或者希望\n"
@@ -5036,18 +4838,13 @@
#~ msgid ""
#~ "<p>If you are using an LDAP server to store user data, choose the\n"
-#~ "appropriate value. Then press <b>Next</b> to continue with configuration "
-#~ "of your client.</p>"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
#~ msgstr ""
#~ "<p>如果使用 LDAP 服务器来存储用户数据,请选择相应的值。\n"
#~ " 然后按<b>下一步</b>继续配置客户机。</p>"
-#~ msgid ""
-#~ "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos "
-#~ "after configuring the user data source.</p>"
-#~ msgstr ""
-#~ "<p>请选中<b>设置 Kerberos 认证</b>以在配置用户数据源之后配置 Kerberos。</"
-#~ "p>"
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>请选中<b>设置 Kerberos 认证</b>以在配置用户数据源之后配置 Kerberos。</p>"
#~ msgid "&Choose"
#~ msgstr "选择(&C)"
@@ -5068,12 +4865,8 @@
#~ "<p>如果要使用此密码来创建证书,\n"
#~ "则此密码的长度必须至少为 %1 个字符。</p>"
-#~ msgid ""
-#~ "<p>To check whether your current keyboard layout is correct, try entering "
-#~ "text into the <b>Test Keyboard Layout</b> field.</p>"
-#~ msgstr ""
-#~ "<p>要检查您现在的键盘布局是否正确,请在<b>测试键盘布局</b>区域输入文字。</"
-#~ "p>"
+#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+#~ msgstr "<p>要检查您现在的键盘布局是否正确,请在<b>测试键盘布局</b>区域输入文字。</p>"
#~ msgid ""
#~ "If you intend to create certificates,\n"
@@ -5150,10 +4943,8 @@
#~ msgstr "eDirectory LDAP(&E)"
#~ msgid ""
-#~ "<p>If you are using a NIS or LDAP server to store user data or if you "
-#~ "want\n"
-#~ "to authenticate users against an NT server, choose the appropriate value."
-#~ "</p>"
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value.</p>"
#~ msgstr ""
#~ "<p>如果使用 NIS 服务器或 LDAP 服务器来存储用户数据,\n"
#~ "或者希望根据 NT 服务器来验证用户,请选择合适的值。</p>"
Modified: trunk/yast/zh_CN/po/vm.zh_CN.po
===================================================================
--- trunk/yast/zh_CN/po/vm.zh_CN.po 2016-09-02 21:45:17 UTC (rev 96726)
+++ trunk/yast/zh_CN/po/vm.zh_CN.po 2016-09-02 21:45:30 UTC (rev 96727)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-06-10 12:17+0800\n"
"Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n"
"Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n"
@@ -32,12 +32,12 @@
msgstr "正在配置虚拟机..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr "x86_64 是唯一支持搭建虚拟机的架构。您的架构是 "
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -47,151 +47,151 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
msgid "Verify Installed Packages"
msgstr "校验已安装的软件包"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
msgid "Network Bridge Configuration"
msgstr "网桥配置"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
msgid "Configuring the VM Server (domain 0)"
msgstr "正在配置虚拟机服务器 (域 0)"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr "<p><big><b>虚拟机服务器配置</b></big></p><p>虚拟机服务器 (域 0) 的配置有两部分。</p>"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr "<p>首先将安装必需的软件包,然后将把引导加载器切换为 GRUB (若尚未使用) 并把 Xen 启动项添加到引导菜单(若菜单中尚无)。</p>"
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr "<p>需要 GRUB 是因为它支持引导 Xen 和 Linux 内核所需的多重引导标准。</p>"
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr "<p>配置成功后,您就可以从引导加载器菜单来启动虚拟机服务器了。</p>"
#. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
msgid "The installation will be aborted."
msgstr "安装将中止。"
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
msgid "Choose Hypervisor(s) to install"
msgstr "选择要安装的虚拟机管理程序"
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
msgid "Server: Minimal system to get a running Hypervisor"
msgstr "服务器:运行虚拟机管理程序的最小化系统"
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "工具:配置、管理和监视虚拟机"
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
msgid "KVM Hypervisor"
msgstr "KVM 管理程序"
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
msgid "KVM server"
msgstr "KVM 服务器"
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
msgid "KVM tools"
msgstr "KVM 工具"
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
msgid "libvirt LXC containers"
msgstr "libvirt LXC 容器"
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
msgid "libvirt LXC daemon"
msgstr "libvirt LXC 守护进程"
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
msgid "Software to connect to Virtualization server"
msgstr "连接虚拟化服务器的软件"
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
msgid "Virtualization client tools"
msgstr "虚拟化客户端工具"
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
msgid "Xen Hypervisor"
msgstr "Xen 管理程序"
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
msgid "Xen server"
msgstr "Xen 服务器"
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
msgid "Xen tools"
msgstr "Xen 工具"
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
msgid "Package installation failed\n"
msgstr "软件包安装失败\n"
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
msgid "Package installation failed for lxc\n"
msgstr "lxc 的软件包安装失败\n"
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
msgid "Package installation failed for sled client pattern\n"
msgstr "SLED 客户端软件集的软件包安装失败\n"
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
msgid "Package installation failed for sles patterns\n"
msgstr "SLES 软件集的软件包安装失败\n"
#. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
msgid "Running in text mode. Install graphical components anyway?"
msgstr "正以文本模式运行。强行安装图形部件吗?"
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
msgid "Checking packages..."
msgstr "正在检查软件包..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
msgid "Installing packages..."
msgstr "正在安装软件包..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
msgid "Cannot install required packages."
msgstr "无法安装必需的软件包。"
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
msgid "Updating grub2 configuration files..."
msgstr "正在更新 grub2 配置文件..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
msgid "Configuring Default Network Bridge..."
msgstr "正在配置默认网桥..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
msgid "Network Bridge."
msgstr "网桥。"
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr "<p>要搭建正常的虚拟机网络配置,推荐使用网桥。</p><p>配置一个默认网桥吗?</p>"
@@ -204,27 +204,27 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr "KVM 部件已安装。您的宿主机已准备好安装 KVM 访客机了。"
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
msgstr "KVM 部件已安装。请重新引导计算机并在引导加载器菜单中选择原生内核来安装 KVM 访客机。"
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
msgstr "要安装 Xen 客户机,需重启计算机并在引导加载器菜单中选择 Xen 启动项。"
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
msgid "Xen Hypervisor and tools are installed."
msgstr "Xen 管理程序和工具已安装。"
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
msgid "Virtualization client tools are installed."
msgstr "已安装虚拟化客户端工具。"
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
msgid "Libvirt LXC components are installed."
msgstr "已安装 Libvirt LXC 部件。"
1
0
02 Sep '16
Author: minton
Date: 2016-09-02 23:45:17 +0200 (Fri, 02 Sep 2016)
New Revision: 96726
Added:
trunk/yast/xh/po/journalctl.xh.po
Modified:
trunk/yast/xh/po/add-on.xh.po
trunk/yast/xh/po/auth-client.xh.po
trunk/yast/xh/po/auth-server.xh.po
trunk/yast/xh/po/autoinst.xh.po
trunk/yast/xh/po/base.xh.po
trunk/yast/xh/po/bootloader.xh.po
trunk/yast/xh/po/ca-management.xh.po
trunk/yast/xh/po/cio.xh.po
trunk/yast/xh/po/cluster.xh.po
trunk/yast/xh/po/control.xh.po
trunk/yast/xh/po/country.xh.po
trunk/yast/xh/po/crowbar.xh.po
trunk/yast/xh/po/dhcp-server.xh.po
trunk/yast/xh/po/dns-server.xh.po
trunk/yast/xh/po/docker.xh.po
trunk/yast/xh/po/drbd.xh.po
trunk/yast/xh/po/fcoe-client.xh.po
trunk/yast/xh/po/firewall.xh.po
trunk/yast/xh/po/firstboot.xh.po
trunk/yast/xh/po/fonts.xh.po
trunk/yast/xh/po/geo-cluster.xh.po
trunk/yast/xh/po/installation.xh.po
trunk/yast/xh/po/iscsi-client.xh.po
trunk/yast/xh/po/iscsi-lio-server.xh.po
trunk/yast/xh/po/kdump.xh.po
trunk/yast/xh/po/live-installer.xh.po
trunk/yast/xh/po/mail.xh.po
trunk/yast/xh/po/network.xh.po
trunk/yast/xh/po/nfs.xh.po
trunk/yast/xh/po/nis.xh.po
trunk/yast/xh/po/ntp-client.xh.po
trunk/yast/xh/po/packager.xh.po
trunk/yast/xh/po/pkg-bindings.xh.po
trunk/yast/xh/po/printer.xh.po
trunk/yast/xh/po/rdp.xh.po
trunk/yast/xh/po/rear.xh.po
trunk/yast/xh/po/registration.xh.po
trunk/yast/xh/po/reipl.xh.po
trunk/yast/xh/po/samba-client.xh.po
trunk/yast/xh/po/samba-server.xh.po
trunk/yast/xh/po/security.xh.po
trunk/yast/xh/po/services-manager.xh.po
trunk/yast/xh/po/snapper.xh.po
trunk/yast/xh/po/storage.xh.po
trunk/yast/xh/po/update.xh.po
trunk/yast/xh/po/users.xh.po
trunk/yast/xh/po/vm.xh.po
trunk/yast/xh/po/vpn.xh.po
Log:
xh merged
Modified: trunk/yast/xh/po/add-on.xh.po
===================================================================
--- trunk/yast/xh/po/add-on.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/add-on.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -67,15 +67,16 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li> Izilondolozi: %1, Indlela yothungelwano: %2, Imveliso: %3</li>\n"
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr ""
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
msgid "Failed to add add-on product."
msgstr "Isilele ukufakela imveliso efakelwayo"
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr ""
-
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
#. placeholder for unknown directory
Modified: trunk/yast/xh/po/auth-client.xh.po
===================================================================
--- trunk/yast/xh/po/auth-client.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/auth-client.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,1160 +16,1770 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
msgstr ""
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
msgstr ""
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+#, fuzzy
+#| msgid "Name"
+msgid "User Name"
+msgstr "Igama"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr ""
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr ""
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr ""
+
+#. Add an auth_to_local_names
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
+msgstr ""
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter realm name."
+msgstr "Ngenisa igama lenkangeleko yecala entsha."
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication via Kerberos"
+msgstr "&Imo Yongqinelwano Ngobunyani"
+
+#. LDAP tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:76
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:84
+msgid ""
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:92
+msgid ""
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:100
+msgid ""
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:108
+msgid ""
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:163
+msgid ""
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:176
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Are you sure to delete realm %s?"
+msgstr "Ingaba uyafuna ngenene ukusicima isahlulelo %1?"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Automatically Create Home Directory"
+msgstr "Dala Uvimba Weefayili Zasekhaya xa Ungena"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "All Authentication Realms"
+msgstr "&Imo Yongqinelwano Ngobunyani"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Realm"
+msgstr "Cima "
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+msgid "Change Settings"
+msgstr ""
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "User Logon Configuration"
+msgstr "Ubumbeko Lwehlabathi"
+
+#: src/lib/authui/main_dialog.rb:68
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "LDAP/Kerberos Configuration"
+msgstr "Ubumbeko Lwehlabathi"
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr "Igama"
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr "Ixabiso"
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+#, fuzzy
+#| msgid "Network Service"
+msgid "Network Domain"
+msgstr "Inkonzo yeNethwekhi"
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+msgid "Identity Domains"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr "Inkcazelo"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name filter:"
+msgstr "Isihluzi:"
+
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
#, fuzzy
#| msgid "None"
msgid "None."
msgstr "Akukho"
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
#, fuzzy
#| msgid "Modem Parameters"
msgid "Mandatory Parameters"
msgstr "Imida Yenkcazelo ngee-Modem"
-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
#, fuzzy
#| msgid "Optional Parameter File"
msgid "Optional Parameters"
msgstr "Ifayili Yomda Ekhethwa Ngokuzithandela"
#. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
msgid "Please complete all of the following mandatory parameters:\n"
msgstr ""
-#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
#, fuzzy
-#| msgid "Authentication Method"
-msgid "Authentication Client Configuration"
-msgstr "Indlela Yongqinelwano Ngobunyani"
-
-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
+#| msgid "Global Configuration"
+msgid "Global Options"
msgstr "Ubumbeko Lwehlabathi"
-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
+#: src/lib/authui/sssd/main_dialog.rb:40
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name switch"
+msgstr "Isihluzi:"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication"
+msgstr "&Imo Yongqinelwano Ngobunyani"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
+#. Render overview and edit buttons on left side, config editor on right side.
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:77
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Create Home Directory"
msgstr "Dala Uvimba Weefayili Zasekhaya xa Ungena"
-#: src/lib/yauthclient/main_dialog.rb:68
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
#, fuzzy
-#| msgid "Enable the NTP daemon"
-msgid "Enable SSSD daemon"
-msgstr "Nika isakhono kwi-daemon ye-NTP"
+#| msgid "Domain"
+msgid "Join Domain"
+msgstr "Ummandla"
-#: src/lib/yauthclient/main_dialog.rb:73
+#: src/lib/authui/sssd/main_dialog.rb:92
#, fuzzy
+#| msgid "Domain"
+msgid "Leave Domain"
+msgstr "Ummandla"
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+#, fuzzy
#| msgid "Selections"
-msgid "Sections"
+msgid "Service Options"
msgstr "Izinto ezikhethwayo"
-#: src/lib/yauthclient/main_dialog.rb:76
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
#, fuzzy
-#| msgid "Network Service"
-msgid "New Service/Domain"
-msgstr "Inkonzo yeNethwekhi"
+#| msgid "Domain"
+msgid "Domain Options"
+msgstr "Ummandla"
-#: src/lib/yauthclient/main_dialog.rb:77
-#, fuzzy
-#| msgid "Create Service"
-msgid "Delete Service/Domain"
-msgstr "Yenza iNkonzo"
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
#. TRANSLATORS: Label of the area used to customise parameters.
#. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
-msgid "Customisation - %s"
+#: src/lib/authui/sssd/main_dialog.rb:172
+msgid "Options - %s"
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
-msgstr "Igama"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
-msgstr "Ixabiso"
+#: src/lib/authui/sssd/main_dialog.rb:220
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Do you really wish to erase configuration for domain %s?"
+msgstr "Ingaba uyafuna ngenene ukusicima isahlulelo %1?"
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
-msgstr "Inkcazelo"
+#. Enable/disable SSSD daemon
+#: src/lib/authui/sssd/main_dialog.rb:252
+msgid ""
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. For the currently selected config section, render list of additional parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-#, fuzzy
-#| msgid "Modem Parameters"
-msgid "More Parameters"
-msgstr "Imida Yenkcazelo ngee-Modem"
+#. Enable/disable NSS password database
+#: src/lib/authui/sssd/main_dialog.rb:284
+msgid ""
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:140
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name filter:"
-msgstr "Isihluzi:"
+#. Enable/disable NSS group database
+#: src/lib/authui/sssd/main_dialog.rb:302
+msgid ""
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
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"
-"Do you want to continue?"
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"Sudo data source has been globally enabled.\n"
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
msgstr ""
-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-#, fuzzy
-#| msgid "Really delete section %1?"
-msgid "You may not delete section SSSD."
-msgstr "Uyayicima ngenene i-`%1`?"
+#. Enable/disable NSS automount database
+#: src/lib/authui/sssd/main_dialog.rb:342
+msgid ""
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
+msgstr ""
-#: src/lib/yauthclient/main_dialog.rb:225
-#, fuzzy
-#| msgid "Do you really want to delete partition %1?"
-msgid "Do you really wish to delete section %s?"
-msgstr "Ingaba uyafuna ngenene ukusicima isahlulelo %1?"
+#: src/lib/authui/sssd/main_dialog.rb:350
+msgid ""
+"Automount data source has been globally enabled.\n"
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
+msgstr ""
+#. Enable/disable PAC responder
+#: src/lib/authui/sssd/main_dialog.rb:374
+msgid ""
+"MS-PAC data source has been globally enabled.\n"
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
+msgstr ""
+
#. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
#, fuzzy
#| msgid "Modem Parameter Details"
msgid "Confirm parameter removal: "
msgstr "Iinkcukacha zoMda we-Modem"
-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to continue?"
+"Do you still wish to remove the parameter?"
msgstr ""
#. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
+#: src/lib/authui/sssd/main_dialog.rb:434
#, fuzzy
#| msgid "Logging enabled"
-msgid "No domain enabled"
+msgid "No domain"
msgstr "Ukungena kunikwe isakhono"
-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
msgid ""
-"No domain has been enabled in [sssd] \"domains\" parameter.\n"
-"SSSD will not start, and only local authentication will be available.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
+"SSSD will fail to start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
msgstr ""
-#. Render input box and dropdowns for service/domain creation
-#: src/lib/yauthclient/new_section_dialog.rb:49
-#, fuzzy
-#| msgid "Would you like to open this profile in editing mode?"
-msgid "Would you like to enable another service or join a domain?"
-msgstr "Ingaba unomnqweno wokuvula le nkangeleko yecala kwimo yokuhlela?"
+#. The frame is shown only if AD server can be discovered or is explicitly specified
+#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
+#: src/lib/authui/sssd/manage_ad_dialog.rb:68
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
+msgstr ""
-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
-msgstr "Inkonzo"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
+msgstr ""
-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
-msgstr "Ummandla"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com)"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:64
-#, fuzzy
-#| msgid "Identification:"
-msgid "Identification provider:"
-msgstr "Ukuchongeka:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:69
-#, fuzzy
-#| msgid "&Authentication Mode"
-msgid "Authentication provider:"
-msgstr "&Imo Yongqinelwano Ngobunyani"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
msgstr ""
-#. 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 "Ezi nkonzo ziya kunikwa isakhono"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
+msgstr ""
-#. 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 "Ngenisa igama lenkangeleko yecala entsha."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+msgid ""
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
+msgstr ""
-#: src/lib/yauthclient/new_section_dialog.rb:126
-#, fuzzy
-#| msgid "This domain is already defined."
-msgid "The domain name is already in-use."
-msgstr "Lo mmandla sele uchaziwe."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
+msgstr ""
-#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
msgstr ""
-#: src/lib/yauthclient/params.rb:114
-msgid "Comma separated list of services that are started when sssd itself starts."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
msgstr ""
-#: src/lib/yauthclient/params.rb:115
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
msgid ""
+"Enrollment has completed successfully!\n"
"\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+"Command output:\n"
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"
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+msgid ""
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
msgstr ""
-#: 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."
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
msgstr ""
-#: src/lib/yauthclient/params.rb:126
-msgid "This parameter contains the list of domains in the order these will be queried."
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
msgstr ""
-#: 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"
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
msgstr ""
-#: src/lib/yauthclient/params.rb:143
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
msgstr ""
-#: 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."
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com)"
msgstr ""
+#: src/lib/authui/sssd/new_section_dialog.rb:78
+msgid "Which service provides identity data, such as user names and group memberships?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
+#, fuzzy
+#| msgid "Enable the NTP daemon"
+msgid "Enable the domain"
+msgstr "Nika isakhono kwi-daemon ye-NTP"
+
+#. Create new domain
+#: src/lib/authui/sssd/new_section_dialog.rb:106
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter the domain name."
+msgstr "Ngenisa igama lenkangeleko yecala entsha."
+
+#: src/lib/authui/sssd/new_section_dialog.rb:109
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:112
+#, fuzzy
+#| msgid "This domain is already defined."
+msgid "The domain name is already in-use."
+msgstr "Lo mmandla sele uchaziwe."
+
+#. Define Global Parameters
+#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:119
+msgid "The regular expression parses user name and domain name into components"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:123
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:127
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:131
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:135
+msgid "A default domain name for all names without a domian name component"
+msgstr ""
+
#. Define Global Services Parameters
-#: 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."
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
+#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
+#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
msgstr ""
-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
msgid "Add a timestamp to the debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
msgid "Add microseconds to the timestamp in debug messages"
msgstr ""
-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
+#: src/lib/authui/sssd/params.rb:161
+msgid "Timeout in seconds between heartbeats for this service"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:171
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:176
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:181
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
msgstr ""
-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/yauthclient/params.rb:202
+#: src/lib/authui/sssd/params.rb:198
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 ""
-#: src/lib/yauthclient/params.rb:207
+#: src/lib/authui/sssd/params.rb:203
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 ""
-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
msgid "Exclude certain users from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr ""
-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
msgid "If you want filtered user to still be group members set this option to false."
msgstr ""
-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr ""
-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr ""
-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
msgid "Override the login shell for all users."
msgstr ""
-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
msgid "Restrict user shell to one of the listed values."
msgstr ""
-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
msgid "Replace any instance of these shells with the shell_fallback"
msgstr ""
-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr ""
-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr ""
-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/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 ""
-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:291
+#: src/lib/authui/sssd/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 ""
#. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
msgid "Display a warning N days before the password expires."
msgstr ""
-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr ""
-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: src/lib/authui/sssd/params.rb:325
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr ""
-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr ""
-#: src/lib/yauthclient/params.rb:330
+#: src/lib/authui/sssd/params.rb:342
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr ""
-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr ""
-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/yauthclient/params.rb:355
+#: src/lib/authui/sssd/params.rb:371
msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
msgstr ""
-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr ""
-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/yauthclient/params.rb:401
+#: src/lib/authui/sssd/params.rb:417
msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
msgid "The identification provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:413
+#: src/lib/authui/sssd/params.rb:429
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 ""
-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
msgid "The authentication provider used for the domain"
msgstr ""
-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
msgid "The access control provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
msgid "The provider which should handle change password operations for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
msgid "The SUDO provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
msgid "The provider which should handle loading of selinux settings."
msgstr ""
-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
msgid "The provider which should handle fetching of subdomains."
msgstr ""
-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
msgid "The autofs provider used for the domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
msgid "The provider used for retrieving host identity information."
msgstr ""
-#: src/lib/yauthclient/params.rb:466
+#: src/lib/authui/sssd/params.rb:482
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr ""
-#: src/lib/yauthclient/params.rb:471
+#: src/lib/authui/sssd/params.rb:487
msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
msgstr ""
-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr ""
-#: src/lib/yauthclient/params.rb:482
+#: src/lib/authui/sssd/params.rb:498
msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr ""
-#: src/lib/yauthclient/params.rb:486
+#: src/lib/authui/sssd/params.rb:502
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr ""
-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
msgid "Override the primary GID value with the one specified."
msgstr ""
-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:516
msgid "Treat user and group names as case sensitive."
msgstr ""
-#: src/lib/yauthclient/params.rb:500
+#: src/lib/authui/sssd/params.rb:521
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 ""
-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:526
msgid "Use this homedir as default value for all subdomains within this domain."
msgstr ""
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:532
msgid "Comma separated list of users who are allowed to log in."
msgstr ""
-#: src/lib/yauthclient/params.rb:516
+#: src/lib/authui/sssd/params.rb:537
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:521
+#: src/lib/authui/sssd/params.rb:542
msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr ""
#. 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/lib/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:551
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:556
msgid "Indicate if a home directory should be created by default for new users."
msgstr ""
-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:561
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr ""
-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:566
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:550
+#: src/lib/authui/sssd/params.rb:571
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 ""
-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:576
msgid "The mail spool directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:580
msgid "The command that is run after a user is removed."
msgstr ""
#. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:589
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:595
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:601
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr ""
-#: src/lib/yauthclient/params.rb:579
+#: src/lib/authui/sssd/params.rb:606
msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr ""
-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
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 ""
-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:624
#, fuzzy
#| msgid "Password for LDAP server"
msgid "Base DN for LDAP search"
msgstr "Igama lokugqitha leseva ye-LDAP"
-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:631
#, fuzzy
#| msgid "LDAP secure port"
msgid "LDAP schema type"
msgstr "Isiqhagamshelanisi sokhuselo lwe-LDAP"
-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:635
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:641
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:645
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:650
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:655
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:660
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:665
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:670
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:675
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:680
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:685
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:690
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:673
+#: src/lib/authui/sssd/params.rb:700
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 ""
-#: src/lib/yauthclient/params.rb:678
+#: src/lib/authui/sssd/params.rb:705
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 ""
-#: src/lib/yauthclient/params.rb:683
+#: src/lib/authui/sssd/params.rb:710
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 ""
-#: src/lib/yauthclient/params.rb:688
+#: src/lib/authui/sssd/params.rb:715
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 ""
-#: src/lib/yauthclient/params.rb:693
+#: src/lib/authui/sssd/params.rb:720
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 ""
-#: src/lib/yauthclient/params.rb:698
+#: src/lib/authui/sssd/params.rb:725
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 ""
-#: src/lib/yauthclient/params.rb:703
+#: src/lib/authui/sssd/params.rb:730
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 ""
-#: src/lib/yauthclient/params.rb:708
+#: src/lib/authui/sssd/params.rb:735
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 ""
-#: src/lib/yauthclient/params.rb:713
+#: src/lib/authui/sssd/params.rb:740
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 ""
-#: src/lib/yauthclient/params.rb:718
+#: src/lib/authui/sssd/params.rb:745
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 ""
-#: src/lib/yauthclient/params.rb:723
+#: src/lib/authui/sssd/params.rb:750
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:755
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr ""
-#: src/lib/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:760
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:738
+#: src/lib/authui/sssd/params.rb:765
msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
msgstr ""
-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:770
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr ""
-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:774
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/yauthclient/params.rb:752
+#: src/lib/authui/sssd/params.rb:779
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 ""
-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:780
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:785
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr ""
-#: src/lib/yauthclient/params.rb:763
+#: src/lib/authui/sssd/params.rb:790
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 ""
-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:795
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:800
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/yauthclient/params.rb:778
+#: src/lib/authui/sssd/params.rb:805
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 ""
-#: src/lib/yauthclient/params.rb:783
+#: src/lib/authui/sssd/params.rb:810
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 ""
-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:820
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:825
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:830
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:835
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:840
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:845
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:850
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/yauthclient/params.rb:829
+#: src/lib/authui/sssd/params.rb:856
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 ""
-#: src/lib/yauthclient/params.rb:835
+#: src/lib/authui/sssd/params.rb:862
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 ""
-#: src/lib/yauthclient/params.rb:841
+#: src/lib/authui/sssd/params.rb:868
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 ""
-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:874
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:880
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:885
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:890
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:895
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:905
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:910
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr ""
-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:915
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:920
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/yauthclient/params.rb:899
+#: src/lib/authui/sssd/params.rb:926
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/yauthclient/params.rb:904
+#: src/lib/authui/sssd/params.rb:931
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 ""
-#: src/lib/yauthclient/params.rb:909
+#: src/lib/authui/sssd/params.rb:936
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 ""
-#: src/lib/yauthclient/params.rb:914
+#: src/lib/authui/sssd/params.rb:941
msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr ""
-#: src/lib/yauthclient/params.rb:919
+#: src/lib/authui/sssd/params.rb:946
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr ""
-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:951
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr ""
-#: src/lib/yauthclient/params.rb:929
+#: src/lib/authui/sssd/params.rb:956
msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr ""
-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:961
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/yauthclient/params.rb:938
+#: src/lib/authui/sssd/params.rb:965
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr ""
-#: src/lib/yauthclient/params.rb:943
+#: src/lib/authui/sssd/params.rb:970
msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr ""
-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:977
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:981
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr ""
-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:985
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr ""
-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:989
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:993
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:998
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:1003
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr ""
-#: src/lib/yauthclient/params.rb:981
+#: src/lib/authui/sssd/params.rb:1008
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 ""
-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1012
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1017
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1022
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/yauthclient/params.rb:1000
+#: src/lib/authui/sssd/params.rb:1027
msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr ""
-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1032
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1037
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1042
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1047
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1052
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1057
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1034
+#: src/lib/authui/sssd/params.rb:1061
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1039
+#: src/lib/authui/sssd/params.rb:1066
msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
msgstr ""
-#: src/lib/yauthclient/params.rb:1044
+#: src/lib/authui/sssd/params.rb:1071
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 ""
-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1076
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr ""
-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1082
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1087
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/yauthclient/params.rb:1065
+#: src/lib/authui/sssd/params.rb:1092
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr ""
-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1105
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1109
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 ""
-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1114
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr ""
-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1128
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1133
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1138
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr ""
-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1143
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1148
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1126
+#: src/lib/authui/sssd/params.rb:1153
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 ""
-#: src/lib/yauthclient/params.rb:1130
+#: src/lib/authui/sssd/params.rb:1157
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1134
+#: src/lib/authui/sssd/params.rb:1161
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1165
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1170
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr ""
-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1174
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1179
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1191
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1196
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1173
+#: src/lib/authui/sssd/params.rb:1200
msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
msgstr ""
-#: 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."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1209
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/yauthclient/params.rb:1194
+#: src/lib/authui/sssd/params.rb:1222
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1199
+#: src/lib/authui/sssd/params.rb:1227
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1232
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1236
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1240
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1217
+#: src/lib/authui/sssd/params.rb:1245
msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr ""
#. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1257
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1262
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/yauthclient/params.rb:1238
-msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
msgstr ""
-#: src/lib/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1272
#, fuzzy
#| msgid "The automounter package will be installed.\n"
msgid "The automounter location this IPA client will be using."
msgstr "Umbekelo wesigxumeki esizenzekelayo uza kuhlohlwa.\n"
-#: src/lib/yauthclient/params.rb:1248
+#: src/lib/authui/sssd/params.rb:1277
msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
msgstr ""
-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1282
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1286
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
-#. 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 ""
+#, fuzzy
+#~| msgid "Authentication Method"
+#~ msgid "Authentication Client Configuration"
+#~ msgstr "Indlela Yongqinelwano Ngobunyani"
-#: src/modules/AuthClient.rb:232
-msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
-msgstr ""
+#, fuzzy
+#~| msgid "Create Service"
+#~ msgid "Delete Service/Domain"
+#~ msgstr "Yenza iNkonzo"
-#. end Export
-#. ################################################################
-#. ################################################################
-#. Summary()
-#. returns html formated configuration summary
-#. @return summary
-#: src/modules/AuthClient.rb:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Modem Parameters"
+#~ msgid "More Parameters"
+#~ msgstr "Imida Yenkcazelo ngee-Modem"
-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Really delete section %1?"
+#~ msgid "You may not delete section SSSD."
+#~ msgstr "Uyayicima ngenene i-`%1`?"
-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Would you like to open this profile in editing mode?"
+#~ msgid "Would you like to enable another service or join a domain?"
+#~ msgstr "Ingaba unomnqweno wokuvula le nkangeleko yecala kwimo yokuhlela?"
-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr ""
+#~ msgid "Service"
+#~ msgstr "Inkonzo"
+#, fuzzy
+#~| msgid "Identification:"
+#~ msgid "Identification provider:"
+#~ msgstr "Ukuchongeka:"
+
+#, fuzzy
+#~| msgid "These services will be enabled"
+#~ msgid "There are no more services to be enabled."
+#~ msgstr "Ezi nkonzo ziya kunikwa isakhono"
+
#~ msgid "Cancel"
#~ msgstr "Hlaba"
@@ -1187,6 +1797,3 @@
#~ msgid "Edit"
#~ msgstr "Hlela"
-
-#~ msgid "Delete"
-#~ msgstr "Cima "
Modified: trunk/yast/xh/po/auth-server.xh.po
===================================================================
--- trunk/yast/xh/po/auth-server.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/auth-server.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -293,8 +293,7 @@
msgstr ""
#. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
msgid "Firewall Settings"
msgstr "Imimiselo ye-Firewall"
@@ -437,12 +436,12 @@
msgid "Configure Account for Replication"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
msgid "is not a valid LDAP DN"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
msgid "Password"
msgstr "Igama lokugqithisela"
@@ -468,8 +467,8 @@
msgid "Provider Details"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
msgid "Protocol"
msgstr "Inkqubo"
@@ -477,7 +476,7 @@
msgid "Provider Hostname"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
msgid "Use StartTLS"
msgstr ""
@@ -558,8 +557,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
msgid "The test returned the following error messages:"
msgstr ""
@@ -1822,8 +1821,7 @@
#. Initialization dialog contents
#. Initialization dialog contents
#: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
#: src/include/auth-server/wizards.rb:207
#: src/include/auth-server/wizards.rb:300
msgid "Initializing..."
@@ -2197,7 +2195,7 @@
msgid "Index Cache (IDL cache)"
msgstr ""
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
msgid "Checkpoint Settings"
msgstr ""
@@ -2267,7 +2265,7 @@
msgstr ""
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
msgid "Password Policy Settings"
msgstr "Imimiselo Yomgaqonkqubo Wegama Lokugqithisa"
@@ -2428,237 +2426,237 @@
msgstr ""
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
msgid "The error message was: '"
msgstr ""
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
msgid "Try again?"
msgstr "Uyazama kwakhona?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
msgid "Available Attribute Types"
msgstr ""
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
msgid "Selected Attribute Types"
msgstr ""
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
msgid "Who should this rule apply to"
msgstr ""
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
msgid "Entry DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
msgid "Select"
msgstr ""
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
msgid "Define the Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
msgid "Stop access control evaluation here (default)"
msgstr ""
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
msgid "Continue with next access control rule (\"break\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
msgid "Continue evaluation of this rule (\"continue\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
msgid "Please enter a DN in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
msgid "Subtree DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
msgid "Group DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
msgid "Edit Access Control Rule"
msgstr ""
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
msgid "Target Objects"
msgstr ""
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
msgid "Matching the filter:"
msgstr ""
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
msgid "LDAP Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
msgid "Apply this rule only to the listed attribute"
msgstr ""
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
msgid "Attributes"
msgstr "Iimpawu"
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
msgid "Edit"
msgstr "Hlela"
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
msgid "Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
msgid "Who"
msgstr ""
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
msgid "DN"
msgstr "DN"
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
msgid "Flow Control"
msgstr ""
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
msgid "Up"
msgstr ""
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
msgid "Down"
msgstr ""
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
msgid "Enter valid a LDAP filter in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
msgid "You must add at least one item to the \"Access Level\" list."
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Target"
msgstr ""
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
msgid "Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
msgid "This database is a Replication Consumer."
msgstr ""
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
msgid "Provider Name"
msgstr ""
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
msgid "Port"
msgstr "Isiqhagamshelanisi"
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
msgid "Replication Type"
msgstr ""
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
msgid "Replication Interval"
msgstr ""
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
msgid "Days"
msgstr " Iintsuku"
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
msgid "Hours"
msgstr " Iiyure"
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
msgid "Minutes"
msgstr "Imizuzu"
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
msgid "Seconds"
msgstr "Imizuzwana"
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
msgid "Authentication DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
msgid "Custom update referral"
msgstr ""
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
msgid "Target Host"
msgstr ""
#. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
msgid "Invalid replication interval specified"
msgstr ""
#. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
msgid "Checking LDAP connectivity to the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
msgid "Do you still want to continue?"
msgstr ""
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr ""
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
msgid "Enable ldapsync provider for this database"
msgstr ""
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
msgid "Operations"
msgstr ""
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
msgid "Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
msgid "Enable Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
msgid "Replication Settings"
msgstr ""
Modified: trunk/yast/xh/po/autoinst.xh.po
===================================================================
--- trunk/yast/xh/po/autoinst.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/autoinst.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -29,7 +29,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
msgid "This may take a while"
msgstr "Oku kusenokuthatha ithuba..."
@@ -51,14 +51,13 @@
#. command line options
#. Init variables
-#. Import users configuration from the profile
-#.
+#. unique id
#. 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:410
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
@@ -269,7 +268,7 @@
msgstr "Khetha ifayili esuka kwitheyibhile kuqala."
#. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -280,75 +279,59 @@
" </p>"
#. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
msgid "Progress"
msgstr "Ukuqhubela phambili"
#. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
msgid "Configuring System according to auto-install settings"
msgstr "Kwenziwa Ubumbeko Lwesixokelelwano ngokwemimiselo yokuhlohla ezenzekelayo"
#. 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."
+#: src/clients/inst_autoconfigure.rb:94
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>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:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
msgid "Configuring %1"
msgstr "Kwenziwa ubumbeko %1"
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
msgid "Not Configuring %1"
msgstr "Akwenziwa Lubumbeko %1"
#. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
msgid "Executing Post-Scripts"
msgstr "Kuqhutywa Izikripti Zamva"
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
+#. Do not restart NetworkManager* services
+#. bnc#955260
#: src/clients/inst_autoconfigure.rb:304
#, fuzzy
#| msgid "Restarting services"
msgid "Restarting all running services"
msgstr "Kuqaliswa iinkonzo kwakhona"
-#: src/clients/inst_autoconfigure.rb:327
+#. Filtering out all services which must not to be restarted
+#: src/clients/inst_autoconfigure.rb:326
msgid "Activating systemd default target"
msgstr ""
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
msgid "Finishing Configuration"
msgstr "Kugqitywa Ukwenziwa Kobumbeko"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:447
#, fuzzy
msgid "Processing resource %1"
msgstr "Kucikidwa umthombo %1"
@@ -409,8 +392,15 @@
"%1"
msgstr "Usilele umbhalo wobumbeko lweSuSE."
-#. import "Arch";
#. encoding: utf-8
+#. File: clients/inst_autoinit.ycp
+#. Package: Auto-installation
+#. Summary: Parses XML Profile for automatic installation
+#. Authors: Anas Nashif <nashif(a)suse.de>
+#.
+#. $Id$
+#.
+#. encoding: utf-8
#. File: clients/autoinst_post.ycp
#. Package: Auto-installation
#. Author: Anas Nashif <nashif(a)suse.de>
@@ -418,7 +408,7 @@
#. the system as described in the profile file.
#.
#. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
msgid ""
"<p>\n"
"Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -426,59 +416,45 @@
"<p>\n"
"Nceda linda xa isixokelelwano sisalungiselwa ukuhlohla ngokuzenzekela.</p>\n"
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
msgid "Probe hardware"
msgstr "Cikida okuseqokobheni lekhompyutha"
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
msgid "Retrieve & Read Control File"
msgstr "Buyiselwa Kwakhona & Ufunde Ifayili Yokulawula"
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
msgid "Parse control file"
msgstr "Hlahlela ifayili yokulawula"
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
msgid "Initial Configuration"
msgstr "Ubumbeko Lwakuqala"
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
msgid "Preparing System for Automatic Installation"
msgstr "Kulungiselelwa Isixokelelwano Sokuhlohla Ngokuzenzekela"
#. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
msgid "Preprobing stage"
msgstr "Ibakala eliphambi kwelokucikida"
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
msgid "Probing hardware..."
msgstr "Kucikidwa okuseqokobheni lekhompyutha"
+#. 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_autoinit.rb:128
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+
#. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
msgid "Parsing control file"
msgstr "Kuhlahlelwa ifayili yolawulo"
@@ -522,59 +498,69 @@
#. Uwe Gansert <ug(a)suse.de>
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<P>Nceda linda xa isixokelelwano sisalungiselwa ukuhlohla ngokuzenzekela.</P>"
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
msgid "Execute pre-install user scripts"
msgstr "Qhuba izikripti zomsebenzisi zaphambi kokuhlohla"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
msgid "Configure General Settings "
msgstr "Yenza Ubumbeko Lwemimiselo Jikelele"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
msgid "Set up language"
msgstr "Misela ulwimi"
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:58
msgid "Create partition plans"
msgstr "Dala izicwangciso zezahlulo"
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
msgid "Configure Bootloader"
msgstr "Yenza Ubumbeko Lwesilayishi Sokumisela Inkqubo"
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
#, fuzzy
#| msgid "Registration Code"
msgid "Registration"
msgstr "Ikhowudi Yobhaliso"
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure Software selections"
msgstr "Yenza Ubumbeko lokukhethwayo Lwaphakathi ekhompyutheni"
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:62
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:63
#, fuzzy
#| msgid "Configure Volume Groups"
msgid "Configure users and groups"
msgstr "Yenza Amaqela Esixa"
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "Yenza Ubumbeko Lwezikhululo"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
msgid "Executing pre-install user scripts..."
msgstr "Kuqhutywa izikripti zomsebenzisi zaphambi kokuhlohla..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configuring general settings..."
msgstr "Kwenziwa ubumbeko lwemimiselo jikelele..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
#, fuzzy
#| msgid "Set up language"
msgid "Setting up language..."
@@ -584,17 +570,17 @@
msgid "Creating partition plans..."
msgstr "Kudalwa izicwangciso zezahlulo..."
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
msgid "Configuring Bootloader..."
msgstr "Kwenziwa Ubumbeko Lwesilayishi Sokumisela Inkqubo"
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
#, fuzzy
#| msgid "Repairing file system..."
msgid "Registering the system..."
msgstr "Ukukhanda isixokelelwano sefayili..."
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring Software selections..."
msgstr "Kwenziwa ubumbeko lokukhethwayo Lwaphakathi ekhompyutheni"
@@ -608,7 +594,19 @@
msgid "Importing users and groups configuration..."
msgstr ""
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "Kuthathwa ngaphandle ifayili Yokuqalisa Ngokukhaba..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "Kwenziwa ubumbeko lolwimi..."
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
msgid "Preparing System for Automated Installation"
msgstr "Kulungiselelwa Isixokelelwano Sokuhlohla Esizenzekelayo"
@@ -617,7 +615,7 @@
#. while the general inst_finish process at the end of the
#. first stage. But for the installation workflow the linuxrc
#. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#: src/clients/inst_autosetup.rb:185
#, fuzzy
#| msgid "Signing the Add-On Product"
msgid "Handling Add-On Products..."
@@ -626,12 +624,12 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
msgid "Configuring language..."
msgstr "Kwenziwa ubumbeko lolwimi..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:298
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -639,8 +637,9 @@
"Imposiso xa kwenziwa ubumbeko lwezahlulo.\n"
"Zama kwakhona.\n"
-#. Software
-#: src/clients/inst_autosetup.rb:344
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -720,11 +719,11 @@
#. Select packages
#. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
msgid "Software Selection"
msgstr "Ukukhethwa Kokungaphakathi Ekhompyutheni"
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
msgid ""
"<p>\n"
"Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
@@ -739,21 +738,21 @@
#. AutoinstSoftware::pmInit();
#. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
#. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
msgstr ""
-#: src/clients/software_auto.rb:128
+#: src/clients/software_auto.rb:129
msgid "The inst-source of this system (you can't create images if you choose this)"
msgstr ""
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
#, fuzzy
#| msgid "OS installation source is not configured"
msgid "using that installation source failed"
msgstr "Uvimba wokuhlohla i-OS akabunjwanga"
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
msgid "Reading package database..."
msgstr "Kufundwa iinkcukacha zesiseko sokubekelela..."
@@ -1040,6 +1039,11 @@
msgid "Volgroup device name"
msgstr "&Igama lesixhobo"
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
#. Shows a dialog when 'control file' can't be found
#. @param [String] original Original value
#. @return [String] new value
@@ -1543,8 +1547,7 @@
msgid "Settings"
msgstr "Imimiselo"
-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
msgid "Select Directory"
msgstr "&Khetha Uvimba Weefayili"
@@ -1666,7 +1669,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
msgid "Checking XML with RNG validation..."
msgstr "Kuqwalaselwa i-XML ene-RNG ngaphandle kokusebenziseka..."
@@ -1677,7 +1680,7 @@
msgstr "Icandelo %1 alifunyenwanga."
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
msgid "Checking XML with RNC validation..."
msgstr "Kuqwalaselwa i-XML ene-RNC ngaphandle kokusebenziseka..."
@@ -2076,69 +2079,6 @@
" njengokulungiselela.\n"
" </p>\n"
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "Ayifumaneki i-URL '%1' ngokugqitha kwinkqubo ye-HTTP(S). Ikhowudi yokubuyisela iseva %2."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "Ayifumaneki i-URL '%1' ngokugqitha kwinkqubo ye-FTP. Ikhowudi yokubuyisela iseva %2."
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "Ukufundwa ifayili kwi- %1/%2 kusilele.\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr ""
-"Ukufundwa ifayili kwi- %1/\n"
-" kusilele.\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:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "Ukugxunyekwa kwe- %1kusilele."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "Ukufundwa kwefayili kwi-CD kusilele. Indlela yothungelwano: %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:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "Ifayili emgama %1 ayikwazi kufunyanwa ngokubuyiseleka"
-
-#. this is workaround for bnc#849767
-#. 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: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:505
-msgid "File %1 cannot be found"
-msgstr "Ifayili %1 ayifunyanwa"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "Ayifumaneki i-URL '%1' ngokugqitha kwinkqubo ye-TFTP."
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "Ayaziwa inkqubo ye-%1."
-
#. Script Configuration
#. @return script configuration dialog
#: src/include/autoinstall/script_dialogs.rb:30
@@ -2424,12 +2364,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:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "Isihlahleli se-XML sixele imposiso xa kuhlahlelwa inkangeleko yecala le-yast ezenzekelayo. Umyalezo wemposiso ngulo:\n"
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
msgid ""
"\n"
"User-defined classes could not be retrieved. Make sure all classes \n"
@@ -2445,46 +2385,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:278
+#: src/modules/AutoinstConfig.rb:279
#, fuzzy
msgid "Choose Profile"
msgstr "&sebenzisa iProfayili"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:335
msgid "Retrieving control file from floppy."
msgstr "Kufunyaniswa ngokubuyisela ifayili yokulawula ukusuka kwi-floppy."
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:338
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "Kufunyaniswa ngokubuyisela ifayili yokulawula (%1) evela kwiseva ye TFTP: %2."
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:344
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "Kufunyaniswa ngokubuyisela ifayili yokulawula (%1) evela kwiseva ye TFTP: %2."
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:350
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "Kufunyaniswa ngokubuyisela ifayili yokulawula (%1) evela kwiseva ye TFTP: %2."
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:356
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "Kufunyaniswa ngokubuyisela ifayili yokulawula (%1) evela kwiseva ye FTP: %2."
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:362
msgid "Copying control file from file: %1."
msgstr "Kukotshwa ifayili lokulawula evela kwifayili: %1."
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:367
msgid "Copying control file from device: /dev/%1."
msgstr "Kukotshwa ifayili lokulawula evela kwizixhobo: /dev/%1."
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:371
msgid "Copying control file from default location."
msgstr "Kukotshwa ifayili yokulawula evela kwindawo ehlala ikhona."
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:373
msgid "Source unknown."
msgstr "Umthombo awaziwa."
@@ -2494,7 +2434,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:453
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2504,7 +2444,7 @@
"<p>Phantse yonke imithombo yokulawula ifayili inako\n"
" ukubumbeka ngokusebenzisa isixokelelwano sokulawula ubumbeko.</p>\n"
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:458
#, fuzzy
msgid ""
"<p>Most of the modules used to create the configuration are identical to those available\n"
@@ -2519,7 +2459,7 @@
" ukuhlohla esinye isixokelelwano ngokusebenzisa i-YaST Ezenzekelayo.\n"
" </p>\n"
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:465
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2629,24 +2569,24 @@
msgstr "Awathathwa ngaphandle amaqhosha amatsha e-GPG"
#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
+#: src/modules/AutoinstGeneral.rb:419
#, fuzzy
#| msgid "Saving time zone..."
msgid "Syncing time..."
msgstr "Kugcinwa izowuni yexesha..."
#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
+#: src/modules/AutoinstGeneral.rb:421
msgid "Syncing time with %s."
msgstr ""
-#: src/modules/AutoinstGeneral.rb:420
+#: src/modules/AutoinstGeneral.rb:425
#, fuzzy
#| msgid "Image creation failed."
msgid "Time syncing failed."
msgstr "Akuphumelelanga ukwenziwa komfanekiso."
-#: src/modules/AutoinstGeneral.rb:424
+#: src/modules/AutoinstGeneral.rb:429
#, fuzzy
#| msgid "Cannot mount file system."
msgid "Cannot update system time."
@@ -2672,18 +2612,18 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
msgid "Drives"
msgstr "Izikhululo"
#. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
msgid "%s drive in total"
msgid_plural "%s drives in total"
msgstr[0] ""
msgstr[1] ""
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
#, fuzzy
#| msgid "Not detected."
msgid "Not yet cloned."
@@ -2691,23 +2631,23 @@
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
msgid "Preinstallation Scripts"
msgstr "Izikripti Zaphambi Kokuhlohla"
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
msgid "Postinstallation Scripts"
msgstr "Izikripti Zasemva Kokuhlohla"
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
msgid "Chroot Scripts"
msgstr "Izikripti ze-Chroot"
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
msgid "Init Scripts"
msgstr "Izikripti ze-Init"
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
#, fuzzy
msgid "Postpartitioning Scripts"
msgstr "Izikripti Zasemva Kokuhlohla"
@@ -2715,33 +2655,33 @@
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
msgid "Pre"
msgstr "Phambi"
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
msgid "Post"
msgstr "Emva"
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
msgid "Init"
msgstr "i-Init"
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
msgid "Chroot"
msgstr "i-Chroot"
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
#, fuzzy
msgid "Postpartitioning"
msgstr "Ukwahlula"
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
msgid "Unknown"
msgstr "Akwaziwa"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:174
#, fuzzy
msgid ""
"These packages could not be found in the software repositories:\n"
@@ -2752,7 +2692,7 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
#, fuzzy
#| msgid "Reading file on %1 failed.\n"
msgid "Adding repo %1 failed"
@@ -2761,22 +2701,22 @@
" kusilele.\n"
#. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:377
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:385
#, fuzzy
#| msgid "Checking installed packages..."
msgid "Creating Image - installing packages"
msgstr "Kuqwalaselwa imibekelelo ehlohliweyo..."
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:395
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:404
+#: src/modules/AutoinstSoftware.rb:406
#, fuzzy
#| msgid "Retrieving image file..."
msgid "Store image to ..."
@@ -2784,60 +2724,60 @@
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:435
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:447
+#: src/modules/AutoinstSoftware.rb:449
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:456
#, fuzzy
#| msgid "Archive created successfully"
msgid "Image created successfully"
msgstr "Isisele solwazi sidalwe ngempumelelo"
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:492
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:524
+#: src/modules/AutoinstSoftware.rb:526
#, fuzzy
#| msgid "Image creation failed."
msgid "can not read '%1'. Try again?"
msgstr "Akuphumelelanga ukwenziwa komfanekiso."
#. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:544
#, fuzzy
#| msgid "Image creation failed."
msgid "can not read '%1'. ISO creation failed"
msgstr "Akuphumelelanga ukwenziwa komfanekiso."
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:574
#, fuzzy
#| msgid "Creating ISO image directory..."
msgid "Preparing ISO Filestructure ..."
msgstr "Yenza isalathisi somfanekiso we-ISO..."
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:623
msgid "boot config for the DVD"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:627
msgid "Ok"
msgstr "Kulungile"
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:630
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."
@@ -2845,19 +2785,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:647
+#: src/modules/AutoinstSoftware.rb:649
#, fuzzy
#| msgid "Creating ISO image..."
msgid "Store ISO image to ..."
msgstr "Kudalwa umfuziselo we-ISO..."
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:650
#, fuzzy
#| msgid "Creating ISO image..."
msgid "Creating ISO File ..."
msgstr "Kudalwa umfuziselo we-ISO..."
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:671
#, fuzzy
#| msgid "Successfully Tested %1"
msgid "ISO successfully created at %1"
@@ -2865,30 +2805,30 @@
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:753
msgid "Selected Patterns"
msgstr "Izimbo Ezikhethiweyo"
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:763
msgid "Individually Selected Packages"
msgstr "Imibekelelo Ekhethwe Nganye-Nganye"
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:769
msgid "Packages to Remove"
msgstr "Imibekelelo efanele Ukushenxiswa"
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:776
msgid "Force Kernel Package"
msgstr "Umbekelelo we-Kernel Enziwa Ngamandla"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:871
#, fuzzy
msgid "Could not set patterns: %1."
msgstr "Izimbo okanye okukhethwayo akukwazanga kumiselwa: %1."
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:932
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr "Ayiphumelelanga indlela yesicombululi sepakethe. Nceda khangela icandelo lakho lesoftwe kwiprofayili ye-autoyast."
@@ -2936,14 +2876,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:363
msgid "Collecting configuration data..."
msgstr "Kuqokelelwa iinkcukacha zesixokelelwano..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:466
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr ""
@@ -2951,7 +2891,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:540
#, fuzzy
msgid "Could not write section %1 to file %2."
msgstr "Akukwazi kubhaleka ukuphawuleka kwefayili '%1'."
@@ -2959,7 +2899,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
@@ -2977,6 +2917,38 @@
msgid "&OK"
msgstr "&KULUNGILE"
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "Ayifumaneki i-URL '%1' ngokugqitha kwinkqubo ye-HTTP(S). Ikhowudi yokubuyisela iseva %2."
+
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "Ayifumaneki i-URL '%1' ngokugqitha kwinkqubo ye-FTP. Ikhowudi yokubuyisela iseva %2."
+
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "Ukufundwa ifayili kwi- %1/%2 kusilele.\n"
+
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr ""
+#~ "Ukufundwa ifayili kwi- %1/\n"
+#~ " kusilele.\n"
+
+#~ msgid "Mounting %1 failed."
+#~ msgstr "Ukugxunyekwa kwe- %1kusilele."
+
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "Ukufundwa kwefayili kwi-CD kusilele. Indlela yothungelwano: %1/%2."
+
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "Ifayili emgama %1 ayikwazi kufunyanwa ngokubuyiseleka"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "Ifayili %1 ayifunyanwa"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "Ayifumaneki i-URL '%1' ngokugqitha kwinkqubo ye-TFTP."
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "Ayaziwa inkqubo ye-%1."
+
#~ msgid "Configure runlevel"
#~ msgstr "Yenza ubumbeko lwenqanaba lokuqhuba"
@@ -3110,9 +3082,6 @@
#~ " Ngolwazi oluthe chatha, zidibanise noxwebhu.\n"
#~ " </P>\n"
-#~ msgid "Configure Drives"
-#~ msgstr "Yenza Ubumbeko Lwezikhululo"
-
#~ msgid "&Drive"
#~ msgstr "&Isikhululo"
Modified: trunk/yast/xh/po/base.xh.po
===================================================================
--- trunk/yast/xh/po/base.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/base.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -75,79 +75,79 @@
msgstr "Le modyuli ye-YaST2 ayisixhasi kakuhle isithuba sokudibana nomgca wokuyalela."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
msgid "Use 'help' for a complete list of available commands."
msgstr "Sebenzisa ' uncedo' ngoludwe olugqityiwe lwemiyalelo ekhoyo."
#. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
msgid "Use 'yast2 %1 help' for a complete list of available commands."
msgstr "Sebenzisa 'yast2 %1uncedo' ngoludwe olugqibekileyo lwemiyalelo ekhoyo."
#. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
msgid "Unknown Command: %1"
msgstr "Umyalelo Ongaziwa: %1"
#. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
msgid "Option '%1' is missing value."
msgstr "Ekukhethwa kuko '%1' lixabiso elilahlekileyo."
#. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
msgid "Unknown option for command '%1': %2"
msgstr "Ayikho indawo oza kukhetha kuyo umyalelo '%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:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
msgid "Invalid value for option '%1': %2"
msgstr "Ixabiso elingasebenzi nto lendawo ekukhethwa kuko '%1': %2"
#. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
msgid "Invalid value for option '%1' -- expected '%2', received %3"
msgstr "Ixabiso elingasebenzi nto lokukhethwa kuko '%1' -- elilindelekileyo'%2', lifunyenwe %3"
#. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
msgid "Option '%1' cannot have a value. Given value: %2"
msgstr "Ekukhethwa kuko '%1' akunakuba naxabiso. Ixabiso elinikiweyo: %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:541
+#: library/commandline/src/modules/CommandLine.rb:533
msgid "Use '%1 %2 help' for a complete list of available options."
msgstr "Sebenzisa '%1 %2 uncedo' ngoludwe olugqibekileyo lokukhoyo ekunokukhethwa kuko."
#. 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:551
+#: library/commandline/src/modules/CommandLine.rb:543
msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
msgstr "Sebenzisa ' yast2 %1 %2 uncedo' ngoludwe olugqibekileyo lokukhoyo ekunokukhethwa kuko."
#. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
msgid "YaST Configuration Module %1\n"
msgstr "Imodyuli Yobumbeko lwe-YaST %1\n"
#. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
msgid "No help available"
msgstr "Akukho ncedo lukhoyo"
#. Process <command> "help"
#. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
msgid "Command '%1'"
msgstr "Umyalelo '%1'"
#. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
msgid ""
"\n"
" Options:"
@@ -156,14 +156,14 @@
" Ekunokukhethwa kuko:"
#. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
msgid ""
"\n"
" Options of the [string] type must be written in the form 'option=value'."
msgstr ""
#. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
msgid ""
"\n"
" Example:"
@@ -172,139 +172,139 @@
" Umzekelo:"
#. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
#, fuzzy
#| msgid "This is a YaST2 module."
msgid "This is a YaST module."
msgstr "Le yimodyuli ye-YaST2."
#. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
msgid "Basic Syntax:"
msgstr "Ulandelelwano Lwamagama Olusisiseko:"
#. translators: module command line help, %1 is the module name
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
msgid " yast2 %1 <command> [verbose] [options]"
msgstr "yast2 %1 <command> [ukushwaqa] [ukhetho]"
#. translators: module command line help, %1 is the module name
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
msgid " yast2 %1 <command> help"
msgstr "yast2 %1 <command> uncedo"
#. translators: module command line help
#. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
msgid " <command> [options]"
msgstr "<command> [Ukhetho] "
#. translators: module command line help
#. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
msgid " <command> help"
msgstr "<command> uncedo"
#. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
msgid "Commands:"
msgstr "Imiyalelo:"
#. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
msgid "No help available."
msgstr "Akukho ncedo lukhoyo."
#. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
msgid "<Error: invalid help>"
msgstr ""
#. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
msgid "Run 'yast2 %1 <command> help' for a list of available options."
msgstr "Qhuba uncedo 'lwe-yast2 %1 <command> ngoludwe` olugqityiweyo elikhoyo ekunokukhethwa kulo."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
+#: library/commandline/src/modules/CommandLine.rb:930
msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option."
msgstr "Jolisa igama lefayili (isikhethwa 'sefayili-xml') silahlekile. Sebenzisa i-xmlfayili=<jolisa kwisikhethwa somgca womyalelo we-_XML_fayili> ."
#. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
+#: library/commandline/src/modules/CommandLine.rb:942
msgid "Target file name ('xmlfile' option) is empty. Use xmlfile=<target_XML_file> command line option."
msgstr "Jolisa igama lefayili (isikhethwa 'sefayili-xml') silahlekile. Sebenzisa i-xmlfayili=<jolisa kwisikhethwa somgca womyalelo we-_XML_fayili> ."
#. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
msgid "unknown"
msgstr "akwaziwa"
#. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
msgid "or '%1'"
msgstr "okanye '%1'"
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
msgid "Specify the command '%1'."
msgstr "Balua umyalelo '%1'."
#. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
msgid "Specify one of the commands: %1."
msgstr "Balula omnye wemiyalelo: %1."
#. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
msgid "Specify only one of the commands: %1."
msgstr "Balula omnye wemiyalelo: %1."
#. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
msgid "There is no user interface available for this module."
msgstr "Akukho sithuba sikhoyo somdibaniso womsebenzisi ukwenzela le modyuli."
#. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
msgid "Ready"
msgstr "Ukulungele oku"
#. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
msgid "Initializing"
msgstr "Kuyandululwa"
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
msgid "Finishing"
msgstr "Kuyagqitywa"
#. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
msgid "Done"
msgstr "Kwenziwe"
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
msgid "Quitting (without changes)"
msgstr "Kuyashiywa (ngaphandle kweenguqu)F"
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
msgid "yes or no?"
msgstr "ewe okanye hayi?"
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
msgid "yes"
msgstr "ewe"
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
msgid "no"
msgstr "hayi"
@@ -385,7 +385,7 @@
#. 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:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1435
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr ""
@@ -399,7 +399,7 @@
#. from YaST logs.
#.
#. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
msgid "Installation Error"
msgstr "Imposiso Yokuhlohla"
@@ -424,7 +424,7 @@
msgstr ""
#. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1244
msgid "No workflow defined for this installation mode."
msgstr "Akukho msbenezi uhamba kakuhle uchaziweyo ngale mo yokufaka."
@@ -442,14 +442,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
msgid "&Continue Installation"
msgstr "&Uyaqhuba Ngokuhlohla"
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
msgid "&Abort Installation"
msgstr "&Yeka.Ukuhlohla"
@@ -483,13 +483,13 @@
#. make sure that every workflow is merged only once
#. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
#, fuzzy
msgid "An internal error occurred when integrating additional workflow."
msgstr "Kwenzeke imposiso xa bekudalwa umthombo wokuhlohla."
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
msgid "The value of %1 is invalid."
msgstr "Ixabiso le-%1 alisebenzi nto."
@@ -536,7 +536,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:255
#: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
msgid "During Boot"
msgstr "Ngethuba Lokumisela Inkqubo"
@@ -545,7 +545,7 @@
#. radio button
#: library/cwm/src/modules/CWMServiceStart.rb:257
#: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
msgid "Manually"
msgstr "Ngokwenza ngesandla"
@@ -556,23 +556,23 @@
msgstr "i-Xinetd"
#. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
#, fuzzy
msgid "Via &xinetd"
msgstr "i-Xinetd"
#. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
msgid "Service Start"
msgstr "Ukuqalisa Inkonzo"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
msgid "Service is running"
msgstr "Inkonzo iyaqhuba"
#. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
msgid "Service is not running"
msgstr "Inkonzo ayiqhubi"
@@ -581,7 +581,7 @@
#. %1 is eg. "Start the Service Now"
#. %2 is eg. "Stop the Service Now"
#. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
msgid ""
"<p><b><big>Switch On or Off</big></b><br>\n"
"To start or stop the service immediately, use \n"
@@ -595,7 +595,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:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
msgid ""
"<p>To save all changes and restart the\n"
"service immediately, use <b>%3</b>.</p>\n"
@@ -604,48 +604,48 @@
"inkonzo kwangoko, sebenzisa <b>%3</b>.</p>\n"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
msgid "Start the Service Now"
msgstr "Qalisa Inkonzo Ngoku"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
msgid "Stop the Service Now"
msgstr "Nqumamisa Inkonzo Ngoku"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
msgid "Save Changes and Restart Service Now"
msgstr "Gcina Iinguqu uze Uphinde Uqalise Inkonzo Ngoku"
#. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
msgid "&Start the Service Now"
msgstr "&Qalisa Inkonzo Ngoku"
#. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
msgid "S&top the Service Now"
msgstr "N&qumamisa Inkonzo Ngoku"
#. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
msgid "S&ave Changes and Restart Service Now"
msgstr "G&cina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
#. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
msgid "Switch On and Off"
msgstr "Vula Uphinde Uvale"
#. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
msgid "Current Status: "
msgstr "Isimo Sangoku:"
#. help text for LDAP enablement widget
#. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
msgid ""
"<p><b><big>LDAP Support</big></b><br>\n"
"To store the settings in LDAP instead of native configuration files,\n"
@@ -656,12 +656,12 @@
"misela<b>%1</b>.</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
msgid "LDAP Support Active"
msgstr "Inkxaso ye-LDAP Inesakhono Sokusebenza"
#. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
msgid "&LDAP Support Active"
msgstr "&nkxaso ye-LDAP Inesakhono Sokusebenza"
@@ -673,7 +673,7 @@
#. push button
#. push button
#. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
#: library/cwm/src/modules/TablePopup.rb:940
#: library/general/src/modules/Label.rb:166
msgid "&Up"
@@ -681,7 +681,7 @@
#. push button
#. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
#: library/cwm/src/modules/TablePopup.rb:942
msgid "&Down"
msgstr "&Phantsi"
@@ -723,12 +723,12 @@
msgstr "Ifayili exeliweyo seyikhona. Uyayibhala kwakhona?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
msgid "The TSIG key ID was not specified."
msgstr "I-ID yeqhosha le-TSIG alikhange lixelwe."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
msgid ""
"The key with the specified ID exists and is used.\n"
"Remove it?"
@@ -737,7 +737,7 @@
"Uyalishenxisa?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
msgid ""
"A key with the specified ID was found\n"
"on your disk. Remove it?"
@@ -746,27 +746,27 @@
"kwidisk yakho. Uyalishenxisa?"
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
msgid "The key will be created now. Continue?"
msgstr "Iqhosha liya kudalwa ngoku. Uyaqhuba?"
#. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
msgid "Creating the TSIG key failed."
msgstr "Ukudala iqhosha le-TSIG kusilele."
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
msgid "The specified file does not exist."
msgstr "Ifayili exeliweyo ayikho kwayona."
#. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
msgid "The specified file does not contain any TSIG key."
msgstr "Ifayili exeliweyo ayiqulathanga naliphi iqhosha le-TSIG."
#. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
msgid ""
"The specified file contains a TSIG key with the same\n"
"identifier as some of already present keys.\n"
@@ -777,7 +777,7 @@
" Amaqhosha amadala aya kushenxiswa. Uyaqhuba?"
#. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
msgid ""
"<p><big><b>TSIG Key Management</b></big><br>\n"
"Use this dialog to manage the TSIG keys.</p>\n"
@@ -786,7 +786,7 @@
"Sebenzisa le ngxoxo ukulawula amaqhosa e-TSIG.</p>\n"
#. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
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"
@@ -798,7 +798,7 @@
"equlethe iqhosha uze unqomfe<b>Fakela</b>.</p>\n"
#. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
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"
@@ -811,7 +811,7 @@
" <b>Yila oku</b>.</p>\n"
#. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
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"
@@ -828,27 +828,27 @@
"kubumbeko kuqala.</p>\n"
#. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
msgid "Add an Existing TSIG Key"
msgstr "Fakela Iqhosha Eselikho le-TSIG"
#. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
msgid "Create a New TSIG Key"
msgstr "Dala Iqhosha Elitsha le-TSIG"
#. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
msgid "&Key ID"
msgstr "&i-ID Yeqhosha"
#. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
msgid "&Generate"
msgstr "&Yila"
#. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
msgid "Current TSIG Keys"
msgstr "Amaqhosha Angoku e-TSIG"
@@ -856,7 +856,7 @@
#. table header - GPG key ID
#. table header - GPG key ID
#. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
#: library/gpg/src/modules/GPGWidgets.rb:192
#: library/gpg/src/modules/GPGWidgets.rb:224
#: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -864,22 +864,22 @@
msgstr "&i-ID Yeqhosha"
#. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
msgid "Filename"
msgstr "Igama lefayili"
#. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
msgid "&Selected Option"
msgstr "&Indawo Ekhethiweyo Yokukhetha"
#. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
msgid "Current Option: "
msgstr "Indawo Ekuza Kukhethwa Kuyo Ngoku:"
#. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
msgid "The selected option is already present."
msgstr "Ukhetho olukhethiweyo selukhona."
@@ -943,19 +943,19 @@
"kuludwe.</p>"
#. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
msgid "&Other"
msgstr "&Ezinye"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
msgid "The device is not configured"
msgstr "Isixhobo asinabumbeko"
#. translators: message for hardware configuration without any configured
#. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
msgid "Press <B>Edit</B> to configure"
msgstr "Shicilela<B>Hlela</B>ukwenzela ubumbeko"
@@ -1112,9 +1112,89 @@
"<p>Kwiimo ezithile ezingqongileyo, onke okanye amanye amaqhosha \n"
"e-F awabikho.</p>"
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+#, fuzzy
+#| msgid "Reading %1 Settings"
+msgid "Restart After Saving Settings"
+msgstr "Ifunda %1 iiSethingi"
+
+#: library/general/src/lib/ui/service_status.rb:61
+#, fuzzy
+#| msgid "Reading %1 Settings"
+msgid "Reload After Saving Settings"
+msgstr "Ifunda %1 iiSethingi"
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+msgid "Service Status"
+msgstr "Ubulunga beNkonzo"
+
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:129
+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_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</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
+#: library/general/src/lib/ui/service_status.rb:155
+#, fuzzy
+#| msgid "Current Status: "
+msgid "Current status:"
+msgstr "Isimo Sangoku:"
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:168
+#, fuzzy
+#| msgid "Activate During Boot"
+msgid "Start During System Boot"
+msgstr "Kufakwa Kwimo Yokusebenza Ngethuba Lomiselo Lwenkqubo"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:192
+#, fuzzy
+#| msgid "Running"
+msgid "running"
+msgstr "Iyasebenza"
+
+#: library/general/src/lib/ui/service_status.rb:194
+#, fuzzy
+#| msgid "S&top now ..."
+msgid "Stop now"
+msgstr "Ye&ka ngoku ..."
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:199
+msgid "stopped"
+msgstr ""
+
+#: library/general/src/lib/ui/service_status.rb:201
+#, fuzzy
+#| msgid "&Start now ..."
+msgid "Start now"
+msgstr "&Qalisa ngoku ..."
+
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
msgid ""
"Although the path %1 exists, it is not a directory.\n"
"Continue or cancel the operation?\n"
@@ -1124,7 +1204,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:306
+#: library/general/src/modules/FileUtils.rb:300
msgid ""
"The path %1 does not exist.\n"
"Create it now?\n"
@@ -1134,7 +1214,7 @@
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
msgid ""
"Failed to create the directory %1.\n"
"Continue or cancel the current operation?\n"
@@ -1312,7 +1392,7 @@
#. 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:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "&Tsiba"
@@ -1335,7 +1415,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2221
msgid "&Password"
msgstr "&Igama lokungena"
@@ -1554,27 +1634,27 @@
msgstr "Ifayili yokulawula %1 ayikhange ifunyanwe."
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
msgid "Really abort the installation?"
msgstr "Uyakuyeka ngenene ukuhlohla?"
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
msgid "Really abort YaST System Repair?"
msgstr "Uyayeka ngenene Ukukhanda Isixokelelwano se-YaSt?"
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
msgid "Abort System Repair"
msgstr "Yeka Ukukhandwa Kwesixokelelwano"
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
msgid "&Continue System Repair"
msgstr "&Qhuba Ngokukhanda Isixokelelanisi"
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1587,7 +1667,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:766
+#: library/general/src/modules/Popup.rb:759
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1601,7 +1681,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:775
+#: library/general/src/modules/Popup.rb:768
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1612,18 +1692,18 @@
" Kusenokufuneka ukuba uphinde uhlohle."
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
msgid "Really abort?"
msgstr "Uyayeka ngenene?"
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
msgid "All changes will be lost!"
msgstr "Zonke iinguquko ziya kulahleka!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
msgid "&Details..."
msgstr "&Ubucukubhede..."
@@ -1651,7 +1731,7 @@
#: 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/network/src/modules/NetworkPopup.rb:90
#: library/types/src/modules/String.rb:101
msgid "Yes"
msgstr "Ewe"
@@ -1662,7 +1742,7 @@
#: 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/network/src/modules/NetworkPopup.rb:89
#: library/types/src/modules/String.rb:101
msgid "No"
msgstr "Hayi"
@@ -1726,7 +1806,7 @@
msgstr "Iimposiso Zokungena: %1"
#. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
#, fuzzy
#| msgid "Warning:"
#| msgid_plural "Warnings:"
@@ -1734,7 +1814,7 @@
msgstr "Isilumkiso:"
#. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
#, fuzzy
#| msgid "Error:"
#| msgid_plural "Errors:"
@@ -1743,8 +1823,8 @@
#. translators: message summary header
#. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
#, fuzzy
#| msgid "Message:"
#| msgid_plural "Messages:"
@@ -1800,7 +1880,7 @@
msgstr "Ci&ma"
#. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
msgid "&Variable"
msgstr "&Kuyaguquka"
@@ -1897,7 +1977,7 @@
msgstr "Faka Ibinzana Lokugqithisa"
#. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
msgid "Enter Passphrase to Unlock GPG Key %1: "
msgstr "Faka Ibinzana Lokugqithisa ukuze Ukhulule Iqhosha le-GPG elitshixekileyo%1"
@@ -2005,6 +2085,239 @@
msgid "Error occurred while reading the log."
msgstr "Kwenzeke impazamo xa bekufundwa isixhobo sokufumanisa impazamo"
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "Izowuni Engaziwayo"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"Indawo yokudibana `%1`ayabelwanga nakweyiphi izowuni ye-firewall.\n"
+"Qhuba i-Firewall ye-YST2.\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "Izowuni Yangaphandle"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "Izowuni Yangaphakathi"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "Izowuni esuswe ukulwa"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+#, fuzzy
+msgid "TCP"
+msgstr "i-UTC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+#, fuzzy
+msgid "UDP"
+msgstr "i-UPS"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+#, fuzzy
+msgid "RPC"
+msgstr "i-PC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+#, fuzzy
+msgid "IP"
+msgstr "i-SIP"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"Isithuba sokudibana '%1' \n"
+"sibandakanyiwe kwiizowuni ezininzi zodonga lomlilo.\n"
+"Ukuqhuba nobumbeko kusenokubanga iimposiso.\n"
+"Kucetyiswa ukulushiya ubumbeko luze lukhandwe ngesandla \n"
+"kwifayili '/etc/sysconfig/SuSEFirewall'."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "Kundululwa Ubumbeko lwe-Firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "Qwalasela izixhobo zomsebenzi wothungelwano"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "Funda ubumbeko lwangoku"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "Qwalasela iinkonzo ekunokwenzeka zingquzulane"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "Kuqwalaselwa izixhobo zomsebenzi wothungelwano_"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "Ukufunda ubumbeko lwangoku..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "Kuqwalaselwa iinkonzo ezinokuba ziyangquzula_"
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "Kubhalwa Ubumbeko lwe-Firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "Bhala imimiselo ye-Firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "Qhelanisa inkonzo ye-firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "Bhala imimiselo ye-Firewall"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "Kuqhelaniswa inkonzo ye-firewall"
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "Kusilele ukubhalwa kwemimiselo"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+#, fuzzy
+msgid "Unknown protocol (%1)"
+msgstr "Ayaziwa inkqubo ye-%1."
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports" => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" => [ ],
+#. "rpc_ports" => [ "portmap", "ypbind" ],
+#. "ip_protocols" => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr ""
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+#, fuzzy
+msgid "Service: %{filename}"
+msgstr "Inkonzo %1"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "Amaqhosha Kawonkewonke e-GPG"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "Inkonzo Ayaziwa `%1`"
+
#. label
#: library/network/src/modules/CWMFirewallInterfaces.rb:109
msgid "Firewall cannot be adjusted during first stage installation."
@@ -2049,20 +2362,20 @@
msgstr "Akukho zithuba zomdibaniso zabelwe le zowuni."
#. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
msgid "&Network Interfaces with Open Port in Firewall"
msgstr "&Izithuba zokudibana zomsebenzi wothungelwano zinesi Qhagamshelanisi Kudonga Lomlilo"
#. Check the INT zone, it's not protected by default
#. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
msgid ""
"These network interfaces assigned to internal network cannot be deselected:\n"
"%1\n"
msgstr ""
#. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -2075,7 +2388,7 @@
"Uyaqhuba?"
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces will additionally be open:\n"
@@ -2091,8 +2404,8 @@
#. yes-no popup
#. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
msgid ""
"Because of SuSE Firewall settings, the port\n"
"on the following interfaces cannot be opened:\n"
@@ -2107,29 +2420,29 @@
"Uyaqhuba?"
#. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
msgid "Network &Interfaces with Open Port in Firewall"
msgstr "&Izithuba zokudibana zomsebenzi wothungelwano zinesi Qhagamshelanisi Kudonga Lomlilo"
#. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
msgid "Select &All"
msgstr "Khetha &Konke"
#. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
msgid "Select &None"
msgstr "Musa Ukukhetha &Nto"
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
msgid ""
"Error checking service status:\n"
"%{details}"
msgstr ""
#. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
msgid ""
"Error setting service status:\n"
"%{details}"
@@ -2137,7 +2450,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:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
"To open the firewall to allow access to the service from remote computers,\n"
@@ -2150,7 +2463,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:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
msgid ""
"To select interfaces on which to open the port,\n"
"click <b>%2</b>.<br>"
@@ -2159,7 +2472,7 @@
"nqomfa<b>%2</b>.<br>"
#. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
@@ -2168,47 +2481,49 @@
"lingenasakhono sokusebenza.</p>"
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
msgid "Open Port in Firewall"
msgstr "Vula Isiqhagamshelanisi Kudonga Lomlilo"
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
msgid "Firewall Details"
msgstr "Iinkcukacha Zodonga Lomlilo"
#. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
msgid "Open Port in &Firewall"
msgstr "Vula Isiqhagamshelanisi Kudonga &Lomlilo"
#. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
#, fuzzy
msgid "Firewall &Details..."
msgstr "Iinkcukacha Zodonga &Lomlilo"
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
msgstr "Imimiselo ye-Firewall"
#. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
msgid "Firewall is open"
msgstr "Udonga lomlilo luvuliwe"
#. pppN must be tried before pN, modem before netcard
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
#: library/system/src/include/hwinfo/classnames.rb:108
#: library/system/src/include/hwinfo/classnames.rb:198
msgid "Modem"
msgstr "I-Modem"
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
msgid "Network Card"
msgstr "Ikhadi Lothungelwano"
@@ -2216,27 +2531,27 @@
#. Device type label
#. Device type label
#. Device type label
-#: 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:425
#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN"
msgstr "i-ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL"
msgstr "i-DSL"
-#: 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
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
msgid "Unknown"
msgstr "Akwaziwa"
@@ -2246,395 +2561,395 @@
#. are represented as its sub-interfaces.
#. And also we frequently confuse "device" and "interface"
#. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
msgid "Additional Address"
msgstr "Iidilesi Ezifakelweyo"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet"
msgstr "I-ARCnet"
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
msgid "ARCnet Network Card"
msgstr "Ikhadi Lothungelwano lwe-ARCnet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
msgid "ATM"
msgstr "i-ATM"
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
msgid "Asynchronous Transfer Mode (ATM)"
msgstr "Imo Yokutshintshela i-Asynchronous"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
msgid "Bluetooth"
msgstr "I-Bluetooth"
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
msgid "Bluetooth Connection"
msgstr "Uqhagamshelo lwe-Bluetooth"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
msgid "Bond Network"
msgstr "Uthungelwano Lwemvumelwano"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
msgid "CLAW"
msgstr "I-CLAW"
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
msgid "Common Link Access for Workstation (CLAW)"
msgstr "Unxibelelwano Lokufikelela Oluqhelekileyo Lwesitishi sokusebenza"
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
msgid "ISDN Card"
msgstr "Ikhadi ye-ISDN"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
#: library/system/src/include/hwinfo/classnames.rb:223
msgid "CTC"
msgstr "I-CTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
msgid "Channel to Channel Interface (CTC)"
msgstr "Indawo Yesitishi ukuya Kwisitishi"
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
msgid "DSL Connection"
msgstr "Umdibaniso we-DSL"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy"
msgstr "iDami"
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
msgid "Dummy Network Device"
msgstr "Isixhobo Sothungelwano se-Dami"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
#: library/system/src/include/hwinfo/classnames.rb:227
msgid "ESCON"
msgstr "I-ESCON"
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
msgid "Enterprise System Connector (ESCON)"
msgstr "Isiqhagamsheli Sesixokelelwano Seshishini"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
#: library/system/src/include/hwinfo/classnames.rb:220
msgid "Ethernet"
msgstr "I-Ethernet"
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
msgid "Ethernet Network Card"
msgstr "Ikhadi Lothungelwano lwe-Ethernet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
#: library/system/src/include/hwinfo/classnames.rb:222
msgid "FDDI"
msgstr "I-FDDI"
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
msgid "FDDI Network Card"
msgstr "Ikhadi Lothungelwano lwe-FDDI"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
msgid "FICON"
msgstr "I-FICON"
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
msgid "Fiberchannel System Connector (FICON)"
msgstr "Isiqhagamsheli Sesixokelelwano Sesitishi se-Fiber"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
msgid "HIPPI"
msgstr "I-HIPPI"
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
msgid "HIgh Performance Parallel Interface (HIPPI)"
msgstr "Indawo Enxuseneyo Yomsebenzi Ophambili "
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
msgid "Hipersockets"
msgstr "Iisokethi ze-Hiper"
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
msgid "Hipersockets Interface (HSI)"
msgstr "Indawo ye-Hipersockets"
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
msgid "ISDN Connection"
msgstr "Uqhamgashelo lwe-ISDN"
#. Device type label
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "IrDA"
msgstr "I-IrDA"
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
msgid "Infrared Network Device"
msgstr "Isixhobo Semitha Ebomvu Emide"
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
msgid "Infrared Device"
msgstr "Isixhobo Semitha Ebomvu Emide"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
#: library/system/src/include/hwinfo/classnames.rb:224
msgid "IUCV"
msgstr "I-IUCV"
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
msgid "Inter User Communication Vehicle (IUCV)"
msgstr "Isithuthi Sonxibelelwano Phakathi Kwabasebenzisi (IUCV)"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS"
msgstr "I-OSA LCS"
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
msgid "OSA LCS Network Card"
msgstr "Ikhadi Lothungelwano lwe-OSA LCS "
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
#: library/system/src/include/hwinfo/classnames.rb:219
msgid "Loopback"
msgstr "Irhintyela yangasemva"
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
msgid "Loopback Device"
msgstr "Isixhobo se-Loopback"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
#: library/system/src/include/hwinfo/classnames.rb:228
msgid "Myrinet"
msgstr "I-Myrinet"
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
msgid "Myrinet Network Card"
msgstr "Ikhadi Lothungelwano lwe-Myrinet"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
msgid "Parallel Line"
msgstr "Ucingo Olunxuseneyo"
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
msgid "Parallel Line Connection"
msgstr "Uqhagamshelo Locingo Olunxuseneyo"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
#: library/system/src/include/hwinfo/classnames.rb:226
msgid "QETH"
msgstr "I-QETH"
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
msgid "OSA-Express or QDIO Device (QETH)"
msgstr "Bonisa i-OSA okanye Isixhobo se-QDIO"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
msgid "IPv6-in-IPv4"
msgstr "I-IPv6-kwi-IPv4"
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
msgid "IPv6-in-IPv4 Encapsulation Device"
msgstr "Isixhobo Sesinxgobo se-IPv6-kwi-IPv4"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
msgid "Serial Line"
msgstr "Ucingo Lwesiriyali"
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
msgid "Serial Line Connection"
msgstr "Uqhagamshelwano Locingo Lwesiriyali"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
msgid "Token Ring"
msgstr "Isangqa Somqondiso"
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
msgid "Token Ring Network Card"
msgstr "Ikhadi Lothungelwano Lomsesana Womqondiso"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB"
msgstr "I-USB"
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
msgid "USB Network Device"
msgstr "Isixhobo Sothungelwano lwe-USB"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare"
msgstr "I-VMWare"
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
msgid "VMWare Network Device"
msgstr "Isixhobo Sothungelwano lwe-VMWare"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
msgid "Wireless"
msgstr "Akukho zingcingo"
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
msgid "Wireless Network Card"
msgstr "Ikhadi Lothungelwano Olungenangcingo"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XPNET"
msgstr "I-XPNET"
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
msgid "XP Network"
msgstr "Uthungelwano lwe-XP"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
msgid "VLAN"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
#, fuzzy
msgid "Virtual LAN"
msgstr "Abasebenzisi Benene"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#: library/system/src/include/hwinfo/classnames.rb:89
#: library/system/src/include/hwinfo/classnames.rb:101
msgid "Bridge"
msgstr "Ibrorho"
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
#, fuzzy
msgid "Network Bridge"
msgstr "Ikhadi Lothungelwano"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
msgid "TUN"
msgstr ""
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
#, fuzzy
msgid "Network TUNnel"
msgstr "Imo Yokusebenza Kumsebenzi Wothungelwano"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
#, fuzzy
msgid "TAP"
msgstr "i-UTC"
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
#, fuzzy
msgid "Network TAP"
msgstr "Ikhadi Lothungelwano"
#. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#: library/system/src/include/hwinfo/classnames.rb:152
msgid "InfiniBand"
msgstr "I-InfiniBand"
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
#, fuzzy
msgid "InfiniBand Device"
msgstr "Isixhobo Semitha Ebomvu Emide"
#. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
msgid "Unknown device"
msgstr "Asaziwa isixhobo"
#. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
msgid "DHCP address"
msgstr "Iidilesi ye-DHCP"
#. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
msgid "No IP address assigned"
msgstr "Akukho dilesi yabelweyo ye-IP "
#. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
msgid "Device Type"
msgstr "Igama Lesixhobo"
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
msgid "Device Name"
msgstr "Igama Lesixhobo"
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
msgid "IP Address"
msgstr "Idilesi ye-IP"
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
msgid "Device ID"
msgstr "I-ID Yesixhobo"
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
msgid "Connected"
msgstr "Kudityanisiwe"
#. label message
#. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
msgid "Scanning for hosts on this LAN..."
msgstr "Ukufota ngokuskena abamkeli kule-LAN_"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
msgid "&NFS Servers"
msgstr "Iiseva ze-&NFS"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
msgid "Re&mote Hosts"
msgstr "Abamkeli Aba&mgama"
#. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
msgid "&Exported Directories"
msgstr "Oovimba Beefayili &Abathunyelwa Ngaphandle"
#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: library/network/src/modules/NetworkService.rb:281
msgid ""
"Your network interfaces are currently controlled by NetworkManager\n"
"but the service to configure might not work well with it.\n"
@@ -2649,14 +2964,14 @@
#. 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:348
+#: library/network/src/modules/NetworkService.rb:346
msgid ""
"No running network detected.\n"
"Restart installation and configure network in Linuxrc\n"
"or continue without network."
msgstr ""
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
msgid ""
"No running network detected.\n"
"Configure network with YaST or Network Manager plug-in\n"
@@ -2675,147 +2990,6 @@
"Inombolo yesiqhagamshelanisi ukusuka ku 0 ukuya ku 65535.\n"
" Azivumelekanga izithuba.\n"
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
-msgid "External Zone"
-msgstr "Izowuni Yangaphandle"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
-msgid "Internal Zone"
-msgstr "Izowuni Yangaphakathi"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
-msgid "Demilitarized Zone"
-msgstr "Izowuni esuswe ukulwa"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
-#, fuzzy
-msgid "TCP"
-msgstr "i-UTC"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
-#, fuzzy
-msgid "UDP"
-msgstr "i-UPS"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
-#, fuzzy
-msgid "RPC"
-msgstr "i-PC"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:252
-#, fuzzy
-msgid "IP"
-msgstr "i-SIP"
-
-#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1158
-msgid "Unknown Zone"
-msgstr "Izowuni Engaziwayo"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"Isithuba sokudibana '%1' \n"
-"sibandakanyiwe kwiizowuni ezininzi zodonga lomlilo.\n"
-"Ukuqhuba nobumbeko kusenokubanga iimposiso.\n"
-"Kucetyiswa ukulushiya ubumbeko luze lukhandwe ngesandla \n"
-"kwifayili '/etc/sysconfig/SuSEFirewall'."
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: 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"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"Indawo yokudibana `%1`ayabelwanga nakweyiphi izowuni ye-firewall.\n"
-"Qhuba i-Firewall ye-YST2.\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
-msgid "Initializing Firewall Configuration"
-msgstr "Kundululwa Ubumbeko lwe-Firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
-msgid "Check for network devices"
-msgstr "Qwalasela izixhobo zomsebenzi wothungelwano"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Read current configuration"
-msgstr "Funda ubumbeko lwangoku"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Check possibly conflicting services"
-msgstr "Qwalasela iinkonzo ekunokwenzeka zingquzulane"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
-msgid "Checking for network devices..."
-msgstr "Kuqwalaselwa izixhobo zomsebenzi wothungelwano_"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Reading current configuration..."
-msgstr "Ukufunda ubumbeko lwangoku..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Checking possibly conflicting services..."
-msgstr "Kuqwalaselwa iinkonzo ezinokuba ziyangquzula_"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
-msgid "Writing Firewall Configuration"
-msgstr "Kubhalwa Ubumbeko lwe-Firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
-msgid "Write firewall settings"
-msgstr "Bhala imimiselo ye-Firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
-msgid "Adjust firewall service"
-msgstr "Qhelanisa inkonzo ye-firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
-msgid "Writing firewall settings..."
-msgstr "Bhala imimiselo ye-Firewall"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
-msgid "Adjusting firewall service..."
-msgstr "Kuqhelaniswa inkonzo ye-firewall"
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
-msgid "Writing settings failed"
-msgstr "Kusilele ukubhalwa kwemimiselo"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
-#, fuzzy
-msgid "Unknown protocol (%1)"
-msgstr "Ayaziwa inkqubo ye-%1."
-
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
#: library/network/src/modules/SuSEFirewallProposal.rb:167
msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2912,62 +3086,14 @@
msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
msgstr "Uhlohla isixokelelwano phezu kwe-SSH, kodwa akusivulanga isiqhagamshelanisi se-SSH kudonga lomlilo."
-#. Returns service definition.
-#. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
-#.
-#. @param [String] service name
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param map <string, list <string> > of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. $[
-#. "tcp_ports" : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports" : [ ],
-#. "rpc_ports" : [ "portmap", "ypbind" ],
-#. "ip_protocols" : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: 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:430
-#, fuzzy
-msgid "Service: %{filename}"
-msgstr "Inkonzo %1"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
-msgid "Unknown service '%1'"
-msgstr "Inkonzo Ayaziwa `%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:106
#: library/packages/src/include/packages/common.rb:135
msgid "These packages need to be installed:"
msgstr "Le mibekelelo kufuneka ihlohliwe:"
+#. the message is followed by list of required packages
#. Popup Text
#: library/packages/src/include/packages/common.rb:109
#: library/packages/src/include/packages/common.rb:137
@@ -2982,36 +3108,78 @@
msgid "&Uninstall"
msgstr "&Hlohla"
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
+#, fuzzy
+#| msgid "Checking possibly conflicting services..."
+msgid "Checking file conflicts..."
+msgstr "Kuqwalaselwa iinkonzo ezinokuba ziyangquzula_"
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
msgid "Downloading package %1 (%2)..."
msgstr "Kuthotywa umthwalo wombekelelo %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
msgid "Downloading Package"
msgstr "Kuthotywa Umthwalo Wombekelelo"
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
#, fuzzy
msgid "Package %1 is broken, integrity check has failed."
msgstr "Uqwalaselo lwengqiqo yeefayili lusilele:"
#. 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:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
msgid "Retry installation of the package?"
msgstr "Uphinda uqalisa ukuhlohla umbekelelo?"
#. 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:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
msgid "Abort the installation?"
msgstr "Ulahla ukuhlohla?"
@@ -3020,57 +3188,57 @@
#. 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:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2136
msgid "Error: %1:"
msgstr "Imposiso: %1:"
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
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:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
msgid "Uninstalling package %1 (%2)..."
msgstr "Kuyekwa ukuhlohla umbekelelo %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
msgid "Installing package %1 (%2)..."
msgstr "Kuhlohlwa umbekelelo %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Uninstalling Package"
msgstr "Kuyekwa Ukuhlohla Umbekelelo"
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
msgid "Installing Package"
msgstr "Kuhlohlwa Umbekelelo"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
msgid "Removal of package %1 failed."
msgstr "Kusilele ukushenxiswa umbekelelo we-%1."
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
msgid "Installation of package %1 failed."
msgstr "Kusilele ukuhlohlwa kombekelelo we-%1."
#. 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:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
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:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
#, fuzzy
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
@@ -3086,29 +3254,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:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
msgid "Side A"
msgstr "Icala A"
#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
msgid "Side B"
msgstr "Icala 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:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
#, 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:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
#, fuzzy
msgid "%1 (Medium %2)"
msgstr "%1 (%2)"
#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
msgid ""
"Insert\n"
"'%1'"
@@ -3117,7 +3285,7 @@
"'%1'"
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
#, fuzzy
msgid ""
"Cannot access installation media\n"
@@ -3130,7 +3298,7 @@
" Qwalasela ukuba uvimba weefayili uyafikeleleka."
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
#, fuzzy
msgid ""
"Cannot access installation media \n"
@@ -3144,53 +3312,53 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1835
msgid "Skip Autorefresh"
msgstr ""
#. 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:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
msgid "&Eject"
msgstr "&Khupha"
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
#, fuzzy
msgid "A&utomatically Eject CD or DVD Medium"
msgstr "&Fumana i-DNS Ngokuzenzekelayo"
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
msgid "Retry the installation?"
msgstr "Uphinda uzama ukuhlohla?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
msgid "Skip the medium?"
msgstr "Utsiba isilondolozi?"
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
msgid "Ignoring the bad medium..."
msgstr "Asihoywa isilondolozi esingalunganga..."
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
msgid "&URL"
msgstr "&i-URL"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
#, fuzzy
msgid "Creating Repository %1"
msgstr "Kudalwa umthombo we-%1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
#, fuzzy
msgid "An error occurred while creating the repository."
msgstr "Kwenzeke imposiso xa kudalwa ikhathalogu."
@@ -3198,9 +3366,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:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
#, fuzzy
msgid "Unable to retrieve the remote repository description."
msgstr "Akukwazeki ukubuyisela inkcazelo yekhathalogu emgama."
@@ -3208,24 +3376,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:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
msgid "An error occurred while retrieving the new metadata."
msgstr "Kwenzeke imposiso xa kubuyiselwa iinkcukacha zenkcazo ezintsha."
#. 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:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
#, fuzzy
msgid "The repository is not valid."
msgstr "Umthombo awusebenziseki."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
#, fuzzy
msgid "The repository metadata is invalid."
msgstr "Iinkcukacha zenkcazo zomthombo awusebenziseki."
@@ -3234,97 +3402,97 @@
#. 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:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2090
msgid "Retry?"
msgstr "Uyazama kwakhona?"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
#, fuzzy
msgid "Probing Repository %1"
msgstr "Kucikidwa umthombo %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
#, fuzzy
msgid "Error occurred while probing the repository."
msgstr "Kwenzeke imposiso xa kucikidwa umthombo."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
#, fuzzy
msgid "Repository probing details."
msgstr "Ubucukubhede bokucikida umthombo."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
#, fuzzy
msgid "Repository metadata is invalid."
msgstr "Iinkcukacha zenkcazo zomthombo awusebenziseki."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
#, fuzzy
msgid "Repository %1"
msgstr "&Indawo Yokuhlala Yenkangeleko Yecala:"
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "Kuthotywa umthwalo wombekelelo we-delta RPM %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
msgid "Downloading Delta RPM package"
msgstr "Kuthotywa umthwalo wombekelelo we-delta RPM"
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
msgid "Applying delta RPM package %1..."
msgstr "Kusetyenziswa umbekelelo we-delta RPM %1..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
msgid "Applying delta RPM package"
msgstr "Kusetyenziswa umbekelelo we-delta RPM"
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3070
msgid "Package: "
msgstr "Umbekelelo:"
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
msgid "Starting script %1 (patch %2)..."
msgstr "Kuqaliswa ngesikripti %1 (isikhuselwa%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
msgid "Running Script"
msgstr "Kuqhutywa Isikripti"
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
msgid "Patch: "
msgstr "Isikhuselwa:"
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
msgid "Script: "
msgstr "Isikripti:"
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
msgid "Output of the Script"
msgstr "Isiphumo seSkripti"
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
msgid ""
"Patch: %1\n"
"\n"
@@ -3333,7 +3501,7 @@
"\n"
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3343,38 +3511,38 @@
msgstr ""
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
#, fuzzy
msgid "&Skip Refresh"
msgstr "Hlaziya"
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
#, fuzzy
msgid "Downloading"
msgstr "&Thula umthwalo"
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1770
msgid "Downloading: %1"
msgstr "Kuthulwa umthwalo: %1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
msgid "Checking Package Database"
msgstr "Kuqwalaselwa Isiseko Seenkcukacha Sombekelelo"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1875
msgid "Rebuilding package database. This process can take some time."
msgstr "Kuphinda kwakhiwa isiseko seenkcukacha sombekelelo. Le nkqubo inokuthatha ixesha."
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1908
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3383,16 +3551,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Converting package database. This process can take some time."
msgstr "Kuguqulelwa seenkcukacha sombekelelo. Le nkqubo inokuthatha ixesha."
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1954
msgid "Status"
msgstr "Isimo"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1978
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3401,13 +3569,13 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2014
#, fuzzy
msgid "Reading RPM database..."
msgstr "Funda isiseko seenkcukacha..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2023
#, fuzzy
msgid "Reading Installed Packages"
msgstr "Qinisekisa Imibekelo Ehlohliweyo"
@@ -3419,30 +3587,30 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
#, fuzzy
msgid "Scanning RPM database..."
msgstr "Funda isiseko seenkcukacha..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2079
#, fuzzy
msgid "Initialization of the target failed."
msgstr "Kusilele ukundululwa kukavimba weefayili ekujoliswe kuye"
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2171
#, fuzzy
msgid "RPM database read"
msgstr "isiseko seenkcukacha se-SQLYAM"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2203
msgid "User Authentication"
msgstr "Ungqinelwano Ngobunyani Nomsebenzisi"
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2209
#, fuzzy
msgid ""
"URL: %1\n"
@@ -3451,20 +3619,20 @@
msgstr "I-URL: %1"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid "&User Name"
msgstr "&Igama Lomsebenzisi"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3005
msgid "Show &details"
msgstr "Bonisa &ubucukubhede"
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3071
msgid "Size: "
msgstr "Ubukhulu:"
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3094
msgid "Remaining time to automatic retry: %1"
msgstr ""
@@ -3538,12 +3706,12 @@
msgstr ""
#. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:418
msgid "Installing required packages failed."
msgstr "Ukuhlohlwa kwemibekelelo efunekayo kusilele."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:422
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3554,12 +3722,12 @@
" i-YaST ayinakusebenza kakuhle.\n"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
msgid "Cannot continue without installing required packages."
msgstr "Akunakuqhuba ngaphandle kokuhlohla imibekelelo efunekayo."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
@@ -3569,22 +3737,22 @@
"efunekayo, i-YaST ayinakusebenza kakuhle.\n"
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
msgid "Confirm Package License: %1"
msgstr "Qinisekisa Ilayisensi Yemibekelelo: %1"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
msgid "I &Agree"
msgstr "Ndiya&Vuma"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
msgid "I &Disagree"
msgstr "Andi&Vumi"
#. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
#, fuzzy
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
@@ -3607,7 +3775,7 @@
" iilayisensi zabo, nqomfa <b>Andivumi ngabo bonke aba</b>.</p>"
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3621,7 +3789,7 @@
" \t\t olukukroziso olwehlayo. Ukuze ubukele inkcazelo ngeli nqaku, likhethe kuludwe.\n"
" \t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3635,7 +3803,7 @@
" \t\t Ngemenyu ekubhekiselelwe kuyo, unako ngokunjalo ukutshintsha isimo sawo onke amanqaku.\n"
" \t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3647,7 +3815,7 @@
" \t\t apho unokubukela uze ukhethe khona imibekelelo yanganye nganye kwangaphakathi ekhompyutheni.\n"
" \t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
msgid ""
"<p>\n"
"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3667,149 +3835,149 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
msgid "Software Selection and System Tasks"
msgstr "Okukhethwayo Kokwangaphakathi Ekhompyutheni Nemisebenzi Yesixokelelwano"
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
#, fuzzy
msgid "(more)"
msgstr "okuninzi..."
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
#, fuzzy
msgid "Installation Successfully Finished"
msgstr "Ukuhlohla kugqityiwe.\n"
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
#, fuzzy
msgid "Package Installation Failed"
msgstr "Kuhlohlwa Umbekelelo"
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
#, fuzzy
msgid "Error Message: %1"
msgstr "Imiyalezo Yokungena: %1"
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
#, fuzzy
msgid "Failed Packages: %1"
msgstr "Iinkonzo ezisileleyo: %1."
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
#, fuzzy
msgid "Installed Packages: %1"
msgstr "&Imibekelelo Ehlohliweyo"
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
#, fuzzy
msgid "Updated Packages: %1"
msgstr "Iyonke Imibekelo Ebuyiselweyo:"
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
#, fuzzy
msgid "Removed Packages: %1"
msgstr "Iyonke Imibekelo Ebuyiselweyo:"
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
#, fuzzy
msgid "Not Installed Packages: %1"
msgstr "Inamba Yemibekelo Ehlohliweyo:"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
msgid "Packages"
msgstr "Imibekelelo"
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
#, fuzzy
msgid "Elapsed Time: %1"
msgstr "igama lomsebenzisi: %1"
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
#, fuzzy
msgid "Total Installed Size: %1"
msgstr "Ubukhulu Obuhlohliweyo:"
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
#, fuzzy
msgid "Total Downloaded Size: %1"
msgstr "Ubukhulu Besixa Esipheleleyo Somthwalo Othulwayo:"
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
#, fuzzy
msgid "Statistics"
msgstr "Inani eliqikelelwayo leNkxaso"
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:713
#, fuzzy
msgid "Installation log"
msgstr "Ukuhlohla"
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
#, fuzzy
msgid "Details"
msgstr "&Ubucukubhede"
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
#, fuzzy
#| msgid "Installing Package"
msgid "After Installing Packages"
msgstr "Kuhlohlwa Umbekelelo"
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:681
msgid "Show This Report"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:682
#, fuzzy
#| msgid "&Finish"
msgid "Finish"
msgstr "&Kugqityiwe"
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:683
msgid "Continue in the Software Manager"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:688
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:696
#, fuzzy
#| msgid "Installation Error"
msgid "Installation Report"
msgstr "Imposiso Yokuhlohla"
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:718
#, fuzzy
msgid "Installed Packages"
msgstr "&Imibekelelo Ehlohliweyo"
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:723
#, fuzzy
msgid "Updated Packages"
msgstr "Kuguqulwe Imibekelelo"
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:728
#, fuzzy
msgid "Removed Packages"
msgstr "Kuguqulwe Imibekelelo"
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:733
#, fuzzy
msgid "Remaining Packages"
msgstr "Umbekelo olahlekileyo"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:754
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -3821,7 +3989,7 @@
#. popup question, %1 stands for the package name
#. %2 is a repository name
#. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
#, fuzzy
msgid ""
"The package %1 from repository %2\n"
@@ -3841,7 +4009,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:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
#, fuzzy
msgid ""
"The file %1 from repository %2\n"
@@ -3859,18 +4027,18 @@
"Uyayisebenzisa nokuba kunjalo?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
#, fuzzy
msgid "Unsigned Package"
msgstr "Kuguqulwe Imibekelelo"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
#, fuzzy
msgid "Unsigned File"
msgstr "Yamkela Iifayili &Ezingenamtyibelo"
#. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
#, fuzzy
msgid ""
"No checksum for package %1 was found in the repository.\n"
@@ -3888,7 +4056,7 @@
"Uyawuhlohla nokuba kunjalo?"
#. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
#, fuzzy
msgid ""
"No checksum for file %1 was found in the repository.\n"
@@ -3906,70 +4074,70 @@
"Uyayisebenzisa nokuba kunjalo?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
msgid "No Checksum Found"
msgstr "Akukho Sishwankathelo Soqwalaselo Sifunyenweyo"
#. 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:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
msgid "ID: %1"
msgstr "i-ID: %1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
-#: library/packages/src/modules/SignatureCheckDialogs.rb:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
msgid "Fingerprint: %1"
msgstr "Ushicilelo lomnwe: %1"
#. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
msgid "Name: %1"
msgstr "Igama: %1"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
#, fuzzy
msgid "Created: %1"
msgstr "Dala %1$s"
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
#, fuzzy
msgid "Expires: %1"
msgstr "rsh: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
#, fuzzy
#| msgid "ID: %1"
msgid "ID: "
msgstr "i-ID: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
#, fuzzy
#| msgid "Name: %1"
msgid "Name: "
msgstr "Igama: %1"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
msgid "Fingerprint: "
msgstr "Ushicilelo lomnwe"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
#, fuzzy
msgid "Created: "
msgstr "Dala %1$s"
#. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
#, fuzzy
msgid "Expires: "
msgstr "rsh: %1"
#. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
#, fuzzy
msgid ""
"Package %1 from repository %2\n"
@@ -3991,7 +4159,7 @@
"Uyawuhlohla nokuba kunjalo?"
#. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
#, fuzzy
msgid ""
"File %1 from repository %2\n"
@@ -4014,12 +4182,12 @@
"Uyayisebenzisa nokuba kunjalo?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
msgid "Validation Check Failed"
msgstr "Uqwalaselo Loqinisekiso Lusilele"
#. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
msgid ""
"The package %1 is digitally signed\n"
"with the following unknown GnuPG key: %2.\n"
@@ -4040,7 +4208,7 @@
"Uyawuhlohla nokuba kunjalo?"
#. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
msgid ""
"The file %1\n"
"is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -4061,12 +4229,12 @@
"Uyayisebenzisa nokuba kunjalo?"
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
msgid "Unknown GnuPG Key"
msgstr "Alaziwa Iqhosha le-GnuPG"
#. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
#, fuzzy
msgid ""
"The package %1 is digitally signed\n"
@@ -4092,7 +4260,7 @@
" ukutsiba umbekelelo."
#. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
#, fuzzy
msgid ""
"The file %1 is digitally signed\n"
@@ -4118,17 +4286,17 @@
" ukuyitsiba."
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
msgid "Signed with Untrusted Public Key"
msgstr "Kutyibelwa ngeQhosha Elingathenjwayo Likawonkewonke"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
msgid "&Trust and Import the Key"
msgstr ""
#. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
msgid ""
"<p>The owner of the key may distribute updates,\n"
"packages, and package repositories that your system will trust and offer\n"
@@ -4143,7 +4311,7 @@
" ukuba abe nesixa esithile solawulo phezu kokwangaphakathi ekhompyutheni kwisixokelelwano sakho.</p>"
#. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
#, fuzzy
#| msgid ""
#| "<p>A warning dialog opens for every package that\n"
@@ -4159,7 +4327,7 @@
" imibekelelo edalwa ngumnini weqhosha <tt>%1</tt> ibonisa esi silumkiso.</p>"
#. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
msgid ""
"The following GnuPG key has been found in repository\n"
"%1\n"
@@ -4167,7 +4335,7 @@
msgstr ""
#. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
#, fuzzy
#| msgid ""
#| "The GnuPG key %1\n"
@@ -4192,17 +4360,17 @@
"iqhosha lelakhe umnini lowo phambi kokulithatha ngaphandle."
#. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
msgid "WARNING: The key has expired!"
msgstr ""
#. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
msgid "Import Untrusted GnuPG Key"
msgstr "Thatha Ngaphandle Iqhosha Likawonkewonke le-GnuPG Elingathenjwayo"
#. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
#, fuzzy
#| msgid "Trust"
msgid "&Trust"
@@ -4210,7 +4378,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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
#, fuzzy
msgid ""
"The expected checksum of file %1\n"
@@ -4233,13 +4401,13 @@
"Uyayisebenzisa nokuba kunjalo?"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
#, fuzzy
msgid "Wrong Digest"
msgstr "Izilumkiso"
#. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
#, fuzzy
msgid ""
"The checksum of file %1\n"
@@ -4258,7 +4426,7 @@
"Uyayisebenzisa nokuba kunjalo?"
#. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
#, fuzzy
msgid "Unknown Digest"
msgstr "Asaziwa isixokelelwano sefayili"
@@ -4268,85 +4436,85 @@
#. Return the description for the current stage.
#. @return [String] localized string description
#. 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:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
#, fuzzy
msgid "Installing..."
msgstr "Kuhlohlwa umqhubi..."
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
msgid "Media"
msgstr " Izilondolozi"
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
#, fuzzy
msgid "Remaining"
msgstr "Umbekelo olahlekileyo"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
msgid "Time"
msgstr "Time"
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
#, fuzzy
msgid "Actions performed:"
msgstr "Amanyathelo Avunyelwe ukwenzela Abasebenzisi:\n"
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
#, fuzzy
msgid "<p>Packages are being installed.</p>"
msgstr "<p>Nceda linda lo gama imibekelelo ihlohlwa.</p>"
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
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:652
+#: library/packages/src/modules/SlideShow.rb:653
#, fuzzy
msgid "%s Release Notes"
msgstr "Khulula Amanqaku"
#. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
+msgid "&Details"
+msgstr "&Ubucukubhede"
+
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
msgid "Slide Sho&w"
msgstr "Umbo&niso Wesilayidi"
-#. tab
-#: library/packages/src/modules/SlideShow.rb:666
-msgid "&Details"
-msgstr "&Ubucukubhede"
-
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:708
#, fuzzy
#| msgid "Perform Update"
msgid "Performing Upgrade"
msgstr "Uhlaziyo Luyenzeka"
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:711
#, fuzzy
#| msgid "Perform Installation"
msgid "Performing Installation"
msgstr "Ukuhlohla Kuyenzeka"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:746
msgid "Package Installation"
msgstr "Kuhlohlwa Umbekelelo"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:818
msgid ""
"Do you really want\n"
"to quit the installation?"
@@ -4355,7 +4523,7 @@
"ukuyeka ngenene ukuhlohla?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:830
msgid "Aborted"
msgstr "Kulahliwe"
@@ -4950,38 +5118,46 @@
msgid "Bluetooth device"
msgstr "Isixhobo se-Bluetooth"
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
msgstr ""
#. Continue/Cancel question, %1 is a coma separated list of file names
-#: library/system/src/modules/FileChanges.rb:180
+#: library/system/src/modules/FileChanges.rb:178
msgid ""
"Files %1 have been changed manually.\n"
"YaST might lose some of the changes"
msgstr ""
-#: library/system/src/modules/FileChanges.rb:193
+#. Continue/Cancel question, %1 is a file name
+#: library/system/src/modules/FileChanges.rb:180
+msgid ""
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
+msgstr ""
+
+#: library/system/src/modules/FileChanges.rb:192
#, fuzzy
msgid "Do not show this message anymore"
msgstr "Musa Ukubonisa Lo Myalezo &Kwakhona"
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
msgid ""
"File %s has been created manually.\n"
"YaST might lose this file."
-msgstr ""
-
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-msgid ""
+msgid_plural ""
"Files %s have been created manually.\n"
"YaST might lose these files."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
#. error report
#: library/system/src/modules/Initrd.rb:415
@@ -4989,7 +5165,7 @@
msgstr "Kwenzeke impazamo ngethuba lokudalwa kwe-initrd."
#. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
msgid ""
"Reboot your system\n"
"to activate the new kernel.\n"
@@ -5025,7 +5201,7 @@
"zamanani edecimal esekwe ku-16 yahlukaniswe nophawu lwekholoni"
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -5036,7 +5212,7 @@
" okanye liphelise inxalenye kanti inxalenye yokugqibela."
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -5139,13 +5315,13 @@
#. 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:738
+#: library/types/src/modules/String.rb:730
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
+#: library/types/src/modules/String.rb:846
msgid "%1/s"
msgstr ""
@@ -5233,8 +5409,8 @@
#. fallback name for the dialog title
#. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
#, fuzzy
#| msgid "Modules"
msgid "Module"
@@ -5992,67 +6168,7 @@
"Hostname %2 cannot be added."
msgstr ""
-#: src/lib/ui/srv_status_component.rb:60
-msgid "Service Status"
-msgstr "Ubulunga beNkonzo"
-
-#. 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
#, fuzzy
-#| msgid "Current Status: "
-msgid "Current status:"
-msgstr "Isimo Sangoku:"
-
-#. 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 "Kufakwa Kwimo Yokusebenza Ngethuba Lomiselo Lwenkqubo"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-#, fuzzy
-#| msgid "Reading %1 Settings"
-msgid "Reload After Saving Settings"
-msgstr "Ifunda %1 iiSethingi"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-#, fuzzy
-#| msgid "Running"
-msgid "running"
-msgstr "Iyasebenza"
-
-#: src/lib/ui/srv_status_component.rb:220
-#, fuzzy
-#| msgid "S&top now ..."
-msgid "Stop now"
-msgstr "Ye&ka ngoku ..."
-
-#. 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 "&Qalisa ngoku ..."
-
-#, fuzzy
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "Isilondolozi sekhathalogu esichanekileyo asikwazanga kugxumekeka."
Modified: trunk/yast/xh/po/bootloader.xh.po
===================================================================
--- trunk/yast/xh/po/bootloader.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/bootloader.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -16,695 +16,575 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
msgid "Boot loader configuration module"
msgstr "Imodyuli yobumbeko yomlayishi Wokumisela Inkqubo"
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "Isishwankathelo sobumbeko lomlayishi womiselo lwenkqubo"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+#, fuzzy
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "Ngenxa y"
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "Imimiselo Yomlayishi Womiselo Lwenkqubo"
+
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
#, fuzzy
-msgid "Delete a global option"
-msgstr "&Ummiselo Onobucukubhede Weendawo Zokuhlala"
+msgid "Device map must contain at least one device"
+msgstr "Udidi kufuneka luqulathe noko i-printer enye."
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
#, fuzzy
-msgid "Set a global option"
-msgstr "&Ummiselo Onobucukubhede Weendawo Zokuhlala"
+msgid "Disk order settings"
+msgstr "Imimiselo yesihluzi"
-#. command line help text for print action
-#: src/clients/bootloader.rb:75
-msgid "Print value of specified option"
-msgstr "Shicilela ixabiso lesikhethwa esixeliweyo"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "Iid&iski"
-#. command line help text for an option
-#: src/clients/bootloader.rb:83
-msgid "The key of the option"
-msgstr "Iqhosha lesikhethwa"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "&Isixhobo"
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The value of the option"
-msgstr "Ixabiso lesikhethwa"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+msgid "Selected bootloader partition %s is not available any more."
+msgstr ""
-#. command line error report
-#: src/clients/bootloader.rb:152
-msgid "Value was not specified."
-msgstr "Ixabiso alixelwanga."
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
+msgid "Saving bootloader configuration..."
+msgstr "Kugcinwa ubumbeko lomlayishi womiselo lwenkqubo..."
-#. command line error report
-#: src/clients/bootloader.rb:174
-msgid "Option was not specified."
-msgstr "Isikhethwa asixelwanga."
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:102
+msgid ""
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
+msgstr ""
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
-#, fuzzy
-#| msgid "Value: %1"
-msgid "Value: %s"
-msgstr "Ixabiso: %1"
+#. 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:115
+msgid "The system will reboot now..."
+msgstr "Isixokelelwano siza kumisela inkqubo kwakhona ngoku..."
-#. command line error report
-#: src/clients/bootloader.rb:183
-msgid "Specified option does not exist."
-msgstr "Isikhethwa esixeliweyo asikho kwasona."
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "&Umlayishi Womiselo Lwenkqubo"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>Imenyu Yokumisela Inkqubo</b></big><br></p>"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:24
-#, fuzzy
-msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active even\n"
-"if the boot loader is installed in the MBR.</p>"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
msgstr ""
-"<b>Seta iFlegi esebenzayo kwiTheyibhile yeSahlulelo yeSahlulelo sokuMisela Inkqubo</b><br>\n"
-"Ukwenza isahlulelo esiqulethe isifaki sokumisela inkqubo sisebenze. Ikhowudi yohlobo oluthile le-MBR liza\n"
-" kumisela inkqubo kwisahlulelo esisebenzayo. I-BIOSes endala ifuna isahlulelo esinye esisebenzayo nokuba\n"
-" isifaki somiselo lwenkqubo siyahlohlwa kwi-MBR.</p>"
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
-msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
msgstr ""
-"<p><b>Liyaphela ixesha kwimizuzwana elishumi</b><br>\n"
-"Lichaza ukuba ixesha nelowuda yokuqalisa iza kulinda ide ibe iqalisiwe i-kernel.</p>\n"
-#: src/include/bootloader/grub/helps.rb:33
+#: src/lib/bootloader/generic_widgets.rb:43
#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr "(okuhlala kukhona)"
+
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
msgstr ""
-"<p> Ngokucinezela <b>Seta njengeSiseko</b> uphawula\n"
-"icandelo elikhethiweyo njengesiseko. Xa uqalisa, ilowuda yokuqalisa iza kunikezela \n"
-"a imenyu yokuqalisa ize ilindele umsebenzisi ukuba akhethe i-kernel okanye enye \n"
-"i-OS ukuqalisa. Ukuba iqhosha licinezelwe phambi kokuphela kwexesha, \n"
-"i-kernel esisiseko okanye i-OS iza kuqaliswa. Ulungelelaniso lwamacandelo \n"
-"kwimenyu yelowuda yokuqalisa lungatshintshwa kusetyenziswa amaqhosha <b>Phezulu</b> kunye <b>Phantsi</b>.</p>\n"
+"\n"
+"Ukuba awuhlohli nawuphi umlayishi womiselo lwenkqubo, isixokelelwano\n"
+" sisenokungaqalisi.\n"
+" \n"
+" Uyaqhuba?\n"
-#: src/include/bootloader/grub/helps.rb:41
+#: src/lib/bootloader/generic_widgets.rb:75
#, fuzzy
msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
msgstr ""
-"<p><big><b>Bhala ikhowudi yoHlobo oluthile lokuMisela inkqubo kwi-MBR</b></big><br>\n"
-"Ukubuyisela irhekhodi enkulu yokumisela inkqubo yediski yakho ngekhowudi yohlobo oluthile (ikhowudi ezimeleyo ye-OS emisela\n"
-" inkqubo isahlulelo esisebenzayo), khetha <b>Bhala Ikhowudi yoHlobo oluthile lokuMisela inkqubo kwi-MBR</b>.</p>"
+"<p><big><b>Uhlobo Lomlayishi Womiselo Lwenkqubo</b></big><br>\n"
+"Ukukhetha ukuba ingaba makahlolwe na umlayishi womiselo lwenkqubo nokuba ngowuphi umlayishi womiselo lwenkqubo ofanele ukuhlohlwa,\n"
+" sebenzisa <b>Umlayishi Womiselo Lwenkqubo</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
-"<b>Boot from Root Partition</b>.</p>"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "Uhlobo Lomlayishi Womiselo Lwenkqubo %1"
+
+#: src/lib/bootloader/grub2.rb:109
+#, fuzzy
+#| msgid "LDAP secure port: %1"
+msgid "Enable Trusted Boot: %1"
+msgstr "Isiqhagamshelanisi sokhuselo lwe-LDAP: %1"
+
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+#, fuzzy
+#| msgid "Yes"
+msgid "yes"
+msgstr "Ewe"
+
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
msgstr ""
-"<p><b>Misela inkqubo ukusuka kwiSahlulelo sokuMisela inkqubo</b> kokunokukhethwa kukokona okucetyiswayo, okunye kuku\n"
-"<b>Misela inkqubo ukusuka kwiSahlulelo seNgcambu</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
-"installed on your computer</p>"
+#: src/lib/bootloader/grub2.rb:116
+#, fuzzy
+msgid "Status Location: %1"
+msgstr "Indawo yokuhlala: %1"
+
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "Ukulandelelaniswa Kokungaphakathi Eqokobheni Lekhompyutha %1"
+
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
msgstr ""
-"<p><b>Ukumisela inkqubo ukusuka kwiRhekhodi Enkulu yokuMisela inkqubo</b> akucetyiswa ukuba unesinye isixokelelwano esisebenzayo\n"
-"esihlohlwe kwikhompyutha yakho</p>"
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
-"to start this section.</p>"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
msgstr ""
-"<p><b> Ukumisela ukusuka kwiSahlulelo seNgcambu</b> kokunokukhethwa okucetyisiweyo nanini xa kukho isahlulelo\n"
-"esifanelekileyo. Khetha nokuba <b>Seta iFlegi esebenzayo kwiTheyibhile yesaHlulelo yesaHlulelo sokuMisela inkqubo</b> kwaye <b>Bhala Ikhowudi yoHlobo oluthile yokuMisela inkqubo kwi-MBR</b>\n"
-" ko <b>kuNokukhethwa kuko kwesiFaki sokuMisela inkqubo</b> ukuhlaziya irhekhodi enkulu yokumisela inkqubo ukuba oko kuyimfuneko okanye yakha omnye umlawuli wakho wokumisela inkqubo\n"
-" ukuba aqalise eli candelo.</p>"
-#: src/include/bootloader/grub/helps.rb:56
-msgid ""
-"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
-"logical partition and the /boot partition is missing</p>"
+#: src/lib/bootloader/grub2.rb:216
+msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p><b>Izahlulelo zokuMisela inkqubo yesiQhelo</b> ikuvumela ukuba ukhethe isahlulelo sokumisela inkqubo ukusuka ku-.</p>"
+#: src/lib/bootloader/grub2.rb:220
+msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:62
-msgid ""
-"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
-"enable to write GRUB to MBR of both disks.</p>"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:65
-#, fuzzy
-msgid ""
-"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+#: src/lib/bootloader/grub2.rb:235
+msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
msgstr ""
-"<p><b>Umda woQhagamshelwano lweSiriyali</b> ikuvumela ukuba uchaze imida emayisetyenziswe\n"
-"kwisixhasi sesiriyali. Nceda khangela ukungqinelwa ngamaxwebhu e-grub (<code>ulwazi lwe-grub</code>) ngeenkcukacha.</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 (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>"
+#: src/lib/bootloader/grub2.rb:241
+msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
msgstr ""
-"<p><b>Ingcaciso yesiTishi</b></p><br>\n"
-"Ichaza uhlobo lwesitishi ofuna ukusisebenzisa. Ngesiriyali yesitishi (umz. Isixhasi sesiriyali),\n"
-" kufuneka ubalule <code>isiriyali</code>. Usengagqithisela <code>isixhasi</code> ku\n"
-" myalelo, njenge <code>sixhasi sesiriyali</code>. Kule meko, isitishi apho\n"
-" ucinezela naliphi na iqhosha siza kukhethwa njengesitishi se-GRUB.</p> "
-#: src/include/bootloader/grub/helps.rb:75
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
+#: src/lib/bootloader/grub2.rb:246
+msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
msgstr ""
-"<p><b>Amacandelo Okubuyela emva ukuba okuhlala kukhona akuphumeleli</b> kuqulethe uluhlu lwamanani ecandelo\n"
-"aza kusetyenziselwa ukumisela inkqubo xa kunokuthi kanti icandelo elihlala likhona alikwazi kumiselwa inkqubo.</b> "
-#: src/include/bootloader/grub/helps.rb:78
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>Ukukhetha <b>Fihla iMenyu kuMiselo lwenkqubo</b> kuza kufihla imenyu yokumisela inkqubo.</p>"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr ""
-#: src/include/bootloader/grub/helps.rb:81
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
#, fuzzy
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"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>Ipassword yeMenyu yeNdawo</b><br>\n"
-"Chaza ipassword eza kufuneka ukusebenzisa imenyu yokumisela inkqubo. i-YaST izakwamkela kuphela ipaswedi ukuba uyayiphinda\n"
-" ku <b>Tayipa kwakhona iPaswedi</b>.</p>"
+msgid "Change Location: %s"
+msgstr "Indawo yokuhlala: %1"
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
#, fuzzy
+msgid "&Timeout in Seconds"
+msgstr "Ixesha lokuphuma Ngokwemizuzwana"
+
+#: src/lib/bootloader/grub2_widgets.rb:57
msgid ""
-"<p><big><b>Disks Order</b></big><br>\n"
-"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.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
msgstr ""
-"<p><big><b>Ukulandelelaniswa kwee-Diski</b></big><br>\n"
-"Ukuxela ukulandelelaniswa kweediski ngokokulandelelaniswa kwi-BIOS, sebenzisa\n"
-" amaqhosha athi <b>Phezulu</b> kunye <b>Ezantsi</b> ukuze uphinde ulandelise iidiski.</p>"
+"<p><b>Liyaphela ixesha kwimizuzwana elishumi</b><br>\n"
+"Lichaza ukuba ixesha nelowuda yokuqalisa iza kulinda ide ibe iqalisiwe i-kernel.</p>\n"
-#: src/include/bootloader/grub/helps.rb:101
-msgid "Boot Loader Locations"
-msgstr "Iindawo Zokuhlala Umlayishi Womiselo Lwenkqubo"
-
-#: src/include/bootloader/grub/helps.rb:102
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
#, fuzzy
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr "Misela iFlegi esebenzayo Kwisahlulo seTheyibhile ukwenzela Isahlulelo Aokumisela Inkqubo"
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
+#: src/lib/bootloader/grub2_widgets.rb:93
#, fuzzy
-msgid "&Timeout in Seconds"
-msgstr "Ixesha lokuphuma Ngokwemizuzwana"
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
+msgstr ""
+"<b>Seta iFlegi esebenzayo kwiTheyibhile yeSahlulelo yeSahlulelo sokuMisela Inkqubo</b><br>\n"
+"Ukwenza isahlulelo esiqulethe isifaki sokumisela inkqubo sisebenze. Ikhowudi yohlobo oluthile le-MBR liza\n"
+" kumisela inkqubo kwisahlulelo esisebenzayo. I-BIOSes endala ifuna isahlulelo esinye esisebenzayo nokuba\n"
+" isifaki somiselo lwenkqubo siyahlohlwa kwi-MBR.</p>"
-#: src/include/bootloader/grub/helps.rb:106
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
#, fuzzy
-msgid "&Default Boot Section"
-msgstr "Icandelo Lokumisela Inkqubo Elihlala Likhona"
-
-#: src/include/bootloader/grub/helps.rb:107
-#, fuzzy
msgid "Write &generic Boot Code to MBR"
msgstr "Bhala iKhowudi gabalala yokuMisela Inkqubo kwi-MBR"
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Custom Boot Partition"
-msgstr "Isahlulelo Sokulungisela Ukumiselwa Kwenkqubo"
-
-#: src/include/bootloader/grub/helps.rb:109
-msgid "Boot from Master Boot Record"
-msgstr "Misela Inkqubo evela Kwingxelo Yomalathindlela Wokumisela Inkqubo"
-
-#: src/include/bootloader/grub/helps.rb:110
-msgid "Boot from Root Partition"
-msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
-
-#: src/include/bootloader/grub/helps.rb:111
-msgid "Boot from Boot Partition"
-msgstr "Misela Inkqubo evela Kwisahlulelo Sokumisela Inkqubo"
-
-#: src/include/bootloader/grub/helps.rb:112
+#: src/lib/bootloader/grub2_widgets.rb:124
#, fuzzy
-msgid "Boot from Extended Partition"
-msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
+msgstr ""
+"<p><big><b>Bhala ikhowudi yoHlobo oluthile lokuMisela inkqubo kwi-MBR</b></big><br>\n"
+"Ukubuyisela irhekhodi enkulu yokumisela inkqubo yediski yakho ngekhowudi yohlobo oluthile (ikhowudi ezimeleyo ye-OS emisela\n"
+" inkqubo isahlulelo esisebenzayo), khetha <b>Bhala Ikhowudi yoHlobo oluthile lokuMisela inkqubo kwi-MBR</b>.</p>"
-#: src/include/bootloader/grub/helps.rb:113
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
#, fuzzy
-msgid "Serial Connection &Parameters"
-msgstr "Imida Yomdibaniso Wolandelelano"
-
-#: src/include/bootloader/grub/helps.rb:114
-#, fuzzy
-msgid "Fallback Sections if Default fails"
-msgstr "Amacandelo Okubuyela Emva xa okuhlala kukhona Kuselela"
-
-#: src/include/bootloader/grub/helps.rb:115
-#, fuzzy
msgid "&Hide Menu on Boot"
msgstr "Fihla Imenyu Kumiselo Lwenkqubo"
-#: src/include/bootloader/grub/helps.rb:116
-#, fuzzy
-msgid "Pa&ssword for the Menu Interface"
-msgstr "Igama lokugqithisa Lesithuba Somdibaniso Semenyu"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>Ukukhetha <b>Fihla iMenyu kuMiselo lwenkqubo</b> kuza kufihla imenyu yokumisela inkqubo.</p>"
-#: src/include/bootloader/grub/helps.rb:117
-#, fuzzy
-msgid "Debugg&ing Flag"
-msgstr "Kucokiswa iFlegi"
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+msgid "Pro&be Foreign OS"
+msgstr ""
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
-msgid "Prot&ect Boot Loader with Password"
-msgstr "Khu&sela Umlayishi Womiselo Lwenkqubo Ngegama Lokugqithisa"
+#: src/lib/bootloader/grub2_widgets.rb:176
+msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+msgstr ""
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
#, fuzzy
-#| msgid "Security Event Notification"
-msgid "P&rotect Entry Modification Only"
-msgstr "Ukwazisa Isiganeko Sokhuseleko"
+msgid "O&ptional Kernel Command Line Parameter"
+msgstr "Umda womgca womyalelo we-kernel ekhethwa ngokuzithandela"
-#. text entry
-#: src/include/bootloader/grub/options.rb:85
-msgid "&Password"
-msgstr "&Igama lokugqithisa"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr "<p><b>Iparamita yoMgca weKhomandi ye-Kernel eNokukhethwa</b> ikwenza uchaze iiparamita ezizizongezelelo ukudlula i-kernel.</p>"
-#. text entry
-#: src/include/bootloader/grub/options.rb:88
-msgid "Re&type Password"
-msgstr "Phinda&uchwetheze Igama lokugqithisa"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+msgid "&Protective MBR flag"
+msgstr ""
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
-#, fuzzy
-msgid "Boot from &Root Partition"
-msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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/grub/options.rb:224
+#. TRANSLATORS: set flag on disk
+#: src/lib/bootloader/grub2_widgets.rb:246
#, fuzzy
-msgid "Boo&t from Boot Partition"
-msgstr "Misela Inkqubo evela Kwisahlulelo Sokumisela Inkqubo"
+#| msgid "1st"
+msgid "set"
+msgstr "Eyokuqala"
-#: src/include/bootloader/grub/options.rb:235
+#. TRANSLATORS: remove flag from disk
+#: src/lib/bootloader/grub2_widgets.rb:248
#, fuzzy
-msgid "C&ustom Boot Partition"
-msgstr "Isahlulelo Sokulungisela Ukumiselwa Kwenkqubo"
+#| msgid "Remove"
+msgid "remove"
+msgstr "Shenxisa"
-#: 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 "Indawo Yokuhlala Umlayishi Womiselo Lwenkqubo"
-
-#: 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 "Misela Inkqubo evela Kwingxelo Yomalathindlela Wokumisela Inkqubo"
-
-#: src/include/bootloader/grub/options.rb:263
-#, fuzzy
-msgid "Boot from &Extended Partition"
-msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
-
-#: src/include/bootloader/grub/options.rb:312
-msgid "Enable Red&undancy for MD Array"
+#. TRANSLATORS: do not change flag on disk
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
+msgid "do not change"
msgstr ""
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
#, fuzzy
-#| msgid "Boot Loader Options"
-msgid "Boot Code Options"
-msgstr "Izikhethwa Zomlayishi Womiselo Lwenkqubo"
+#| msgid "Enable &Layer 2 Support"
+msgid "Enable &Secure Boot Support"
+msgstr "Nika Isakhono &Kwinkxaso Yomaleko 2"
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
+#: src/lib/bootloader/grub2_widgets.rb:272
#, fuzzy
-#| msgid "Other Kernel &Parameters"
-msgid "Kernel Parameters"
-msgstr "Eminye Imida&ye-Kernel"
+#| msgid "LDAP secure port: %1"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "Isiqhagamshelanisi sokhuselo lwe-LDAP: %1"
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
#, fuzzy
-#| msgid "Boot Loader Options"
-msgid "Bootloader Options"
-msgstr "Izikhethwa Zomlayishi Womiselo Lwenkqubo"
-
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-msgid "Boot Loader Options"
-msgstr "Izikhethwa Zomlayishi Womiselo Lwenkqubo"
-
-#: src/include/bootloader/grub2/dialogs.rb:190
-#, fuzzy
-#| msgid "Secure"
-msgid "Secure Boot"
-msgstr "Ukhuseleko"
-
-#: src/include/bootloader/grub2/dialogs.rb:196
-#, fuzzy
#| msgid "Enable &Layer 2 Support"
-msgid "Enable &Secure Boot Support"
+msgid "Enable &Trusted Boot Support"
msgstr "Nika Isakhono &Kwinkxaso Yomaleko 2"
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
-#, fuzzy
-#| msgid "Boot Loader Location"
-msgid "Boot &Loader Location"
-msgstr "Indawo Yokuhlala Umlayishi Womiselo Lwenkqubo"
-
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
-msgid "Choose partition where is boot sequence installed."
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
msgstr ""
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack <jplack(a)suse.de>
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
-msgstr "<p><b>Iparamita yoMgca weKhomandi ye-Kernel eNokukhethwa</b> ikwenza uchaze iiparamita ezizizongezelelo ukudlula i-kernel.</p>"
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
+msgid "Prot&ect Boot Loader with Password"
+msgstr "Khu&sela Umlayishi Womiselo Lwenkqubo Ngegama Lokugqithisa"
-#: src/include/bootloader/grub2/helps.rb:26
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
#, fuzzy
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
-msgstr "<p><b>Imowudi ye-Vga</b> ichaza imowudi ye-VGA ukwenzela <i>isixhasi</i> i-kernel kufuneka isete xa imisela inkqubo.</p>"
+#| msgid "Security Event Notification"
+msgid "P&rotect Entry Modification Only"
+msgstr "Ukwazisa Isiganeko Sokhuseleko"
-#: src/include/bootloader/grub2/helps.rb:29
-msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
msgstr ""
-#: 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 ""
+#. text entry
+#: src/lib/bootloader/grub2_widgets.rb:339
+msgid "Re&type Password"
+msgstr "Phinda&uchwetheze Igama lokugqithisa"
-#: src/include/bootloader/grub2/helps.rb:38
-#, fuzzy
-msgid "O&ptional Kernel Command Line Parameter"
-msgstr "Umda womgca womyalelo we-kernel ekhethwa ngokuzithandela"
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "Igama lokugqithisa alifanelanga kuba likhamte."
-#: src/include/bootloader/grub2/helps.rb:39
-#, fuzzy
-msgid "&Vga Mode"
-msgstr "Imo Yokusebenza ye-VGA"
-
-#: src/include/bootloader/grub2/helps.rb:40
-msgid "Probe Foreign OS"
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
msgstr ""
+"'Igama lokugqithisa' uze 'Uchwetheze kwakhona igama lokugqithisa'\n"
+"musa ukungqamanisa. Phinda uchwetheze igama lokugqithisa."
-#: src/include/bootloader/grub2/helps.rb:41
-msgid "Protective MBR flag"
-msgstr ""
-
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2, %3 amasuntsu (imo yokusebenza %4)"
-
-#: src/include/bootloader/grub2/options.rb:68
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
#, fuzzy
-msgid "Standard 8-pixel font mode."
-msgstr "Iprinta eseMgangathweni"
-
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-msgid "Text Mode"
-msgstr "Imo Yokusebenza Ngesiqendu"
-
-#: src/include/bootloader/grub2/options.rb:72
-#, fuzzy
-#| msgid "&Unspecified"
-msgid "Unspecified"
-msgstr "&Engabalulwanga"
-
-#. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
-#, fuzzy
-#| msgid "1st"
-msgid "set"
-msgstr "Eyokuqala"
-
-#. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
-#, fuzzy
-#| msgid "Remove"
-msgid "remove"
-msgstr "Shenxisa"
-
-#. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
-msgid "do not change"
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"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>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
msgstr ""
+"<p><b>Ipassword yeMenyu yeNdawo</b><br>\n"
+"Chaza ipassword eza kufuneka ukusebenzisa imenyu yokumisela inkqubo. i-YaST izakwamkela kuphela ipaswedi ukuba uyayiphinda\n"
+" ku <b>Tayipa kwakhona iPaswedi</b>.</p>"
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
#, fuzzy
-#| msgid "Autodetected card"
-msgid "Autodetect by grub2"
-msgstr "Ikhadi elifunyenwe ngokuzenzekelayo"
-
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
-#, fuzzy
msgid "Choose new graphical theme file"
msgstr "Ifayili Yemenyu Esabugrafu"
-#: src/include/bootloader/grub2/options.rb:258
+#: src/lib/bootloader/grub2_widgets.rb:498
#, fuzzy
msgid "Use &graphical console"
msgstr "Isiriyali Yesixhasi"
-#: src/include/bootloader/grub2/options.rb:265
+#: src/lib/bootloader/grub2_widgets.rb:503
#, fuzzy
#| msgid "Conflict Resolution:"
msgid "&Console resolution"
msgstr "Isisombululo Songquzulwano:"
-#: src/include/bootloader/grub2/options.rb:273
+#: src/lib/bootloader/grub2_widgets.rb:508
#, fuzzy
msgid "&Console theme"
msgstr "Iingxoxo ezingasebenziyo"
-#: src/include/bootloader/grub2/options.rb:292
+#: src/lib/bootloader/grub2_widgets.rb:539
#, fuzzy
+#| msgid "Autodetected card"
+msgid "Autodetect by grub2"
+msgstr "Ikhadi elifunyenwe ngokuzenzekelayo"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
+#, fuzzy
msgid "Use &serial console"
msgstr "Isiriyali Yesixhasi"
-#: src/include/bootloader/grub2/options.rb:299
+#: src/lib/bootloader/grub2_widgets.rb:554
#, fuzzy
msgid "&Console arguments"
msgstr "Iingxoxo ezingasebenziyo"
-#. 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."
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+#, fuzzy
+msgid "&Default Boot Section"
+msgstr "Icandelo Lokumisela Inkqubo Elihlala Likhona"
+
+#: src/lib/bootloader/grub2_widgets.rb:575
+#, fuzzy
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
msgstr ""
+"<p> Ngokucinezela <b>Seta njengeSiseko</b> uphawula\n"
+"icandelo elikhethiweyo njengesiseko. Xa uqalisa, ilowuda yokuqalisa iza kunikezela \n"
+"a imenyu yokuqalisa ize ilindele umsebenzisi ukuba akhethe i-kernel okanye enye \n"
+"i-OS ukuqalisa. Ukuba iqhosha licinezelwe phambi kokuphela kwexesha, \n"
+"i-kernel esisiseko okanye i-OS iza kuqaliswa. Ulungelelaniso lwamacandelo \n"
+"kwimenyu yelowuda yokuqalisa lungatshintshwa kusetyenziswa amaqhosha <b>Phezulu</b> kunye <b>Phantsi</b>.</p>\n"
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
-msgid "Select File"
-msgstr "Khetha Ifayili"
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "Indawo Yokuhlala Umlayishi Womiselo Lwenkqubo"
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
+
+#: src/lib/bootloader/grub2_widgets.rb:692
#, fuzzy
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "Ngenxa y"
+msgid "Boo&t from Boot Partition"
+msgstr "Misela Inkqubo evela Kwisahlulelo Sokumisela Inkqubo"
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
-msgid "Boot Loader Settings"
-msgstr "Imimiselo Yomlayishi Womiselo Lwenkqubo"
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
-#. message
-#: src/include/bootloader/routines/dialogs.rb:142
-msgid "There are no options to set for the current boot loader."
-msgstr "Akukho zikhethwa zokumisela umlayishi wokumisela inkqubo wangoku"
+#: src/lib/bootloader/grub2_widgets.rb:694
+#, fuzzy
+msgid "Boot from &Master Boot Record"
+msgstr "Misela Inkqubo evela Kwingxelo Yomalathindlela Wokumisela Inkqubo"
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
-msgid "&Boot Loader"
-msgstr "&Umlayishi Womiselo Lwenkqubo"
+#: src/lib/bootloader/grub2_widgets.rb:695
+#, fuzzy
+msgid "Boot from &Extended Partition"
+msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
+#: src/lib/bootloader/grub2_widgets.rb:706
+#, fuzzy
+msgid "C&ustom Boot Partition"
+msgstr "Isahlulelo Sokulungisela Ukumiselwa Kwenkqubo"
+
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "Ukulandelelanisa Idiski"
+
+#: src/lib/bootloader/grub2_widgets.rb:725
+#, fuzzy
msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
+"<p><big><b>Disks Order</b></big><br>\n"
+"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.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
msgstr ""
-"\n"
-"Ukuba awuhlohli nawuphi umlayishi womiselo lwenkqubo, isixokelelwano\n"
-" sisenokungaqalisi.\n"
-" \n"
-" Uyaqhuba?\n"
+"<p><big><b>Ukulandelelaniswa kwee-Diski</b></big><br>\n"
+"Ukuxela ukulandelelaniswa kweediski ngokokulandelelaniswa kwi-BIOS, sebenzisa\n"
+" amaqhosha athi <b>Phezulu</b> kunye <b>Ezantsi</b> ukuze uphinde ulandelise iidiski.</p>"
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "Hle&la Iifayili Zobumbeko"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+#| msgid "Other Kernel &Parameters"
+msgid "&Kernel Parameters"
+msgstr "Eminye Imida&ye-Kernel"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
-msgid "&Propose New Configuration"
-msgstr "&Ceba Ubumbeko Olutsha"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+#| msgid "Boot Loader Options"
+msgid "Boot Co&de Options"
+msgstr "Izikhethwa Zomlayishi Womiselo Lwenkqubo"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
-msgid "&Start from Scratch"
-msgstr "&Qalisa ukusuka Phantsi"
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+#| msgid "Boot Loader Options"
+msgid "Boot&loader Options"
+msgstr "Izikhethwa Zomlayishi Womiselo Lwenkqubo"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
-msgid "&Reread Configuration from Disk"
-msgstr "&Phinda ufunde Ubumbeko olusuka kwiDiski"
+#: src/lib/bootloader/grub2efi.rb:81
+#, fuzzy
+#| msgid "LDAP secure port: %1"
+msgid "Enable Secure Boot: %1"
+msgstr "Isiqhagamshelanisi sokhuselo lwe-LDAP: %1"
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
-msgid "Restore MBR of Hard Disk"
-msgstr "Phinda ugcine i-MBR Yokuseqokobheni Lekhompyutha"
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+#, fuzzy
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr ""
+"Ngenxa yokwahlulela, umlayishi womiselo lwenkqubo \n"
+"akakwazi kuhlohleka kakuhle."
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
-msgid "Write bootloader boot code to disk"
-msgstr "Bhala ikhowudi yomiselo lwenkqubo yomlayishi womiselo lwenkqubo ediskini"
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "Musa ukuhlohla nawuphi umlayishi womiselo lwenkqubo"
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "Ezinye"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "Kumiselwa inkqubo"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
-msgid "MBR restored successfully."
-msgstr "i-MBR iphinde yagcinwa ngempumelelo."
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "&Kumiselwa inkqubo"
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Failed to restore MBR."
-msgstr "Kusilele ukuphinda kugcinwe i-MBR."
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "Akukho mlayishi womiselo lwenkqubo ukhethelwe ukuhlohla. Isixokelelwano sakho sisenokungakwazi ukumiselwa inkqubo."
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
-#, fuzzy
-msgid "Writing bootloader settings failed."
-msgstr "Kusilele ukubhalwa kwemimiselo yomsebenzi wothungelwano."
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Ngenxa y"
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
-msgid "Boot &Loader Options"
-msgstr "Izikhethwa &Zomlayishi Womiselo Lwenkqubo"
-
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-msgid "Boot Loader Installation &Details"
-msgstr "Ubucukubhede Bokuhlohla Umlayishi &Womiselo Lwenkqubo"
-
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
msgid ""
"<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
+"Reading current configuration...</P>"
msgstr ""
"<P><BIG><B>Isichobo Sobumbeko Lomlayishi Womiselo Lwenkqubo</B></BIG><BR>\n"
"Guqula imimiselo yomlayishi wakho womiselo lwenkqubo.</P>"
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
msgid ""
"<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
"Please wait...<br></p>"
@@ -712,655 +592,616 @@
"<P><B><BIG>Kugcinwa Ubumbeko Lomlayishi Womiselo Lwenkqubo</BIG></B><BR>\n"
"nceda linda...<br></p>"
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the current \n"
-"configuration and propose a new configuration, start from scratch, or reread\n"
-"the configuration saved on your disk. %1</P>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
msgstr ""
-"<P>Ukusuka <B>Kwenye</B>,\n"
-"unako ukuhlela ngesandla iifayili zobumbeko lomlayishi womiselo lwenkqubo, usule ubumbeko \n"
-" lwangoku uze uceba ubumbeko olutsha, qalisa ukusuka phantsi, okanye phinda ufunde\n"
-" ubumbeko olugcinwe kwidiski yakho. %1</P>"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+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 ""
-"<P>Ukuhlela iifayili zobumbeko lomlayishi wokumisela inkqubo\n"
-"ngesandla, nqomfa <B>Hlela Iifayiki Zobumbeko</B>.</P>"
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr ""
-"<P> Kwitheyibhile, icandelo ngalinye limele into enye\n"
-"kwimenyu yokumisela inkqubo.</P>"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+#, fuzzy
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "Akho ngcambu yesixhobo ifunyenweyo"
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
msgstr ""
-"<P> Cinezela <B>Hlela</B> ukuboonisa iimpawu \n"
-"zecandelo elikhethiweyo.</P>"
-#. help 3/4
-#: 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"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
-"<P> Ngokucinezela <b>Ukumisela Njengokuhlala Kukhona</b>, phawula icandelo \n"
-"elikhethiweyo njengokuhlala kukhona. Xa kumiselwa inkqubo, umlayishi womiselo lwenkqubo uya kunika \n"
-" imenyu yomiselo lwenkqubo aze alinde umsebenzisi ukuba akhethe i-kernel okanye enye \n"
-" i-OS yokumisela. Ukuba akukho qhosha licinezelwe phambi kwexesha lokuphuma, i-\n"
-"kernel ehlala ikhona okanye i-OS ziya kumiselwa inkqubo. Imenyu yokulandeliswa kwamacandelo kumlayishi womiselo lwenkqubo\n"
-" inokuguqulwa ngokusebenzisa <B>Amaqhosha</B> ka-Phezulu <B>no-Ezantsi</B> </P>"
-#. help 4/4
-#: 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>"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
msgstr ""
-"<P>Cinezela <B>Fakela</B> ukudala icandelo lomlayishi womiselo lwenkqubo omtsha\n"
-"okanye <B>Cima</B> ukuze ucime icandelo elikhethiweyo.</P>"
-#. 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:107
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
+#: src/modules/BootSupportCheck.rb:207
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
msgstr ""
-"<p><big><b>Indawo Yokuhlala Umlayishi Womiselo Lwenkqubo</b></big><br>\n"
-"Umphathi womiselo lwenkqubo (%1) unako ukuhlohlwa ngeendlela ezilandelayo:</p>"
-#. custom bootloader help text, 2 of 7
-#: 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"
-"on the computer.</p>"
-msgstr ""
-"<p>- Apha <b>kwiNgxelo Yomiselo Lwenkqubo Lomalathindlela </b> (MBR).\n"
-"Oku akucetyiswa ukuba kukho esinye isixokelelwano sokusebenza esihlohliweyo\n"
-" kwikhompyutha.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "Qwalasela umlayishi womiselo lwenkqubo"
-#. custom bootloader help text, 3 of 7
-#: 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"
-"partition. This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- Apha <b>Kwicandelo Lokumisela Inkqubo</b> lwalo <tt>/umiselo lwenkqubo</tt> okanye <tt>/</tt> (ingcambu yamandla) \n"
-" isahlulelo. Esi sisikhethwa esicetyiswayo nanini xa kukho isahlulelo \n"
-"esifanelekileyo. Nokuba yeyiphi iseti <b>Yenza Sisebenze Isahlulelo Somlayishi Wokumisela Inkqubo</b> kwaye\n"
-" <b>Beka endaweni ye-MBR i-Khowudi Jikelele</b> apha <b>Ubucukubhede Bokuhlohla Umlayishi wokumisela Inkqubo</b>\n"
-" ukuze kuhlaziywe ingxelo yokumisela inkqubo engumalathindlela\n"
-" ukuba luyafuneka okanye wenze ubumbeko lomnye umphathi wokumisela inkqubo\n"
-" ukuqalisa &imveliso;.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "Funda ngezahlulelo"
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- Kwezithile <b>Esinye</b> isahlulelo. Qwalasela izithintelo zesixokelelwano sakho\n"
-"xa ukhetha esi sikhethwa.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "Layisha imimiselo yokulayisha umiselo lwenkqubo"
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>Umzekelo, inkoliso yee-PCs inomnyino we-BIOS\n"
-"ethintel ukumiselwa kwenkqubo \n"
-"kwiisilinda zamaqokobhe ekhompyutha anganeno ngobukhulu kwi-1024. Kuxhomekeke kumphathi wenkqubo yomiselo osetyenziswayo,\n"
-" unako okanye unokungabi nako ukumisela inkqubo kwisahlulelo sengqiqo elindelekileyo.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "Kuqwalaselwa umlayishi womiselo lwenkqubo"
-#. custom bootloader help text, 7 of 7
-#: 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"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"Ngenisa igama lesixhobo sesahlulelo (umzekelo, <tt>/dev/hda3</tt> okanye\n"
-" <tt>/dev/sdb</tt>) kummandla wesiqalo sokuqalisa.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "Kufundwa ngezahlulelo..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
-#, fuzzy
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><big><b>Ubucukubhede Bokuhlohla Umlayishi Womiselo Lwenkqubo</b></big><br>\n"
-"Ukulungelelanisa izikhethwa zokuhlohla umlayishi womiselo lwenkqubo oselekwibanga eseliphambili (elifana \n"
-"nokuguqula idilesi zenkqubo ngesixhobo), nqomfa <b>Ubucukubhede Bokuhlohla Umlayishi Womiselo</b>.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "Layisha imimiselo yokulayisha umiselo lwenkqubo..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
-#, fuzzy
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><big><b>Uhlobo Lomlayishi Womiselo Lwenkqubo</b></big><br>\n"
-"Ukukhetha ukuba ingaba makahlolwe na umlayishi womiselo lwenkqubo nokuba ngowuphi umlayishi womiselo lwenkqubo ofanele ukuhlohlwa,\n"
-" sebenzisa <b>Umlayishi Womiselo Lwenkqubo</b>.</p>"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "Kundululwa Ubumbeko Lomlayishi Wokumisela Inkqubo"
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "Dala i-initrd"
+
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
#, fuzzy
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><big><b>Izikhethwa Zomlayishi Womiselo Lwenkubo</b></big><br>\n"
-"Ukulungelelanisa izikhethwa zomlayishi womiselo lwenkqubo, njengexesha lokuphuma, nqomfa\n"
-" <b>Izikhethwa Zomlayishi Womiselo Lwenkqubo</b>.</p>"
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "Gcina iifayili zobumbeko lomlayishi lokumisela inkqubo"
-#. help text 1/1
-#: 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"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>Ubumbeko Lobungcaphephe Olwenziwa Ngesandla</B><BR>\n"
-"Apha, hlela ubumbeko lomlayishi womiselo lwenkqubo.</P>\n"
-" <P>Qaphela: Ifayili yombumbeko yokugqibelisa inokuba noshiyashiywaniso olwahlukahlukeneyo.</P>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "Kudalwa i-initrd..."
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
#, fuzzy
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b><big>Igama Lecandelo</big></b><br>\n"
-"Use <b>Igama Lecandelo</b> lokuxela igama lecandelo lomlayishi womiselo lwenkqubo. Igama \n"
-" lecandelo malingafani nalo naliphi elinye.</p>"
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "Kugcinwa ubumbeko lomlayishi womiselo lwenkqubo..."
-#. help text 1/5
-#: 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>"
-msgstr ""
-"<p><big><b>Uhlobo Lwecandelo Elitsha</b></big><br>\n"
-"Khetha uhlobo lwecandelo elitsha elifanele ukudalwa.</p>"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "Kundululwa Ubumbeko Lomlayishi Wokumisela Inkqubo"
-#. help text 2/5
-#: 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"
-"selected section.</p>"
-msgstr ""
-"<p>Khetha <b>Fanisa Icandelo Elikhethiweyo</b> ukufanisa icandelo elikhethwe \n"
-"okwangoku. Ngoku hlengahlengisa izikhethwa ezifanele ukwahluka kwicandelo\n"
-" elikhethiweyo.</p>"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "Isishwankathelo sobumbeko lomlayishi womiselo lwenkqubo"
-#. help text 3/5
-#: 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"
-"to load and start.</p>"
-msgstr ""
-"<p>Khetha <b>i-Kernel (Linux)</b> ukufakela kwi-kernel entsha ye-Linux okanye omnye umfuziselo\n"
-"ukwenzela ukulayisha nokuqalisa.</p>"
+#~ msgid "Delete a global option"
+#~ msgstr "&Ummiselo Onobucukubhede Weendawo Zokuhlala"
-#. help text 4/5
-#: 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"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>Khetha <b>Icandelo le-Xen</b> ukufaka i-kernel entsha ye-Linux okanye omnye umfanekiso,\n"
-"kodwa ukuyiqalisa kwimo engqonge i-XEN.</p>"
+#~ msgid "Set a global option"
+#~ msgstr "&Ummiselo Onobucukubhede Weendawo Zokuhlala"
-#. help text 5/5
-#: 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"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Khetha <b>Esinye Isixokelelwano (umlayishi wetyathanga)</b> ukufakela icandelo \n"
-"elilayisha lize liqalise icandelo lokumisela inkqubo lesahlulelo sediski. Oku kusetyenziselwa \n"
-" ukumisela inkqubo yezinye izixokelelwano ezisebenzayo.</p>"
+#~ msgid "Print value of specified option"
+#~ msgstr "Shicilela ixabiso lesikhethwa esixeliweyo"
-#: src/include/bootloader/routines/helps.rb:254
-#, fuzzy
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Khetha <b>Esinye Isixokelelwano</b> ukufakela icandelo \n"
-"elilayisha lize liqalise icandelo lokumisela inkqubo lesahlulelo sediski. Oku kusetyenziselwa \n"
-" ukumisela inkqubo yezinye izixokelelwano ezisebenzayo.</p>"
+#~ msgid "The key of the option"
+#~ msgstr "Iqhosha lesikhethwa"
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
-msgid "Order of Hard Disks: %1"
-msgstr "Ukulandelelaniswa Kokungaphakathi Eqokobheni Lekhompyutha %1"
+#~ msgid "The value of the option"
+#~ msgstr "Ixabiso lesikhethwa"
-#. summary string
-#: src/include/bootloader/routines/misc.rb:51
-msgid "Do not install any boot loader"
-msgstr "Musa ukuhlohla nawuphi umlayishi womiselo lwenkqubo"
+#~ msgid "Value was not specified."
+#~ msgstr "Ixabiso alixelwanga."
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
-msgid "Do Not Install Any Boot Loader"
-msgstr "Musa Ukuhlohla Nawuphi Umlayishi Womiselo Lwenkqubo"
+#~ msgid "Option was not specified."
+#~ msgstr "Isikhethwa asixelwanga."
-#. summary string
-#: src/include/bootloader/routines/misc.rb:60
-msgid "Install the default boot loader"
-msgstr "Hlohla umlayishi womiselo lwenkqubo ohlala ekhona"
+#, fuzzy
+#~| msgid "Value: %1"
+#~ msgid "Value: %s"
+#~ msgstr "Ixabiso: %1"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Install Default Boot Loader"
-msgstr "Hlohla Umlayishi Womiselo Lwenkqubo Ohlala Ekhona"
+#~ msgid "Specified option does not exist."
+#~ msgstr "Isikhethwa esixeliweyo asikho kwasona."
-#. summary string
-#: src/include/bootloader/routines/misc.rb:68
-msgid "Boot loader"
-msgstr "Umlayishi Womiselo Lwenkqubo"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>Imenyu Yokumisela Inkqubo</b></big><br></p>"
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
-msgid "Boot Loader"
-msgstr "Umlayishi Womiselo Lwenkqubo"
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Misela inkqubo ukusuka kwiSahlulelo sokuMisela inkqubo</b> kokunokukhethwa kukokona okucetyiswayo, okunye kuku\n"
+#~ "<b>Misela inkqubo ukusuka kwiSahlulelo seNgcambu</b>.</p>"
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr ""
-"Lo msebenzi awufumaneki xa umlayishi \n"
-"womiselo lwenkqubo engaxelwa."
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr ""
+#~ "<p><b>Ukumisela inkqubo ukusuka kwiRhekhodi Enkulu yokuMisela inkqubo</b> akucetyiswa ukuba unesinye isixokelelwano esisebenzayo\n"
+#~ "esihlohlwe kwikhompyutha yakho</p>"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"Uyaushiya ngenene ubumbeko lomlayishi womiselo lwenkqubo ngaphandle kokulugcina?\n"
-"Zonke iinguquko ziya kulahleka.\n"
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "<p><b> Ukumisela ukusuka kwiSahlulelo seNgcambu</b> kokunokukhethwa okucetyisiweyo nanini xa kukho isahlulelo\n"
+#~ "esifanelekileyo. Khetha nokuba <b>Seta iFlegi esebenzayo kwiTheyibhile yesaHlulelo yesaHlulelo sokuMisela inkqubo</b> kwaye <b>Bhala Ikhowudi yoHlobo oluthile yokuMisela inkqubo kwi-MBR</b>\n"
+#~ " ko <b>kuNokukhethwa kuko kwesiFaki sokuMisela inkqubo</b> ukuhlaziya irhekhodi enkulu yokumisela inkqubo ukuba oko kuyimfuneko okanye yakha omnye umlawuli wakho wokumisela inkqubo\n"
+#~ " ukuba aqalise eli candelo.</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:57
-msgid "The password must not be empty."
-msgstr "Igama lokugqithisa alifanelanga kuba likhamte."
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p><b>Izahlulelo zokuMisela inkqubo yesiQhelo</b> ikuvumela ukuba ukhethe isahlulelo sokumisela inkqubo ukusuka ku-.</p>"
-#. error popup
-#: src/include/bootloader/routines/popups.rb:66
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr ""
-"'Igama lokugqithisa' uze 'Uchwetheze kwakhona igama lokugqithisa'\n"
-"musa ukungqamanisa. Phinda uchwetheze igama lokugqithisa."
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~ "for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p><b>Umda woQhagamshelwano lweSiriyali</b> ikuvumela ukuba uchaze imida emayisetyenziswe\n"
+#~ "kwisixhasi sesiriyali. Nceda khangela ukungqinelwa ngamaxwebhu e-grub (<code>ulwazi lwe-grub</code>) ngeenkcukacha.</p>"
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:82
#, fuzzy
-msgid "%1Set default boot loader location?\n"
-msgstr "Misela indawo yokuhlala umlayishi womiselo lwenkqubo."
+#~| 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 (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>"
+#~ msgstr ""
+#~ "<p><b>Ingcaciso yesiTishi</b></p><br>\n"
+#~ "Ichaza uhlobo lwesitishi ofuna ukusisebenzisa. Ngesiriyali yesitishi (umz. Isixhasi sesiriyali),\n"
+#~ " kufuneka ubalule <code>isiriyali</code>. Usengagqithisela <code>isixhasi</code> ku\n"
+#~ " myalelo, njenge <code>sixhasi sesiriyali</code>. Kule meko, isitishi apho\n"
+#~ " ucinezela naliphi na iqhosha siza kukhethwa njengesitishi se-GRUB.</p> "
-#. error popup
-#: src/include/bootloader/routines/popups.rb:90
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"Igama elikhethiweyo selisetyenzisiwe.\n"
-"Sebenzisa elinye elahlukileyo.\n"
+#~ msgid ""
+#~ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
+#~ "that will be used for booting in case the default section is unbootable.</p>"
+#~ msgstr ""
+#~ "<p><b>Amacandelo Okubuyela emva ukuba okuhlala kukhona akuphumeleli</b> kuqulethe uluhlu lwamanani ecandelo\n"
+#~ "aza kusetyenziselwa ukumisela inkqubo xa kunokuthi kanti icandelo elihlala likhona alikwazi kumiselwa inkqubo.</b> "
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"Kwenzeke imposiso ngethuba lokuhlohla \n"
-"umlayishi womiselo lwenkqubo. Uyaphinda ukuzama ubumbeko lomlayishi womiselo lwenkqubo?\n"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "Iindawo Zokuhlala Umlayishi Womiselo Lwenkqubo"
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"Isilumkiso!\n"
-"\n"
-" I-MBR Yangoku ye-%1 iza kuphinda ibhalwe ngoku nge-MBR\n"
-" egcinwe apha %2.\n"
-" \n"
-" Yikhowudi yokumisela inkqubo kuphela kwi-MBR eya kuphinda ibhalwe.\n"
-" Itheyibhile yesahlulelo ihlala ingaguqukanga.\n"
-" \n"
-" Uyaqhuba?\n"
+#~ msgid "Custom Boot Partition"
+#~ msgstr "Isahlulelo Sokulungisela Ukumiselwa Kwenkqubo"
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
-msgid "&Yes, Rewrite"
-msgstr "&Ewe, Uyaphinda Ukubhala"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "Misela Inkqubo evela Kwingxelo Yomalathindlela Wokumisela Inkqubo"
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "Misela Inkqubo evela Kwisahlulelo Sokumisela Inkqubo"
+
#, fuzzy
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr ""
-"Ngenxa yokwahlulela, umlayishi womiselo lwenkqubo \n"
-"akakwazi kuhlohleka kakuhle."
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
-#. 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 "Udidi kufuneka luqulathe noko i-printer enye."
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "Imida Yomdibaniso Wolandelelano"
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
#, fuzzy
-msgid "Disk order settings"
-msgstr "Imimiselo yesihluzi"
+#~ msgid "Fallback Sections if Default fails"
+#~ msgstr "Amacandelo Okubuyela Emva xa okuhlala kukhona Kuselela"
-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "Iid&iski"
+#, fuzzy
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "Igama lokugqithisa Lesithuba Somdibaniso Semenyu"
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "&Isixhobo"
+#, fuzzy
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "Kucokiswa iFlegi"
-#. 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 ""
+#~ msgid "&Password"
+#~ msgstr "&Igama lokugqithisa"
-#. 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 ""
+#, fuzzy
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "Misela Inkqubo evela Kwisahlulelo Sengcambu Yamandla"
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-msgid "Saving bootloader configuration..."
-msgstr "Kugcinwa ubumbeko lomlayishi womiselo lwenkqubo..."
+#~ msgid "Boot Loader Options"
+#~ msgstr "Izikhethwa Zomlayishi Womiselo Lwenkqubo"
-#. 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 ""
+#, fuzzy
+#~| msgid "Secure"
+#~ msgid "Secure Boot"
+#~ msgstr "Ukhuseleko"
-#. 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 "Isixokelelwano siza kumisela inkqubo kwakhona ngoku..."
+#, fuzzy
+#~| msgid "Boot Loader Location"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "Indawo Yokuhlala Umlayishi Womiselo Lwenkqubo"
-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
-msgid "Booting"
-msgstr "Kumiselwa inkqubo"
+#, fuzzy
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>Imowudi ye-Vga</b> ichaza imowudi ye-VGA ukwenzela <i>isixhasi</i> i-kernel kufuneka isete xa imisela inkqubo.</p>"
-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
-msgid "&Booting"
-msgstr "&Kumiselwa inkqubo"
+#, fuzzy
+#~ msgid "&Vga Mode"
+#~ msgstr "Imo Yokusebenza ye-VGA"
-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "Akukho mlayishi womiselo lwenkqubo ukhethelwe ukuhlohla. Isixokelelwano sakho sisenokungakwazi ukumiselwa inkqubo."
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2, %3 amasuntsu (imo yokusebenza %4)"
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Ngenxa y"
+#, fuzzy
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "Iprinta eseMgangathweni"
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
-msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
-msgstr ""
+#~ msgid "Text Mode"
+#~ msgstr "Imo Yokusebenza Ngesiqendu"
-#: src/modules/BootGRUB2.rb:172
-msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
-msgstr ""
+#, fuzzy
+#~| msgid "&Unspecified"
+#~ msgid "Unspecified"
+#~ msgstr "&Engabalulwanga"
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
-msgstr ""
+#~ msgid "Select File"
+#~ msgstr "Khetha Ifayili"
-#: src/modules/BootGRUB2.rb:189
-msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
-msgstr ""
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "Akukho zikhethwa zokumisela umlayishi wokumisela inkqubo wangoku"
-#: src/modules/BootGRUB2.rb:195
-msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
-msgstr ""
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "Hle&la Iifayili Zobumbeko"
-#: src/modules/BootGRUB2.rb:199
-msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
-msgstr ""
+#~ msgid "&Propose New Configuration"
+#~ msgstr "&Ceba Ubumbeko Olutsha"
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
+#~ msgid "&Start from Scratch"
+#~ msgstr "&Qalisa ukusuka Phantsi"
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "&Phinda ufunde Ubumbeko olusuka kwiDiski"
+
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "Phinda ugcine i-MBR Yokuseqokobheni Lekhompyutha"
+
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "Bhala ikhowudi yomiselo lwenkqubo yomlayishi womiselo lwenkqubo ediskini"
+
+#~ msgid "Other"
+#~ msgstr "Ezinye"
+
+#~ msgid "MBR restored successfully."
+#~ msgstr "i-MBR iphinde yagcinwa ngempumelelo."
+
+#~ msgid "Failed to restore MBR."
+#~ msgstr "Kusilele ukuphinda kugcinwe i-MBR."
+
#, fuzzy
-msgid "Change Location: %s"
-msgstr "Indawo yokuhlala: %1"
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "Kusilele ukubhalwa kwemimiselo yomsebenzi wothungelwano."
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
-msgid "Boot Loader Type: %1"
-msgstr "Uhlobo Lomlayishi Womiselo Lwenkqubo %1"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "Izikhethwa &Zomlayishi Womiselo Lwenkqubo"
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
-msgid " (extended)"
-msgstr ""
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "Ubucukubhede Bokuhlohla Umlayishi &Womiselo Lwenkqubo"
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:245
-msgid " (MBR)"
-msgstr ""
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr ""
+#~ "<P>Ukusuka <B>Kwenye</B>,\n"
+#~ "unako ukuhlela ngesandla iifayili zobumbeko lomlayishi womiselo lwenkqubo, usule ubumbeko \n"
+#~ " lwangoku uze uceba ubumbeko olutsha, qalisa ukusuka phantsi, okanye phinda ufunde\n"
+#~ " ubumbeko olugcinwe kwidiski yakho. %1</P>"
-#: src/modules/BootGRUB2.rb:252
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr ""
+#~ "<P>Ukuhlela iifayili zobumbeko lomlayishi wokumisela inkqubo\n"
+#~ "ngesandla, nqomfa <B>Hlela Iifayiki Zobumbeko</B>.</P>"
+
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr ""
+#~ "<P> Kwitheyibhile, icandelo ngalinye limele into enye\n"
+#~ "kwimenyu yokumisela inkqubo.</P>"
+
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr ""
+#~ "<P> Cinezela <B>Hlela</B> ukuboonisa iimpawu \n"
+#~ "zecandelo elikhethiweyo.</P>"
+
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P> Ngokucinezela <b>Ukumisela Njengokuhlala Kukhona</b>, phawula icandelo \n"
+#~ "elikhethiweyo njengokuhlala kukhona. Xa kumiselwa inkqubo, umlayishi womiselo lwenkqubo uya kunika \n"
+#~ " imenyu yomiselo lwenkqubo aze alinde umsebenzisi ukuba akhethe i-kernel okanye enye \n"
+#~ " i-OS yokumisela. Ukuba akukho qhosha licinezelwe phambi kwexesha lokuphuma, i-\n"
+#~ "kernel ehlala ikhona okanye i-OS ziya kumiselwa inkqubo. Imenyu yokulandeliswa kwamacandelo kumlayishi womiselo lwenkqubo\n"
+#~ " inokuguqulwa ngokusebenzisa <B>Amaqhosha</B> ka-Phezulu <B>no-Ezantsi</B> </P>"
+
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>Cinezela <B>Fakela</B> ukudala icandelo lomlayishi womiselo lwenkqubo omtsha\n"
+#~ "okanye <B>Cima</B> ukuze ucime icandelo elikhethiweyo.</P>"
+
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>Indawo Yokuhlala Umlayishi Womiselo Lwenkqubo</b></big><br>\n"
+#~ "Umphathi womiselo lwenkqubo (%1) unako ukuhlohlwa ngeendlela ezilandelayo:</p>"
+
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- Apha <b>kwiNgxelo Yomiselo Lwenkqubo Lomalathindlela </b> (MBR).\n"
+#~ "Oku akucetyiswa ukuba kukho esinye isixokelelwano sokusebenza esihlohliweyo\n"
+#~ " kwikhompyutha.</p>"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition. This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- Apha <b>Kwicandelo Lokumisela Inkqubo</b> lwalo <tt>/umiselo lwenkqubo</tt> okanye <tt>/</tt> (ingcambu yamandla) \n"
+#~ " isahlulelo. Esi sisikhethwa esicetyiswayo nanini xa kukho isahlulelo \n"
+#~ "esifanelekileyo. Nokuba yeyiphi iseti <b>Yenza Sisebenze Isahlulelo Somlayishi Wokumisela Inkqubo</b> kwaye\n"
+#~ " <b>Beka endaweni ye-MBR i-Khowudi Jikelele</b> apha <b>Ubucukubhede Bokuhlohla Umlayishi wokumisela Inkqubo</b>\n"
+#~ " ukuze kuhlaziywe ingxelo yokumisela inkqubo engumalathindlela\n"
+#~ " ukuba luyafuneka okanye wenze ubumbeko lomnye umphathi wokumisela inkqubo\n"
+#~ " ukuqalisa &imveliso;.</p>"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- Kwezithile <b>Esinye</b> isahlulelo. Qwalasela izithintelo zesixokelelwano sakho\n"
+#~ "xa ukhetha esi sikhethwa.</p>"
+
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>Umzekelo, inkoliso yee-PCs inomnyino we-BIOS\n"
+#~ "ethintel ukumiselwa kwenkqubo \n"
+#~ "kwiisilinda zamaqokobhe ekhompyutha anganeno ngobukhulu kwi-1024. Kuxhomekeke kumphathi wenkqubo yomiselo osetyenziswayo,\n"
+#~ " unako okanye unokungabi nako ukumisela inkqubo kwisahlulelo sengqiqo elindelekileyo.</p>"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Ngenisa igama lesixhobo sesahlulelo (umzekelo, <tt>/dev/hda3</tt> okanye\n"
+#~ " <tt>/dev/sdb</tt>) kummandla wesiqalo sokuqalisa.</p>"
+
#, fuzzy
-msgid "Status Location: %1"
-msgstr "Indawo yokuhlala: %1"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Ubucukubhede Bokuhlohla Umlayishi Womiselo Lwenkqubo</b></big><br>\n"
+#~ "Ukulungelelanisa izikhethwa zokuhlohla umlayishi womiselo lwenkqubo oselekwibanga eseliphambili (elifana \n"
+#~ "nokuguqula idilesi zenkqubo ngesixhobo), nqomfa <b>Ubucukubhede Bokuhlohla Umlayishi Womiselo</b>.</p>"
-#: src/modules/BootGRUB2EFI.rb:108
#, fuzzy
-#| msgid "LDAP secure port: %1"
-msgid "Enable Secure Boot: %1"
-msgstr "Isiqhagamshelanisi sokhuselo lwe-LDAP: %1"
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Izikhethwa Zomlayishi Womiselo Lwenkubo</b></big><br>\n"
+#~ "Ukulungelelanisa izikhethwa zomlayishi womiselo lwenkqubo, njengexesha lokuphuma, nqomfa\n"
+#~ " <b>Izikhethwa Zomlayishi Womiselo Lwenkqubo</b>.</p>"
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>Ubumbeko Lobungcaphephe Olwenziwa Ngesandla</B><BR>\n"
+#~ "Apha, hlela ubumbeko lomlayishi womiselo lwenkqubo.</P>\n"
+#~ " <P>Qaphela: Ifayili yombumbeko yokugqibelisa inokuba noshiyashiywaniso olwahlukahlukeneyo.</P>"
+
#, fuzzy
-msgid "Unknown bootloader: %1"
-msgstr "Imodeli Ayaziwa: %1"
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Igama Lecandelo</big></b><br>\n"
+#~ "Use <b>Igama Lecandelo</b> lokuxela igama lecandelo lomlayishi womiselo lwenkqubo. Igama \n"
+#~ " lecandelo malingafani nalo naliphi elinye.</p>"
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr ""
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><big><b>Uhlobo Lwecandelo Elitsha</b></big><br>\n"
+#~ "Khetha uhlobo lwecandelo elitsha elifanele ukudalwa.</p>"
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: 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 ""
+#~ 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"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>Fanisa Icandelo Elikhethiweyo</b> ukufanisa icandelo elikhethwe \n"
+#~ "okwangoku. Ngoku hlengahlengisa izikhethwa ezifanele ukwahluka kwicandelo\n"
+#~ " elikhethiweyo.</p>"
-#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:167
#, fuzzy
-msgid "The boot device is on raid type: %1. System will not boot."
-msgstr "Akho ngcambu yesixhobo ifunyenweyo"
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>i-Kernel (Linux)</b> ukufakela kwi-kernel entsha ye-Linux okanye omnye umfuziselo\n"
+#~ "ukwenzela ukulayisha nokuqalisa.</p>"
-#. 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 ""
+#, fuzzy
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>Icandelo le-Xen</b> ukufaka i-kernel entsha ye-Linux okanye omnye umfanekiso,\n"
+#~ "kodwa ukuyiqalisa kwimo engqonge i-XEN.</p>"
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr ""
+#~ 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"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>Esinye Isixokelelwano (umlayishi wetyathanga)</b> ukufakela icandelo \n"
+#~ "elilayisha lize liqalise icandelo lokumisela inkqubo lesahlulelo sediski. Oku kusetyenziselwa \n"
+#~ " ukumisela inkqubo yezinye izixokelelwano ezisebenzayo.</p>"
-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Khetha <b>Esinye Isixokelelwano</b> ukufakela icandelo \n"
+#~ "elilayisha lize liqalise icandelo lokumisela inkqubo lesahlulelo sediski. Oku kusetyenziselwa \n"
+#~ " ukumisela inkqubo yezinye izixokelelwano ezisebenzayo.</p>"
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
-msgstr ""
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "Musa Ukuhlohla Nawuphi Umlayishi Womiselo Lwenkqubo"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
-msgid "Check boot loader"
-msgstr "Qwalasela umlayishi womiselo lwenkqubo"
+#~ msgid "Install the default boot loader"
+#~ msgstr "Hlohla umlayishi womiselo lwenkqubo ohlala ekhona"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
-msgid "Read partitioning"
-msgstr "Funda ngezahlulelo"
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "Hlohla Umlayishi Womiselo Lwenkqubo Ohlala Ekhona"
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
-msgid "Load boot loader settings"
-msgstr "Layisha imimiselo yokulayisha umiselo lwenkqubo"
+#~ msgid "Boot loader"
+#~ msgstr "Umlayishi Womiselo Lwenkqubo"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
-msgid "Checking boot loader..."
-msgstr "Kuqwalaselwa umlayishi womiselo lwenkqubo"
+#~ msgid "Boot Loader"
+#~ msgstr "Umlayishi Womiselo Lwenkqubo"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
-msgid "Reading partitioning..."
-msgstr "Kufundwa ngezahlulelo..."
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr ""
+#~ "Lo msebenzi awufumaneki xa umlayishi \n"
+#~ "womiselo lwenkqubo engaxelwa."
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
-msgid "Loading boot loader settings..."
-msgstr "Layisha imimiselo yokulayisha umiselo lwenkqubo..."
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "Uyaushiya ngenene ubumbeko lomlayishi womiselo lwenkqubo ngaphandle kokulugcina?\n"
+#~ "Zonke iinguquko ziya kulahleka.\n"
-#. dialog header
-#: src/modules/Bootloader.rb:162
-msgid "Initializing Boot Loader Configuration"
-msgstr "Kundululwa Ubumbeko Lomlayishi Wokumisela Inkqubo"
+#, fuzzy
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "Misela indawo yokuhlala umlayishi womiselo lwenkqubo."
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
-msgid "Create initrd"
-msgstr "Dala i-initrd"
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "Igama elikhethiweyo selisetyenzisiwe.\n"
+#~ "Sebenzisa elinye elahlukileyo.\n"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
-msgid "Save boot loader configuration files"
-msgstr "Gcina iifayili zobumbeko lomlayishi lokumisela inkqubo"
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "Kwenzeke imposiso ngethuba lokuhlohla \n"
+#~ "umlayishi womiselo lwenkqubo. Uyaphinda ukuzama ubumbeko lomlayishi womiselo lwenkqubo?\n"
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
-msgid "Install boot loader"
-msgstr "Hlohla Umlayishi wokumisela inkqubo"
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "Isilumkiso!\n"
+#~ "\n"
+#~ " I-MBR Yangoku ye-%1 iza kuphinda ibhalwe ngoku nge-MBR\n"
+#~ " egcinwe apha %2.\n"
+#~ " \n"
+#~ " Yikhowudi yokumisela inkqubo kuphela kwi-MBR eya kuphinda ibhalwe.\n"
+#~ " Itheyibhile yesahlulelo ihlala ingaguqukanga.\n"
+#~ " \n"
+#~ " Uyaqhuba?\n"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
-msgid "Creating initrd..."
-msgstr "Kudalwa i-initrd..."
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "&Ewe, Uyaphinda Ukubhala"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
-msgid "Saving boot loader configuration files..."
-msgstr "Gcina iifayili zobumbeko lomlayishi zokumisela inkqubo..."
+#, fuzzy
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "Imodeli Ayaziwa: %1"
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
-msgid "Installing boot loader..."
-msgstr "Hlohla Umlayishi wokumisela inkqubo"
+#~ msgid "Install boot loader"
+#~ msgstr "Hlohla Umlayishi wokumisela inkqubo"
-#. progress line
-#: src/modules/Bootloader.rb:299
-msgid "Saving Boot Loader Configuration"
-msgstr "Kundululwa Ubumbeko Lomlayishi Wokumisela Inkqubo"
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "Gcina iifayili zobumbeko lomlayishi zokumisela inkqubo..."
+#~ msgid "Installing boot loader..."
+#~ msgstr "Hlohla Umlayishi wokumisela inkqubo"
+
#, fuzzy
#~| msgid "Distribution:"
#~ msgid "D&istributor"
@@ -1390,9 +1231,6 @@
#~ msgid "Section name must be specified."
#~ msgstr "Igama lecandelo malixelwe."
-#~ msgid "Disk Order"
-#~ msgstr "Ukulandelelanisa Idiski"
-
#~ msgid "Boot Menu"
#~ msgstr "Imenyu Yokumisela Inkqubo"
@@ -1816,9 +1654,6 @@
#~ msgid "Section &Name"
#~ msgstr "Igama &Lecandelo"
-#~ msgid " (default)"
-#~ msgstr "(okuhlala kukhona)"
-
#, fuzzy
#~ msgid "Sections:<br>%1"
#~ msgstr "Amacandelo: %1"
@@ -2400,9 +2235,6 @@
#~ msgid "image"
#~ msgstr "Umfuziselo"
-#~ msgid "Yes"
-#~ msgstr "Ewe"
-
#~ msgid "No"
#~ msgstr "Hayi"
Modified: trunk/yast/xh/po/ca-management.xh.po
===================================================================
--- trunk/yast/xh/po/ca-management.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/ca-management.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -130,8 +130,7 @@
#: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
#: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
#: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
#, fuzzy
msgid "&Password:"
msgstr "&Igama lefayili"
@@ -207,8 +206,7 @@
#: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
#: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
#: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
msgid "New passwords do not match."
msgstr ""
@@ -1954,44 +1952,43 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
msgid "Creating certificate..."
msgstr ""
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
msgstr ""
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
#, fuzzy
msgid "Finish"
msgstr "&Kugqityiwe"
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
#, fuzzy
msgid "Really save configuration ?"
msgstr "Gcina ubumbeko"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
msgid "Exit"
msgstr ""
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
msgid "Really exit configuration without saving ?"
msgstr ""
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
#, fuzzy
msgid "Details"
msgstr "Iinkcukacha:"
@@ -2288,8 +2285,7 @@
msgid "LDAP P&assword:"
msgstr "&Igama lefayili"
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
#: src/include/ca-management/util.rb:1388
#, fuzzy
msgid "Certificate &Password:"
@@ -2339,28 +2335,23 @@
msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
msgstr ""
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
msgid "C&ertificate and the Key Encrypted in PEM Format"
msgstr ""
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
msgid "&Certificate in DER Format"
msgstr ""
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
msgid "Cer&tificate and the Key in PKCS12 Format"
msgstr ""
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
msgid "&Like PKCS12 and Include the CA Chain"
msgstr ""
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
#, fuzzy
msgid "&New Password"
msgstr "&Igama lefayili"
Modified: trunk/yast/xh/po/cio.xh.po
===================================================================
--- trunk/yast/xh/po/cio.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/cio.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -43,13 +43,13 @@
msgstr "Kusetyenzisiwe"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "hayi"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "yes"
msgstr "ewe"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "hayi"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
#, fuzzy
Modified: trunk/yast/xh/po/cluster.xh.po
===================================================================
--- trunk/yast/xh/po/cluster.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/cluster.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -147,7 +147,7 @@
msgstr "Dlala isandi sovavanyo xa ikhadi libumbekile"
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
msgid "The Multicast Address has to be fulfilled"
msgstr ""
@@ -177,7 +177,7 @@
msgstr "Indlela Yokumisela Idilesi Yomsebenzi Wothungelwano"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
#, fuzzy
#| msgid "Portal Address"
msgid "Multicast Address:"
@@ -237,149 +237,149 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
#, fuzzy
#| msgid "Enable Security Event Notification"
msgid "Enable Security Auth"
msgstr "Nika Isakhono Sokwazisa Isiganeko Sokhuseleko "
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr ""
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr ""
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
msgid "Running"
msgstr "Iyasebenza"
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
#, fuzzy
#| msgid "No network running"
msgid "Not running"
msgstr "Akukho nethwekhi isebenzayo"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
msgid "Booting"
msgstr "Kumiselwa inkqubo"
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
#, fuzzy
#| msgid "Started manually"
msgid "On -- Start pacemaker during boot"
msgstr "Iqaliswe ngesandla"
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
#, fuzzy
#| msgid "Started manually"
msgid "Off -- Start pacemaker manually"
msgstr "Iqaliswe ngesandla"
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
msgid "Switch On and Off"
msgstr "Vula Uphinde Uvale"
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
msgid "Current Status: "
msgstr "Isimo Sangoku:"
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
#, fuzzy
#| msgid "Start Firewall Now"
msgid "Start pacemaker Now"
msgstr "Qalisa nge-Firewall Ngoku"
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
#, fuzzy
#| msgid "Stop Firewall Now"
msgid "Stop pacemaker Now"
msgstr "Nqumamisa i-Firewall Ngoku"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
#, fuzzy
#| msgid "Local Host"
msgid "Sync Host"
msgstr "Umamkeli Wendawo Leyo"
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Add"
msgstr "Fakela"
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
#, fuzzy
#| msgid "Delay"
msgid "Del"
msgstr "Libazisa"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Edit"
msgstr "Hlela"
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
#, fuzzy
#| msgid "Select File"
msgid "Sync File"
msgstr "Khetha Ifayili"
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
#, fuzzy
#| msgid "Suggested fstab Lines"
msgid "Add Suggested Files"
msgstr "Imigca Ecetyisiweyo ye-fstab"
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
msgid "Generate Pre-Shared-Keys"
msgstr ""
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
msgid "Csync2 Status Unknown"
msgstr ""
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
msgid "Turn csync2 ON"
msgstr ""
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 OFF"
msgstr ""
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
#, fuzzy
#| msgid "Enter a valid host name."
msgid "Enter a hostname"
msgstr "Faka igama lomququzeleli elisebenzayo. "
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
msgid "Edit the hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
#, fuzzy
#| msgid "Enter a new name for the %1 profile."
msgid "Enter a filename to synchronize"
msgstr "Ngenisa igama elitsha ukwenzela inkangeleko yecala ye- %1."
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
#, fuzzy
#| msgid "Enter the file name"
msgid "Edit the filename"
msgstr "Ngenisa igama lefayili."
#. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
#, fuzzy
#| msgid ""
#| "Archive %1 already exists.\n"
@@ -392,7 +392,7 @@
"Ingaba ngokwenene ufuna ukuwucima?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
#, fuzzy
#| msgid "Reading file on %1 failed.\n"
msgid "Delete key file %1 failed."
@@ -401,43 +401,43 @@
" kusilele.\n"
#. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
msgstr ""
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
#, fuzzy
#| msgid "Image creation failed."
msgid "Key generation failed."
msgstr "Akuphumelelanga ukwenziwa komfanekiso."
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
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:1358
+#: src/include/cluster/dialogs.rb:1360
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
#, fuzzy
#| msgid "The value for clock skew must be a positive integer."
msgid "The Group Number must be a positive integer"
@@ -550,41 +550,41 @@
msgstr "Kuyandululwa..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
#, fuzzy
#| msgid "Initializing Printer Configuration"
msgid "Initializing cluster Configuration"
msgstr "Kundululwa uBumbelo lwe-Printer"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
msgid "Read the database"
msgstr "Funda isiseko seenkcukacha"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
msgid "Read the previous settings"
msgstr "Funda imimiselo edlulileyo"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
#, fuzzy
#| msgid "Read firewall settings"
msgid "Read SuSEFirewall Settings"
msgstr "Funda imimiselo yefirewall"
#. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
msgid "Reading the database..."
msgstr "Funda isiseko seenkcukacha..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
msgid "Reading the previous settings..."
msgstr "Kufundwa imimiselo edlulileyo..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
#, fuzzy
#| msgid "Reading firewall settings..."
msgid "Reading SuSEFirewall settings..."
@@ -592,75 +592,75 @@
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
msgid "Finished"
msgstr "Kugqityiwe"
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
#, fuzzy
#| msgid "Cannot install required packages."
msgid "Cannot install required package"
msgstr "Ayikwazi kuhlohla imibekelo efunekayo."
#. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
#, fuzzy
#| msgid "Change existing configuration"
msgid "Cannot load existing configuration"
msgstr "Guqula ubumbeko oselukhona"
#. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
#, fuzzy
#| msgid "Cannot read the database1."
msgid "Cannot read database1."
msgstr "Azinakufundeka iinkcukacha zesiseko1."
#. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
#, fuzzy
#| msgid "Cannot read the database2."
msgid "Cannot read database2."
msgstr "Azinakufundeka iinkcukacha zesiseko2."
#. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
msgid "Cannot detect devices."
msgstr "Azikwazi kuchongeka izixhobo."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
#, fuzzy
#| msgid "Saving the Configuration"
msgid "Saving cluster Configuration"
msgstr "Igcina Ubumbeko"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
msgid "Write the settings"
msgstr "Bhala imimiselo"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
#, fuzzy
#| msgid "Save changes to the Profile"
msgid "Save changes to SuSEFirewall"
msgstr "Gcina iinguquko Zenkangeleko Yecala"
#. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
msgid "Writing the settings..."
msgstr "Kubhalwa imimiselo..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
#, fuzzy
#| msgid "Saving changes to the files..."
msgid "Saving changes to SuSEFirewall..."
msgstr "Ukugcina utshintsho kwiifayili..."
#. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "Ayikwazi kubhaleka imimselo."
Modified: trunk/yast/xh/po/control.xh.po
===================================================================
--- trunk/yast/xh/po/control.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/control.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -18,323 +18,659 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.novell.com/linux/.\n"
+#| "</p>\n"
+#| "\t"
msgid ""
"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-" "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
msgstr ""
"\n"
-"<p><b>Sivuyisana nawe!</b></p>\n"
-" <p>Ukuhlohlwa kwe-SUSEevulekileyo kumatshini wakho kugqibekile.\n"
-" Emva kokunqomfa <b>Kugqityiwe</b>, ungangena kwisixokelelwano.</p>\n"
-" <p> Sindwendwele apha %1.</p>\n"
-" <p> Zonwabise kangangoko!<br> Iqela Osebenza Nalo Lophuhliso le-SUSE</p>\n"
-"\t"
+"<p>\n"
+" Ukuhlohla kugqibeke ngempumelelo.\n"
+" Isixokelelwano sakho sikulungele ukusetyenziswa.\n"
+" Nqomfa ku-Kugqityiwe ukungena kwisixokelelwano.\n"
+" </p>\n"
+" <p>\n"
+" Nceda sindwendwele apha http://www.novell.com/linux/.\n"
+" </p>\n"
+" \t"
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments. The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:21
+#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
#, fuzzy
-msgid "GNOME Desktop"
-msgstr "Ulwazi Olusesikrinini"
+#| msgid "IMAP Server"
+msgid "CIM Server"
+msgstr "Iseva ye-IMAP"
-#: control/control.openSUSE.glade.translations.glade:22
-#, fuzzy
-msgid "KDE Desktop"
-msgstr "Ulwazi Olusesikrinini"
-
-#: control/control.openSUSE.glade.translations.glade:23
-#, fuzzy
-msgid "XFCE Desktop"
-msgstr "Ulwazi Olusesikrinini"
-
-#: control/control.openSUSE.glade.translations.glade:24
-#, fuzzy
-msgid "LXDE Desktop"
-msgstr "Ulwazi Olusesikrinini"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:26
-#, fuzzy
-#| msgid "Alternate Desktops"
-msgid "Enlightenment Desktop"
-msgstr "Iintlobo Ezizezinye Zolwazi Olusesikrinini"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr ""
-
-#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
msgid "Installation Settings"
msgstr "Imimiselo Yokuhlohla"
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
+msgid "Overview"
+msgstr "Gabalala"
+
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+msgid "Expert"
+msgstr "Ubungcaphephe"
+
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
#, fuzzy
msgid "Live Installation Settings"
msgstr "Imimiselo Yokuhlohla"
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
msgid "Update Settings"
msgstr "Imimiselo Yohlaziyo"
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Network Configuration"
msgstr "Ubumbeko Lomsebenzi Wothungelwano"
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
msgid "Hardware Configuration"
msgstr "Ubumbeko Lokuseqokobheni Lekhompyutha"
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
msgid "Preparation"
msgstr "Ulungiselelo"
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
#, fuzzy
#| msgid "Saving Network Configuration"
msgid "Load linuxrc Network Configuration"
msgstr "Igcina ubumbeko lomsebenzi wothungelwano"
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
#, fuzzy
#| msgid "Network Address Setup"
msgid "Network Autosetup"
msgstr "Indlela Yokumisela Idilesi Yomsebenzi Wothungelwano"
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
msgid "Welcome"
msgstr "Wamkelekile"
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
#, fuzzy
#| msgid "Disk Activation"
msgid "Network Activation"
msgstr "Kunikwa i-Disk Isakhono Sokusebenziseka"
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
msgid "Disk Activation"
msgstr "Kunikwa i-Disk Isakhono Sokusebenziseka"
-#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
msgid "System Analysis"
msgstr "Uhlalutyo Lwesixokelelwano"
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
-msgid "Disk"
-msgstr "Idiski"
-
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
-msgid "Time Zone"
-msgstr "Izowuni Yexesha"
-
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
#, fuzzy
-msgid "Online Repositories"
+#| msgid "Online Update"
+msgid "Installer Update"
msgstr "Uhlaziyo Ngekhompyutha"
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
msgid "Add-On Products"
msgstr "Iimveliso Ezifakelwayo"
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "Ukukhetha Ulwazi Olusesikrinini"
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
+msgid "Disk"
+msgstr "Idiski"
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
#: control/control.openSUSE.glade.translations.glade:69
+msgid "Time Zone"
+msgstr "Izowuni Yexesha"
+
+#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
#, fuzzy
msgid "User Settings"
msgstr "Imimiselo Yesiseko"
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "Ukuhlohla"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
#, fuzzy
msgid "Installation Overview"
msgstr "Izilondolozi Zokuhohla"
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
#: control/control.openSUSE.glade.translations.glade:54
#: control/control.openSUSE.glade.translations.glade:55
#: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
#: control/control.openSUSE.glade.translations.glade:58
#: control/control.openSUSE.glade.translations.glade:59
#: control/control.openSUSE.glade.translations.glade:60
#: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
#: control/control.openSUSE.glade.translations.glade:75
#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
msgid "Perform Installation"
msgstr "Ukuhlohla Kuyenzeka"
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "Ukuhlohla"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
+msgid "Installation"
+msgstr "Ukuhlohla"
+
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
msgid "System for Update"
msgstr "Isixokelelwano ukwenzela Uhlaziyo"
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
msgid "Update"
msgstr "Uhlaziyo"
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
+msgid "Update Summary"
+msgstr "Isishwankathelo Sohlaziyo"
+
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
#: control/control.openSUSE.glade.translations.glade:122
#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
msgid "Perform Update"
msgstr "Uhlaziyo Luyenzeka"
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "Ubumbeko"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
msgid "Base Installation"
msgstr "Ukuhlohla Okusisiseko"
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
msgid "AutoYaST Settings"
msgstr "Imimiselo ye-YaST Ezenzekelayo"
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
+msgid "Configuration"
+msgstr "Ubumbeko"
+
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
msgid "System Configuration"
msgstr "Ubumbeko Lwesixokelelwano"
+#: control/control.SLES.glade.translations.glade:3
#, fuzzy
-#~| msgid ""
-#~| "\n"
-#~| "<p>\n"
-#~| "The installation has completed successfully.\n"
-#~| "Your system is ready for use.\n"
-#~| "Click Finish to log in to the system.\n"
-#~| "</p>\n"
-#~| "<p>\n"
-#~| "Please visit us at http://www.novell.com/linux/.\n"
-#~| "</p>\n"
-#~| "\t"
-#~ msgid ""
-#~ "\n"
-#~ "<p>\n"
-#~ "The installation has completed successfully.\n"
-#~ "Your system is ready for use.\n"
-#~ "Click Finish to log in to the system.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ "<p>\n"
-#~ " Ukuhlohla kugqibeke ngempumelelo.\n"
-#~ " Isixokelelwano sakho sikulungele ukusetyenziswa.\n"
-#~ " Nqomfa ku-Kugqityiwe ukungena kwisixokelelwano.\n"
-#~ " </p>\n"
-#~ " <p>\n"
-#~ " Nceda sindwendwele apha http://www.novell.com/linux/.\n"
-#~ " </p>\n"
-#~ " \t"
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.novell.com/linux/.\n"
+#| "</p>\n"
+#| "\t"
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+" "
+msgstr ""
+"\n"
+"<p>\n"
+" Ukuhlohla kugqibeke ngempumelelo.\n"
+" Isixokelelwano sakho sikulungele ukusetyenziswa.\n"
+" Nqomfa ku-Kugqityiwe ukungena kwisixokelelwano.\n"
+" </p>\n"
+" <p>\n"
+" Nceda sindwendwele apha http://www.novell.com/linux/.\n"
+" </p>\n"
+" \t"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
#, fuzzy
-#~| msgid "IMAP Server"
-#~ msgid "CIM Server"
-#~ msgstr "Iseva ye-IMAP"
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "Isixokelelwano ukwenzela Uhlaziyo"
-#~ msgid "Overview"
-#~ msgstr "Gabalala"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
-#~ msgid "Expert"
-#~ msgstr "Ubungcaphephe"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
#, fuzzy
-#~| msgid "Network Service Configuration (xinetd)"
-#~ msgid "Network Services Configuration"
-#~ msgstr "Ubumbeko Lwenkonzo Yomsebenzi Wothungelwano (xietd)"
+msgid "KVM Virtualization Host"
+msgstr "Ukubona"
-#~ msgid "Installation Summary"
-#~ msgstr "Isishwankathelo Sokuhlohla"
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
-#~ msgid "Update Summary"
-#~ msgstr "Isishwankathelo Sohlaziyo"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+msgid "Xen Virtualization Host"
+msgstr "Ukubona"
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:48
+#, fuzzy
+#| msgid "Network Service Configuration (xinetd)"
+msgid "Network Services Configuration"
+msgstr "Ubumbeko Lwenkonzo Yomsebenzi Wothungelwano (xietd)"
+
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Saving Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "Igcina ubumbeko lomsebenzi wothungelwano"
+
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "Isishwankathelo Sokuhlohla"
+
+#: control/control.openSUSE.glade.translations.glade:3
+#, fuzzy
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+"\n"
+"<p><b>Sivuyisana nawe!</b></p>\n"
+" <p>Ukuhlohlwa kwe-SUSEevulekileyo kumatshini wakho kugqibekile.\n"
+" Emva kokunqomfa <b>Kugqityiwe</b>, ungangena kwisixokelelwano.</p>\n"
+" <p> Sindwendwele apha %1.</p>\n"
+" <p> Zonwabise kangangoko!<br> Iqela Osebenza Nalo Lophuhliso le-SUSE</p>\n"
+"\t"
+
+#: control/control.openSUSE.glade.translations.glade:10
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:21
+#, fuzzy
+msgid "GNOME Desktop"
+msgstr "Ulwazi Olusesikrinini"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+msgid "KDE Plasma Desktop"
+msgstr "Ulwazi Olusesikrinini"
+
+#: control/control.openSUSE.glade.translations.glade:23
+msgid "Server (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+msgid "Xfce Desktop"
+msgstr "Ulwazi Olusesikrinini"
+
+#: control/control.openSUSE.glade.translations.glade:25
+#, fuzzy
+msgid "LXDE Desktop"
+msgstr "Ulwazi Olusesikrinini"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:27
+#, fuzzy
+#| msgid "Alternate Desktops"
+msgid "Enlightenment Desktop"
+msgstr "Iintlobo Ezizezinye Zolwazi Olusesikrinini"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+#, fuzzy
+msgid "Online Repositories"
+msgstr "Uhlaziyo Ngekhompyutha"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "Ukukhetha Ulwazi Olusesikrinini"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "Izilondolozi Zemveliso Ezifakelwayo"
@@ -401,9 +737,6 @@
#~ msgid "Customer Center"
#~ msgstr "Iziko Labaxumi"
-#~ msgid "Online Update"
-#~ msgstr "Uhlaziyo Ngekhompyutha"
-
#~ msgid "Release Notes"
#~ msgstr "Khulula Amanqaku"
@@ -473,10 +806,6 @@
#~ msgid "Virtual Machine"
#~ msgstr "Imimandla yolawulo yenene"
-#, fuzzy
-#~ msgid "XEN Virtualization Host"
-#~ msgstr "Ukubona"
-
#~ msgid "Software Selection"
#~ msgstr "Ukukhethwa Kokungaphakathi Ekhompyutheni"
Modified: trunk/yast/xh/po/country.xh.po
===================================================================
--- trunk/yast/xh/po/country.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/country.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2005-07-27 11:49+0200\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -684,7 +684,9 @@
#. command line help text for 'set hwclock' option
#: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
msgstr "Ixabiso elitsha lewotshi yeqokobhe lekhompyutha"
#. summary label
@@ -862,8 +864,8 @@
"Umhla awusebenziseki (SK:YG:UNYK) %1.\n"
"Ngenisa umhla ochanileyo.\n"
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
#, fuzzy
#| msgid "E&xpert Settings..."
msgid "Other &Settings..."
@@ -871,46 +873,46 @@
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
#, fuzzy
msgid "Date and Time (NTP is configured)"
msgstr "Le-printer ayimbunjwanga"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
#, fuzzy
msgid "Date and Time"
msgstr "Guqula Isixokelelwano Somhla Nesexesha"
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
#, fuzzy
msgid "&Hardware Clock Set to UTC"
msgstr "&Iwotshi Eseqokobheni Lekhompyutha Imiselwe Oku"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
msgid "&Region"
msgstr "&Ummandla"
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
msgid "Time &Zone"
msgstr "Izowuni &Yexesha"
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
#, fuzzy
msgid "Date and Time:"
msgstr "Guqula Isixokelelwano Somhla Nesexesha"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -919,7 +921,7 @@
"<p><b><big>Izowuni Yexesha Nemimiselo Yewotshi</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -934,7 +936,7 @@
" </p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -945,12 +947,12 @@
" </p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
msgid "Clock and Time Zone"
msgstr "Izowuni Yewotshi Neyexesha"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
msgid "Select a valid time zone."
msgstr "Khetha izowuni yexesha esebenzisekayo."
@@ -1039,181 +1041,188 @@
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "ngokwesiSpanish (saseLatin America)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
msgid "Italian"
msgstr "isiTaliyane"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
msgid "Portuguese"
msgstr "isiPhuthukezi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
msgid "Portuguese (Brazil)"
msgstr "isiPhuthukezi (saseBrazil)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
msgid "Portuguese (Brazil -- US accents)"
msgstr "isiPhuthukezi (saseBrazil - iimvakalozwi zaseUS)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
msgid "Greek"
msgstr "isiGrike"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
msgid "Dutch"
msgstr "isiDatshi"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
msgid "Danish"
msgstr "isiDanish"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
msgid "Norwegian"
msgstr "isiNorwegian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
msgid "Swedish"
msgstr "isiSwedish"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
msgid "Finnish"
msgstr "isiFinnish"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
msgid "Czech"
msgstr "isiCzech"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
msgid "Czech (qwerty)"
msgstr "isiCzech"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
msgid "Slovak"
msgstr "isiSlovak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
msgid "Slovak (qwerty)"
msgstr "isiSlovak (qwerty)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
msgid "Slovene"
msgstr "isiSlovene"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "isiHungarian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "isiPolish"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "isiRashiya"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "isiSerbian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "isiEstonian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "isiLithuanian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "isiTurkish"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "isiCroatian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "isiJapani"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "isiBelgian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "isiDvorak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "isiIcelandic"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "isiUkrainian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "isiKhmer"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "isi-Korea"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "isi-Arabhu"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "isi-Tajik"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "isiTshayina Somthonyama"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "isiTshayina Esingantsonkothanga"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "isi-Romanian"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
#, fuzzy
#| msgid "Internal Zone"
msgid "US International"
Modified: trunk/yast/xh/po/crowbar.xh.po
===================================================================
--- trunk/yast/xh/po/crowbar.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/crowbar.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -22,19 +22,9 @@
msgid "Configuration of crowbar"
msgstr "Ulwakhelo lomenzi we-CD"
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr ""
-
#. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr ""
-
-#. target platform name
#: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
+msgid "SLES 12 SP1"
msgstr ""
#. combobox label
@@ -48,11 +38,11 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough 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"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-…</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
@@ -197,30 +187,33 @@
msgstr "&Idilesi ye-IP"
#. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
msgid "Name"
msgstr "Igama"
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
msgid "URL"
msgstr "I-URL"
#. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
msgid "Ask On Error"
msgstr ""
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
#, fuzzy
#| msgid "Target Name"
msgid "Target Platform"
msgstr "Igama Ekujoliswe Kulo"
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
#. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
#, fuzzy
#| msgid ""
#| "Hardware configuration %1 already exists.\n"
@@ -233,90 +226,97 @@
"Khetha olwahlukileyo."
#. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
#, fuzzy
#| msgid "Server URL: "
msgid "Server &URL"
msgstr "Iseva ye-URL:"
#. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
#, fuzzy
#| msgid "Report Name"
msgid "Repository Name"
msgstr "Igama Lengxelo"
#. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
msgid "&Ask On Error"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
#, fuzzy
#| msgid "Package Repository"
msgid "Repository &URL"
msgstr "Umthombo wePakethe"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
#, fuzzy
#| msgid "&Enable Repository"
msgid "A&dd Repository"
msgstr "&Yenza Asebenze uvimba"
#. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
#, fuzzy
#| msgid "Remote WINS Server"
+msgid "Local SMT Server"
+msgstr "Iseva Emgama ye-WINS"
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
+#, fuzzy
+#| msgid "Remote WINS Server"
msgid "Remote SMT Server"
msgstr "Iseva Emgama ye-WINS"
#. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
#, fuzzy
#| msgid "Mail Server"
msgid "SUSE Manager Server"
msgstr "Iseva Yemeyile"
#. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
msgid "Custom"
msgstr "Lungisela"
#. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
#, fuzzy
#| msgid "&User Name"
msgid "User Name"
msgstr "&Igama Lomsebenzisi"
#. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
msgid "Password"
msgstr "Igama lokugqithisela"
#. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
#, fuzzy
#| msgid "Set the password."
msgid "Repeat the Password"
msgstr "Misela ipaswedi."
#. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
#, fuzzy
#| msgid "Share name cannot be empty."
msgid "User name cannot be empty."
msgstr "Igama lolwabelwano alikwazi kuba likhamte."
#. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -325,7 +325,7 @@
"Zama kwakhona."
#. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
#, fuzzy
#| msgid ""
#| "Hardware configuration %1 already exists.\n"
@@ -338,19 +338,19 @@
"Khetha olwahlukileyo."
#. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
#, fuzzy
#| msgid "The search domain '%1' is invalid."
msgid "The interface format '%1' is not valid"
msgstr "I-domain yokufuna '%1' alisebenzi."
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
msgid "disabled"
msgstr "kukhutshwe isakhono"
#. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
#, fuzzy
#| msgid "The subnet mask is invalid."
msgid ""
@@ -360,7 +360,7 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
#, fuzzy
#| msgid "The IP address is invalid."
msgid ""
@@ -369,7 +369,7 @@
msgstr "Idilesi ye-IP ayisebenziseki."
#. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
#, fuzzy
#| msgid "The remote IP address is invalid."
msgid ""
@@ -378,97 +378,97 @@
msgstr "Idilesi ye-IP emgama ayisebenziseki."
#. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
#, fuzzy
#| msgid "The format of server address '%1' is not correct."
msgid "The router address '%1' is not part of network '%2'."
msgstr "Esi sigcwangciso sedilesi yeseva '%1' asilunganga."
#. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
#, fuzzy
#| msgid "The format of server address '%1' is not correct."
msgid "The IP address '%1' is not part of network '%2'."
msgstr "Esi sigcwangciso sedilesi yeseva '%1' asilunganga."
#. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
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:1335
+#: src/include/crowbar/complex.rb:1326
#, fuzzy
#| msgid "IP Address"
msgid "Min IP Address"
msgstr "Idilesi ye-IP"
#. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
#, fuzzy
#| msgid "IP Address"
msgid "Max IP Address"
msgstr "Idilesi ye-IP"
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
msgid "The address '%1' is not part of network '%2'."
msgstr ""
#. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
#, fuzzy
#| msgid "The network name must be shorter than 32 characters."
msgid "The lowest address must be lower than the highest one."
msgstr "Igama lomsebenzi wothungelwano mayibe mfutshane kuneempawu ezithatha izithuba ezingama-32."
#. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
msgid "Ranges '%1' and '%2' are overlapping."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
#, fuzzy
#| msgid "&Other Settings"
msgid "&User Settings"
msgstr "&Eminye Imimiselo"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
#, fuzzy
#| msgid "Network Mode"
msgid "N&etwork Mode"
msgstr "Imo Yokusebenza Kumsebenzi Wothungelwano"
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
#, fuzzy
#| msgid "Bond Network"
msgid "Bastion Network"
msgstr "Uthungelwano Lwemvumelwano"
#. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
#, fuzzy
#| msgid "Network"
msgid "Net&works"
msgstr "Umsebenzi wothungelwano"
#. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
#, fuzzy
#| msgid "&Countries"
msgid "Re&positories"
msgstr "&Amazwe"
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
msgid ""
"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
@@ -477,7 +477,7 @@
msgstr ""
#. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
#, fuzzy
#| msgid "Modem Configuration Overview"
msgid "Crowbar Configuration Overview"
@@ -544,44 +544,44 @@
msgstr "Kuyandululwa..."
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
#, fuzzy
#| msgid "Initializing Scanner Configuration"
msgid "Initializing crowbar Configuration"
msgstr "Kundululwa Ubumbeko Lokufota Ngokuskena"
#. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
#, fuzzy
#| msgid "Read the configuration"
msgid "Read the configuraton"
msgstr "Funda ulwakhelo"
#. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
msgid "Reading the configuration..."
msgstr "Kufundwa ubumbeko..."
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
msgid "Finished"
msgstr "Kugqityiwe"
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
#, fuzzy
#| msgid "Saving Configuration"
msgid "Saving crowbar Configuration"
msgstr "Kugcinwa Ubumbeko"
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
msgid "Write the settings"
msgstr "Bhala imimiselo"
#. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
msgid "Writing the settings..."
msgstr "Kubhalwa imimiselo..."
Modified: trunk/yast/xh/po/dhcp-server.xh.po
===================================================================
--- trunk/yast/xh/po/dhcp-server.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/dhcp-server.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -59,9 +59,7 @@
msgstr ""
#. command line help text for an option
-#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
msgid "List all defined hosts with a fixed address"
msgstr ""
@@ -101,159 +99,165 @@
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
#, fuzzy
msgid "Select the network interface to use"
msgstr "Khetha &Isithuba Solandelelwano Sokusebenzisa:"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
msgid "Print the currently used interface and list other available interfaces"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
#, fuzzy
msgid "Print current options"
msgstr "Isikhethwa Sangoku:"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
msgid "Set a global option"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
msgid "Option key (for example, ntp-servers)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
msgid "Option value (for example, IP address)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
msgid "Lowest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
msgid "Highest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
msgid "Default lease time in seconds"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
msgid "Maximum lease time in seconds"
msgstr ""
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
#, fuzzy
msgid "DHCP server is enabled"
msgstr "Iseva ye-DHCP"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
#, fuzzy
msgid "DHCP server is disabled"
msgstr "Udonga lomlilo lwaphulwe isakhono"
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
#, fuzzy
msgid "Host: %1"
msgstr "&Umamkeli:"
#. command-line text output, %1 is hardwarre address
#. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
msgid "Hardware: %1"
msgstr ""
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
#, fuzzy
msgid "IP Address: %1"
msgstr "Idilesi ye-IP"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
msgid "Hostname not specified."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
#, fuzzy
msgid "Specified host does not exist."
msgstr "Ifayili exeliweyo ayikho kwayona."
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
msgid "None"
msgstr "Akukho"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
#, fuzzy
msgid "Selected Interfaces: %1"
msgstr "Khetha &Isithuba Solandelelwano Sokusebenzisa:"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
msgid "Other Interfaces: %1"
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
#, fuzzy
msgid "Specified interface does not exist."
msgstr "Ifayili exeliweyo ayikho kwayona."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
msgid "Operation with the interface not specified."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
msgid "Option key must be set."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
msgid "Value must be set."
msgstr ""
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
msgid "Address Range: %1-%2"
msgstr ""
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
msgid "Default Lease Time: %1"
msgstr ""
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
msgid "Maximum Lease Time: %1"
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
msgid "Saving the configuration failed. Change the settings?"
msgstr ""
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+msgid "Saving the configuration failed"
+msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
+
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
#, fuzzy
msgid "DHCP Server Configuration"
msgstr "Gcina ubumbeko"
@@ -261,98 +265,98 @@
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
#, fuzzy
msgid "Global Options"
msgstr "&Izikhethwa"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
#, fuzzy
msgid "Subnet Configuration"
msgstr "Gcina ubumbeko"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
msgid "Host with Fixed Address"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
msgid "Shared Network"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
#, fuzzy
msgid "Pool of Addresses"
msgstr "Idilesi ye-IP"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
msgid "Group-Specific Options"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
msgid "Class"
msgstr "Udidi"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
msgid "&Subnet"
msgstr ""
#. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
#, fuzzy
msgid "&Host"
msgstr "&Umamkeli:"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
msgid "Shared &Network"
msgstr ""
#. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
msgid "&Group"
msgstr "&Iqela"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
#, fuzzy
msgid "&Pool of Addresses"
msgstr "Idilesi ye-IP"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
msgid "&Class"
msgstr "&Udidi"
#. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
msgid "Declaration Types"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
msgid "Declaration Type"
msgstr ""
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
#, fuzzy
msgid "Interface Configuration"
msgstr "Gcina ubumbeko"
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
msgid "TSIG Key Management"
msgstr ""
@@ -377,7 +381,7 @@
msgstr "Imizuzwana"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
#, fuzzy
msgid "DHCP Server: Start-Up"
msgstr "Iseva ye-DHCP"
@@ -385,203 +389,155 @@
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
#, fuzzy
msgid "Start-Up"
msgstr "Qalisa &Uhlaziyo"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
msgid "DHCP Server: Card Selection"
msgstr ""
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
#, fuzzy
msgid "Card Selection"
msgstr "Ukukhetha Ikhathalogu"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
msgid "DHCP Server: Global Settings"
msgstr ""
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
#, fuzzy
msgid "Global Settings"
msgstr "Imimiselo Yokuhlohla"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
#, fuzzy
msgid "DHCP Server: Dynamic DHCP"
msgstr "Iseva ye-DHCP"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
msgid "Dynamic DHCP"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
msgid "DHCP Server: Host Management"
msgstr ""
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
#, fuzzy
msgid "Host Management"
msgstr "&Igama likamamkeli"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
msgid "DHCP Server: Expert Settings"
msgstr ""
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
msgid "Expert Settings"
msgstr "Imimiselo Yobungcaphephe"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
msgid "When &Booting"
msgstr "Xa &Kumiselwa Inkqubo"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
#, fuzzy
msgid "&Manually"
msgstr "Ngokwenza ngesandla"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
msgid "When Booting"
msgstr "Xa Kumiselwa Inkqubo"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
msgid "Manually"
msgstr "Ngokwenza ngesandla"
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
+#: src/include/dhcp-server/dialogs2.rb:334
#, fuzzy
-msgid "DHCP server is running"
-msgstr "Inkonzo iyaqhuba"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-#, fuzzy
-msgid "DHCP server is not running"
-msgstr "Inkonzo iyaqhuba"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-#, fuzzy
-msgid "&Start DHCP Server Now"
-msgstr "&Qalisa Inkonzo Ngoku"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-#, fuzzy
-msgid "S&top DHCP Server Now"
-msgstr "N&qumamisa Inkonzo Ngoku"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "Gcina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-#, fuzzy
-msgid "Start DHCP Server Now"
-msgstr "Qalisa Inkonzo Ngoku"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-#, fuzzy
-msgid "Stop DHCP Server Now"
-msgstr "Qalisa Inkonzo Ngoku"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "Gcina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
-
-#: src/include/dhcp-server/dialogs2.rb:371
-#, fuzzy
msgid "DHCP Server Start-up Arguments"
msgstr "Iseva ye-DHCP"
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
msgid "Network Cards for DHCP Server"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
#, fuzzy
msgid "Selected"
msgstr "Musa Ukukhetha &Nto"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
#, fuzzy
msgid "Interface Name"
msgstr "Igama Lesixhobo"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
msgid "Device Name"
msgstr "Igama Lesixhobo"
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
msgid "IP"
msgstr ""
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
#, fuzzy
msgid "&Select"
msgstr "Khetha &Konke"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
#, fuzzy
msgid "&Deselect"
msgstr "Nceda khetha"
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
msgid "DHCP address"
msgstr "Iidilesi ze-DHCP"
#. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
#, fuzzy
msgid "At least one network interface must be selected."
msgstr "Akukho zithuba zokudibana zomsebenzi wothungelwano ezinobumbeko"
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
msgid ""
"One or more selected network interfaces is not configured (no assigned IP address \n"
"and netmask)."
@@ -589,66 +545,66 @@
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
#, fuzzy
msgid "&LDAP Support"
msgstr "&nkxaso ye-LDAP Inesakhono Sokusebenza"
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
#, fuzzy
msgid "DHCP Server &Name (optional)"
msgstr "Gcina ubumbeko"
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
#, fuzzy
msgid "&Domain Name"
msgstr "Igama Lesixhobo"
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
msgid "&Primary Name Server IP"
msgstr ""
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
msgid "&Secondary Name Server IP"
msgstr ""
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
msgid "Default &Gateway (Router) "
msgstr ""
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
#, fuzzy
msgid "NTP &Time Server"
msgstr "Iseva ye-NTP"
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
#, fuzzy
msgid "&Print Server"
msgstr "Iseva ye-IPP"
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
#, fuzzy
msgid "&WINS Server"
msgstr "Iiseva ze-&NFS"
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
msgid "Default &Lease Time"
msgstr ""
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
msgid "&Units"
msgstr ""
@@ -656,39 +612,39 @@
#. error popup
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
msgid "The specified value is not a valid hostname or IP address."
msgstr ""
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
#, fuzzy
msgid "Subnet Information"
msgstr "Gcina ubumbeko"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
#, fuzzy
msgid "Current &Network"
msgstr "Isikhethwa Sangoku:"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
#, fuzzy
msgid "Current Net&mask"
msgstr "Isimo Sangoku:"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
msgid "Netmask Bi&ts"
msgstr ""
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
#: src/include/dhcp-server/dns-server-dialogs.rb:81
#, fuzzy
msgid "Min&imum IP Address"
@@ -696,13 +652,13 @@
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
#: src/include/dhcp-server/dns-server-dialogs.rb:83
#, fuzzy
msgid "Ma&ximum IP Address"
msgstr "Idilesi ye-IP"
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
#, fuzzy
msgid "IP Address Range"
msgstr "Idilesi ye-IP"
@@ -711,10 +667,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
#, fuzzy
msgid "&First IP Address"
msgstr "Idilesi ye-IP"
@@ -723,63 +679,63 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
#, fuzzy
msgid "&Last IP Address"
msgstr "Idilesi ye-IP"
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
msgid "Allow Dynamic &BOOTP"
msgstr ""
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
msgid "Lease Time"
msgstr ""
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
msgid "&Default"
msgstr "&Into ehlala ikhona"
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
msgid "&Maximum"
msgstr ""
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
msgid "Uni&ts"
msgstr ""
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
msgid "Create New DNS Zone from Scratch"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
msgid "Edit Current DNS Zone"
msgstr ""
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
#, fuzzy
msgid "Get Current Zone Information"
msgstr "Funda ubumbeko lwangoku"
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
msgid "&Synchronize DNS Server..."
msgstr ""
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -787,8 +743,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
msgid "Enter values for both ends of the IP address range."
msgstr ""
@@ -796,141 +752,141 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
msgid ""
"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
msgstr ""
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
#, fuzzy
msgid "Registered Host"
msgstr "Abamkeli Aba&mgama"
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
msgid "Name"
msgstr "Igama"
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
#, fuzzy
msgid "Hardware Address"
msgstr "Idilesi ye-IP"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
msgid "Type"
msgstr "Uhlobo"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
msgid "List Setup"
msgstr ""
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
msgid "&Name"
msgstr "&Igama"
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
#, fuzzy
msgid "&IP Address"
msgstr "Idilesi ye-IP"
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
msgid "&Hardware Address"
msgstr ""
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
#, fuzzy
msgid "&Ethernet"
msgstr "&Ezinye"
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
msgid "&Token Ring"
msgstr ""
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
msgid "C&hange in List"
msgstr ""
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "Dele&te from List"
msgstr ""
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
msgid "Ethernet"
msgstr "I-Ethernet"
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
msgid "Token Ring"
msgstr "Isangqa Somqondiso"
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
#, fuzzy
msgid "The hardware address is invalid.\n"
msgstr "Ixabiso le-%1 alisebenzi nto."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
msgid "The hardware address must be unique."
msgstr ""
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
msgid "The hostname cannot be empty."
msgstr ""
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
msgid "A host named %1 already exists."
msgstr ""
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
msgid "Enter a host IP."
msgstr ""
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
msgid "The hardware address must be defined."
msgstr ""
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
msgid "Select a host first."
msgstr ""
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
#, fuzzy
msgid "The input value must be defined."
msgstr "Eli nqaku maligqibeke."
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -943,15 +899,15 @@
msgstr ""
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -963,7 +919,7 @@
msgstr ""
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
msgid "DHCP Server Wizard (%1 of 4)"
msgstr ""
@@ -1183,7 +1139,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
msgid "The last IP address must be higher than the first one."
msgstr ""
@@ -1207,7 +1163,7 @@
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#. TRANSLATORS: popup error, followed by a newline and a valid hostname description
#: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
msgid "Invalid hostname."
msgstr ""
@@ -1218,9 +1174,9 @@
#. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
#: src/include/dhcp-server/dns-server-dialogs.rb:462
#: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
#, fuzzy
msgid "Invalid IP address."
msgstr "Idilesi ye-IP"
@@ -1237,51 +1193,51 @@
msgstr ""
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
msgid "Regenerating DNS zone entries..."
msgstr ""
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
msgid "Adding a New DNS Record"
msgstr ""
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "&Igama likamamkeli"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr ""
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
msgid "Removing DNS Records Matching Range"
msgstr ""
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr ""
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
msgstr ""
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1289,84 +1245,84 @@
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
#: src/include/dhcp-server/dns-server-wizard.rb:1107
#, fuzzy
msgid "Cannot create zone %1."
msgstr "Akkwazi kudaleka uvimba weefayili '%1'."
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
msgid "Synchronizing DNS reverse records..."
msgstr ""
#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
msgstr ""
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
msgid "&Domain"
msgstr "&Ummandla wolawulo"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
#, fuzzy
msgid "&Network"
msgstr "ikhadi yothungelwano ngomsebenzi"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "Net&mask"
msgstr "Isuntsu elilawula &uthungelwano"
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
msgid "DNS Zone Records"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
#, fuzzy
msgid "Hostname"
msgstr "&Igama likamamkeli"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Assigned IP"
msgstr ""
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
#, fuzzy
msgid "&Add..."
msgstr "&Fakela"
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
msgid "&Special Tasks"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
msgid "Add New Range of DNS Records"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr ""
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
msgid "Synchronize with Reverse Zone %1"
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
msgid "DHCP Server: DNS Server Synchronization"
msgstr ""
@@ -1660,8 +1616,7 @@
msgstr ""
#. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1683,21 +1638,9 @@
"Ukuvula udonga lomlilo ukuze kuvunyelwe ufikeleleko kwinkonzo esuka kwiikhompyutha ezimgama, \n"
" misela<b>%1</b>.<br>"
-#. help text 1/5
+#. help text 2/5
#: src/include/dhcp-server/helps.rb:39
-#, fuzzy
msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big> Ukuqalisa Kwenkonzo</big></b><br>\n"
-"Ukuqalisa inkonzo lonke ixesha ikhompyutha yakho imiselwa inkqubo, misela\n"
-" <b>%1</b>. Kungenjalo misela <b>%2</b>.</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-msgid ""
"<p>\n"
"To run the DHCP server in chroot jail, set\n"
"<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1705,7 +1648,7 @@
msgstr ""
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1713,7 +1656,7 @@
msgstr ""
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
"To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1723,7 +1666,7 @@
msgstr ""
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1733,14 +1676,14 @@
msgstr ""
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
"Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
msgstr ""
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
"Set the name of the host for which to set the fixed address or other\n"
@@ -1748,7 +1691,7 @@
msgstr ""
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
"Set the name of the group of declarations in <b>Group Name</b>. \n"
@@ -1757,7 +1700,7 @@
msgstr ""
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
"Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1766,7 +1709,7 @@
msgstr ""
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1775,14 +1718,14 @@
msgstr ""
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
msgstr ""
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
#, fuzzy
msgid ""
"<p>\n"
@@ -1795,14 +1738,14 @@
"yikhethe uze unqomfe</b> Cima</b>.</p>"
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
msgstr ""
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1810,7 +1753,7 @@
msgstr ""
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1820,7 +1763,7 @@
msgstr ""
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1829,7 +1772,7 @@
msgstr ""
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -1838,7 +1781,7 @@
msgstr ""
#. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
"Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -1847,7 +1790,7 @@
msgstr ""
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
#, fuzzy
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
@@ -1858,14 +1801,14 @@
" hlela ubumbeko lwazo.<br></p>\n"
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
msgstr ""
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1873,14 +1816,14 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -1888,40 +1831,40 @@
msgstr ""
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
msgstr ""
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr ""
#. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
msgstr ""
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
msgid ""
"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
msgstr ""
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -1930,7 +1873,7 @@
msgstr ""
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -1941,7 +1884,7 @@
msgstr ""
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -1949,14 +1892,14 @@
msgstr ""
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
msgstr ""
#. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -1964,7 +1907,7 @@
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
#, fuzzy
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
@@ -1974,7 +1917,7 @@
"Sebenzisa le ngxoxo ukulawula amaqhosa e-TSIG.</p>\n"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -1984,7 +1927,7 @@
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
#, fuzzy
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr ""
@@ -1992,40 +1935,40 @@
"yikhethe uze unqomfe</b> Cima</b>.</p>"
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>Select the type of declaration to add.</p>"
msgstr ""
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
msgstr ""
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
msgstr ""
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
msgstr ""
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
msgstr ""
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2033,7 +1976,7 @@
msgstr ""
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
msgid ""
"<p>To create a condition class that can be used for\n"
"handling clients differently depending on the class to which they belong,\n"
@@ -2043,24 +1986,24 @@
#. selection box
#. selection box
#. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
#, fuzzy
msgid "A&ddresses"
msgstr "Idilesi ye-IP"
#. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
msgid "The entered address is not valid."
msgstr ""
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
msgid "At least one address must be specified."
msgstr ""
@@ -2070,107 +2013,107 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
#, fuzzy
msgid "&Values"
msgstr "Ixabiso"
#. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
msgid "The entered addresses are not valid."
msgstr ""
#. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
msgid "At least one address pair must be specified."
msgstr ""
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
msgid "On"
msgstr "Imo yokusebenza"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
msgid "Off"
msgstr "Imo yokungasebenzi"
#. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
msgid "A value must be specified."
msgstr ""
#. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
#, fuzzy
msgid "&New Address"
msgstr "Idilesi ye-IP"
#. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
#, fuzzy
msgid "&New Value"
msgstr "Ixabiso"
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
msgid "Separate multiple addresses with spaces."
msgstr ""
#. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
msgid "&Add Address Pair"
msgstr ""
#. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
msgid "The lowest address must be lower than the highest one."
msgstr ""
#. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
msgid "If you change this, also update the syslog configuration."
msgstr ""
#. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
msgid "&Hardware Type"
msgstr ""
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
#, fuzzy
msgid "&MAC Address"
msgstr "Idilesi ye-IP"
#. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
#, fuzzy
msgid "&Lowest IP Address"
msgstr "Idilesi ye-IP"
#. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
#, fuzzy
msgid "&Highest IP Address"
msgstr "Idilesi ye-IP"
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2178,7 +2121,7 @@
msgstr ""
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
#, fuzzy
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
@@ -2189,7 +2132,7 @@
"Qhuba i-Firewall ye-YST2.\n"
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
#, fuzzy
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
@@ -2200,8 +2143,8 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
@@ -2209,221 +2152,207 @@
"Lo msebenzi awukho ngexesha\n"
"lolungiselelo ngokuhlohla okuzenzekelayo."
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-#, fuzzy
-msgid "Restart DHCP Server"
-msgstr "Iseva ye-DHCP"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server"
-msgstr "Gcina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
-
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
#, fuzzy
msgid "&Configured Declarations"
msgstr "&Tsiba Ubumbeko "
#. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
msgid "&Dynamic DNS"
msgstr ""
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
#, fuzzy
msgid "Forward Zone TSIG &Key"
msgstr "Amaqhosha Angoku e-TSIG"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
#, fuzzy
msgid "Reverse Zone TSIG &Key"
msgstr "Amaqhosha Angoku e-TSIG"
#. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
#, fuzzy
msgid "Select File with Authentication Key"
msgstr "Khetha Ifayili Ukwenzela Iqhosha Elinyanisekisiweyo"
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-#, fuzzy
-msgid "&Start DHCP Server"
-msgstr "Iseva ye-DHCP"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
msgid "&Run DHCP Server in Chroot Jail"
msgstr ""
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
msgid "Ad&vanced"
msgstr "Oseku&qhubele phambili"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
#, fuzzy
msgid "Display &Log"
msgstr "Iimposiso Eziboniswayo: %1"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
#, fuzzy
msgid "&Interface Configuration"
msgstr "Gcina ubumbeko"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
#, fuzzy
msgid "&Network Address"
msgstr "Idilesi ye-IP"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
#, fuzzy
msgid "Network &Mask"
msgstr "ikhadi yothungelwano ngomsebenzi"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
msgid "Group &Name"
msgstr "&Igama Leqela:"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
msgid "Pool &Name"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
msgid "Shared Network &Name"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
msgid "Class &Name"
msgstr ""
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
#, fuzzy
msgid "Available Interfaces"
msgstr "O&kukhoyo naku:"
#. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
#, fuzzy
msgid "Open &Firewall for Selected Interfaces"
msgstr "Isiqhagamshelanisi sodonga lomlilo sivuliwe kwizithuba zokudibana ezikhethiweyo"
#. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
msgid "&Enable Dynamic DNS for This Subnet"
msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
msgid "&Update Global Dynamic DNS Settings"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
msgid "&Zone"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
#, fuzzy
msgid "&Primary DNS Server"
msgstr "Iseva ye-DNS"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
msgid "Re&verse Zone"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
#, fuzzy
msgid "Pr&imary DNS Server"
msgstr "Iseva ye-DNS"
#. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
#, fuzzy
msgid "DHCP Server &Expert Configuration..."
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
#, fuzzy
msgid "Initializing DHCP Server Configuration"
msgstr "Kundululwa Ubumbeko lwe-Firewall"
#. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
msgid "Check the environment"
msgstr "Qwalasela imo engqongileyo"
#. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
#, fuzzy
msgid "Read firewall settings"
msgstr "Bhala imimiselo ye-Firewall"
#. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
msgid "Read DHCP server settings"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
msgid "Read DNS server settings"
msgstr ""
#. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
#, fuzzy
msgid "Checking the environment..."
msgstr "Qwalasela imo engqongileyo"
#. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
#, fuzzy
msgid "Reading firewall settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
#, fuzzy
msgid "Reading DHCP server settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
#, fuzzy
msgid "Reading DNS server settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
msgid "Finished"
msgstr "Kugqityiwe."
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2434,109 +2363,109 @@
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:1475
+#: src/modules/DhcpServer.pm:1488
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
msgstr ""
#. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
msgstr ""
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
#, fuzzy
msgid "Saving DHCP Server Configuration"
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
#. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
#, fuzzy
msgid "Write DHCP server settings"
msgstr "Bhala imimiselo ye-Firewall"
#. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
msgid "Write firewall settings"
msgstr "Bhala imimiselo ye-Firewall"
#. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
#, fuzzy
msgid "Restart DHCP server"
msgstr "Iseva ye-DHCP"
#. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
#, fuzzy
msgid "Write DNS server settings"
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
#, fuzzy
msgid "Writing DHCP server settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
msgid "Writing firewall settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
#, fuzzy
msgid "Restarting DHCP server..."
msgstr "Kuhlohlwa umqhubi..."
#. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
#, fuzzy
msgid "Writing DNS server settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
#, fuzzy
msgid "Error occurred while restarting the DHCP daemon."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
msgid "The DHCP server is started at boot time"
msgstr ""
#. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
msgid "The DHCP server is not started at boot time"
msgstr ""
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
msgid "Listen On: %1"
msgstr ""
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
msgid "Dynamic Address Range: %1"
msgstr ""
#. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
#, fuzzy
msgid "DHCP service DN is not defined."
msgstr "Isixhobo asinabumbeko"
@@ -2545,26 +2474,80 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#: src/modules/DhcpServer.pm:2754
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
#, fuzzy
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
#, fuzzy
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
+
+#, fuzzy
+#~ msgid "DHCP server is running"
+#~ msgstr "Inkonzo iyaqhuba"
+
+#, fuzzy
+#~ msgid "DHCP server is not running"
+#~ msgstr "Inkonzo iyaqhuba"
+
+#, fuzzy
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "&Qalisa Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "N&qumamisa Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "Gcina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "Qalisa Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "Qalisa Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "Gcina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big> Ukuqalisa Kwenkonzo</big></b><br>\n"
+#~ "Ukuqalisa inkonzo lonke ixesha ikhompyutha yakho imiselwa inkqubo, misela\n"
+#~ " <b>%1</b>. Kungenjalo misela <b>%2</b>.</p>"
+
+#, fuzzy
+#~ msgid "Restart DHCP Server"
+#~ msgstr "Iseva ye-DHCP"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "Gcina Iinguquko uze Uphinde Uqalise Inkonzo Ngoku"
+
+#, fuzzy
+#~ msgid "&Start DHCP Server"
+#~ msgstr "Iseva ye-DHCP"
Modified: trunk/yast/xh/po/dns-server.xh.po
===================================================================
--- trunk/yast/xh/po/dns-server.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/dns-server.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -312,8 +312,7 @@
#. TRANSLATORS: commandline error message
#. Both Add and Remove defined => Error!
#: 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:999 src/include/dns-server/cmdline.rb:1049
#: src/include/dns-server/cmdline.rb:1108
#: src/include/dns-server/cmdline.rb:1244
#: src/include/dns-server/cmdline.rb:1303
@@ -386,11 +385,10 @@
#. Table header item - ACL-options
#. Table menu item - Records listing
#: 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:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
msgid "Value"
msgstr "Ixabiso"
@@ -408,7 +406,7 @@
#. TRANSLATORS: commandline table header item
#. Textentry - DNS adding zone - Name
#: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
msgid "Name"
msgstr "Igama"
@@ -418,9 +416,9 @@
#. Table header item - DNS listing zones
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
msgid "Type"
msgstr "Uhlobo"
@@ -434,8 +432,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
#: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
msgid "Forwarders"
msgstr ""
@@ -465,12 +463,11 @@
#. TRANSLATORS: commandline table header item
#. TRANSLATORS: commandline table header item
#. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: 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:1905
+#: src/include/dns-server/dialog-main.rb:1639
msgid "Zone"
msgstr "Izowuni"
@@ -502,14 +499,14 @@
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
msgid "Mail Server"
msgstr "Iseva Yemeyile"
#. TRANSLATORS: commandline table header item
#. Table header item - listing mail servers
#: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
msgid "Priority"
msgstr ""
@@ -576,8 +573,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:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
msgid "DNS Zones"
msgstr ""
@@ -600,7 +597,7 @@
#. check box
#. TRANSLATORS: checkbox label, turning LDAP support on or off
#: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
msgid "&LDAP Support Active"
msgstr "&nkxaso ye-LDAP Inesakhono Sokusebenza"
@@ -627,143 +624,95 @@
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
msgid "DNS Server"
msgstr "Iseva ye-DNS"
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#, fuzzy
-#| msgid "Drop Changes"
-msgid "Apply Changes"
-msgstr "Lahla Utshintsho"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-#, fuzzy
-msgid "Start-Up"
-msgstr "Qalisa &Uhlaziyo"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-#, fuzzy
-msgid "Basic Options"
-msgstr "&Izikhethwa"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "Kugcinwa ingxelo"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: 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"
-msgstr ""
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-#, fuzzy
-msgid "TSIG Keys"
-msgstr "Amaqhosha Angoku e-TSIG"
-
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
msgid "Local DNS Resolution &Policy"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
msgid "Merging forwarders is disabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
msgid "Automatic merging"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
msgid "Merging forwarders is enabled"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
#, fuzzy
msgid "Custom configuration"
msgstr "Gcina ubumbeko"
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
#, fuzzy
msgid "Custom policy"
msgstr "Ukukhanda okwenzelwe oko"
#. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
msgid "Local DNS Resolution &Forwarder"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
#, fuzzy
msgid "Using system name servers"
msgstr "Iseva Yemeyile"
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
msgid "This name server (bind)"
msgstr ""
#. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
msgid "Local dnsmasq server"
msgstr ""
#. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
#, fuzzy
msgid "Add IP Address"
msgstr "Idilesi ye-IP"
#. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
#, fuzzy
msgid "IPv4 or IPv6 A&ddress"
msgstr "Idilesi ye-IPv4 okanye ye-IPv6"
#. Selectionbox for listing current DNS-Forwarders
#. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
msgid "Forwarder &List"
msgstr ""
#. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
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:877
+#: src/include/dns-server/dialog-main.rb:611
#, fuzzy
#| msgid "Cannot create account for user %1."
msgid "Cannot find local equivalent for IP %1."
msgstr "Ayikwazeki ukudaleka iakhawunti yomsebenzisi %1."
#. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
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"
@@ -771,12 +720,12 @@
msgstr ""
#. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
#, fuzzy
msgid "Invalid IPv4 or IPv6 address."
msgstr "Le dilesi ye-IP ayisebenzi"
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
#, fuzzy
msgid ""
"A valid IPv6 address consists of letters a-f, numbers,\n"
@@ -786,51 +735,51 @@
"kuluhlu 0-255 olwahlukaniswa ngamachaphaza."
#. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
#, fuzzy
msgid "The specified forwarder is already present."
msgstr "Isikhethwa esikhethiweyo sesikhona."
#. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
msgid "Add or Change Option"
msgstr ""
#. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
#, fuzzy
msgid "O&ption"
msgstr "Ekunokukhethwa kuko:"
#. Textentry for setting the basic-option value
#. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
#, fuzzy
msgid "&Value"
msgstr "Ixabiso"
#. Pushbutton for changing the basic-option
#. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
#, fuzzy
msgid "C&hange"
msgstr "Ing&uquko..."
#. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
#, fuzzy
msgid "Current Options"
msgstr "Isikhethwa Sangoku:"
#. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
msgid "Option"
msgstr "Ekunokukhethwa kuko:"
#. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
#, fuzzy
msgid ""
"Really set this\n"
@@ -838,7 +787,7 @@
msgstr "Uphinda umisele ngokwenene yonke into kumaxabiso ahlala ekho?"
#. 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:1173
+#: src/include/dns-server/dialog-main.rb:907
#, fuzzy
msgid ""
"Option %1 can only have a yes or no value set.\n"
@@ -846,123 +795,123 @@
msgstr "Ekukhethwa kuko '%1' akunakuba naxabiso. Ixabiso elinikiweyo: %2"
#. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1190
+#: src/include/dns-server/dialog-main.rb:924
msgid ""
"Option %1 can only be a number.\n"
"Really set it to %2?\n"
msgstr ""
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
msgid ""
"Quotes are not used correctly in this option.\n"
"Really set it to %1?\n"
msgstr ""
#. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
msgid ""
"Brackets are not used correctly in this option.\n"
"Really set it to %1?\n"
msgstr ""
#. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
msgid ""
"Option %1 should be set only once.\n"
"Really add another one?\n"
msgstr ""
#. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
msgid "Log Type"
msgstr ""
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
#, fuzzy
msgid "&System Log"
msgstr "Ukuqwalaselwa Kwesixokelelwano"
#. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
#, fuzzy
msgid "&File"
msgstr "&Igama lefayili"
#. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
msgid "Maximum &Size (MB)"
msgstr ""
#. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
msgid "Maximum &Versions"
msgstr ""
#. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
msgid "Additional Logging"
msgstr ""
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
msgid "Log All DNS &Queries"
msgstr ""
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
#, fuzzy
msgid "Log Zone &Updates"
msgstr "Uhlaziyo Ngekhompyutha"
#. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
msgid "Log Zone &Transfers"
msgstr ""
#. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
msgid "Select File for Log"
msgstr ""
#. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
#, fuzzy
msgid "Option Setup"
msgstr "Ekunokukhethwa kuko:"
#. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
msgid "&Name"
msgstr "&Igama"
#. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
#, fuzzy
msgid "Current ACL List"
msgstr "Amaqhosha Angoku e-TSIG"
#. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
msgid "ACL"
msgstr ""
#. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
msgid ""
"This ACL is used by %1 zones.\n"
"Really remove it?\n"
msgstr ""
#. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
#, fuzzy
msgid "The specified ACL entry already exists."
msgstr "Ifayili exeliweyo ayikho kwayona."
#. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
#, fuzzy
msgid "Add New Zone "
msgstr "Faka Isikhethwa Esitsha"
@@ -972,8 +921,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:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
msgid "Master"
msgstr "Ingcali"
@@ -983,9 +932,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:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
msgid "Slave"
msgstr ""
@@ -994,19 +943,19 @@
#. TRANSLATORS: Table item - Server type
#. #-#-#-#-# dns-server.xgettext.pot #-#-#-#-#
#. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
msgid "Forward"
msgstr ""
#. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
#, fuzzy
msgid "Configured DNS Zones"
msgstr "Yenza Ubumbeko lwee-disk &ze-DASD"
#. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
#, fuzzy
msgid "A zone with the specified name is already configured."
msgstr ""
@@ -1015,99 +964,147 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
msgid "Saving the configuration failed. Change the settings?"
msgstr ""
#. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
+#: src/include/dns-server/dialog-main.rb:1903
#, fuzzy
msgid "Saving the configuration failed"
msgstr "Gcina ubumbeko"
#. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
msgid ""
"All changes will be lost.\n"
"Really leave the DNS server configuration without saving?"
msgstr ""
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+#, fuzzy
+#| msgid "Drop Changes"
+msgid "Apply Changes"
+msgstr "Lahla Utshintsho"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+#, fuzzy
+msgid "Start-Up"
+msgstr "Qalisa &Uhlaziyo"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+#, fuzzy
+msgid "Basic Options"
+msgstr "&Izikhethwa"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "Kugcinwa ingxelo"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr ""
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+#, fuzzy
+msgid "TSIG Keys"
+msgstr "Amaqhosha Angoku e-TSIG"
+
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
msgid "A&llow Dynamic Updates"
msgstr ""
#. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
#, fuzzy
msgid "TSIG &Key"
msgstr "Amaqhosha Angoku e-TSIG"
#. check box
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
msgid "Enable &Zone Transport"
msgstr ""
#. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
#, fuzzy
msgid "A&utomatically Generate Records From"
msgstr "&Fumana i-DNS Ngokuzenzekelayo"
#. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
#, fuzzy
msgid "Zon&e"
msgstr "Izowuni"
#. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
#, fuzzy
msgid "Connected Reverse Zones"
msgstr "Izinto Ekujoliswe Kuzo Ezidityanisiweyo"
#. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
msgid ""
"This function is not available during\n"
"preparation for autoinstallation.\n"
msgstr ""
#. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
#, fuzzy
msgid "No TSIG key is defined."
msgstr "Akukho mthombo wombekelelo ochaziweyo."
#. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
msgid "&Name Server to Add"
msgstr ""
#. Selectionbox - listing current nameservers
#. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
#, fuzzy
msgid "Na&me Server List"
msgstr "Iiseva ze-&NFS"
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
#, fuzzy
msgid "The specified name server already exists."
msgstr "Ifayili exeliweyo ayikho kwayona."
#. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
#, fuzzy
msgid "Mail Server to Add"
msgstr "Iseva Yemeyile"
#. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
#, fuzzy
msgid "&Address"
msgstr "Idilesi ye-IP"
@@ -1116,119 +1113,119 @@
#. IntField - zone settings - Record Value
#. IntField - zone settings - Record Value
#. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
#: src/include/dns-server/options.rb:435
msgid "&Priority"
msgstr ""
#. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
msgid "Mail Relay List"
msgstr ""
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
msgid "The specified value is not a valid hostname or IP address."
msgstr ""
#. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
#, fuzzy
msgid "The specified mail server already exists."
msgstr "Ifayili exeliweyo ayikho kwayona."
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
msgid "Seconds"
msgstr "Imizuzwana"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
msgid "Minutes"
msgstr "Imizuzu"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
msgid "Hours"
msgstr " Iiyure"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
msgid "Days"
msgstr " Iintsuku"
#. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
msgid "Weeks"
msgstr ""
#. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
msgid "Seri&al"
msgstr ""
#. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
msgid "TT&L"
msgstr ""
#. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
msgid "&Unit"
msgstr "&Iyunithi"
#. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
#, fuzzy
msgid "Re&fresh"
msgstr "&Hlaziya"
#. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
msgid "Un&it"
msgstr ""
#. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
msgid "Retr&y"
msgstr "Phinda uza&me"
#. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
#, fuzzy
msgid "Ex&piration"
msgstr "&Tsiba Ubumbeko "
#. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
msgid "U&nit"
msgstr ""
#. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
msgid "&Minimum"
msgstr "&Okona kuncinci"
#. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
msgid "Uni&t"
msgstr ""
#. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
msgid "The serial number of the zone must be specified."
msgstr ""
#. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
msgid "The serial number must be no more than %1 digits long."
msgstr ""
#. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
msgid ""
"The expiration time-out is higher than the time period\n"
"of zone refreshes. The zone will not be reachable\n"
@@ -1239,106 +1236,106 @@
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
msgid "&Record Key"
msgstr ""
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
#. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
msgid "T&ype"
msgstr ""
#. Textentry - zone settings - Record Value
#. IntField - zone settings - Record Value
#. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
msgid "Val&ue"
msgstr ""
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
msgid "&Service"
msgstr "&Inkonzo"
#. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
msgid "&Protocol"
msgstr "&Inkqubo"
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
msgid "&Weight"
msgstr ""
#. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
msgid "&Port"
msgstr "&Isiqhagamshelanisi"
#. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
msgid "A: IPv4 Domain Name Translation"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
msgid "AAAA: IPv6 Domain Name Translation"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
msgid "CNAME: Alias for Domain Name"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
#, fuzzy
msgid "NS: Name Server"
msgstr "Iseva ye-Samba"
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
msgid "MX: Mail Relay"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
msgid "PTR: Reverse Translation"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
#, fuzzy
msgid "SRV: Services Record"
msgstr "Iinkonzo ze-RPC"
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
msgid "TXT: Text Record"
msgstr ""
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
msgid "SPF: Sender Policy Framework"
msgstr ""
#. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
msgid "Record Settings"
msgstr ""
#. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
msgid "Configured Resource Records"
msgstr ""
#. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
msgid "Record Key"
msgstr ""
#. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
msgid ""
"Invalid IPv6 reverse IP.\n"
"\n"
@@ -1347,14 +1344,14 @@
msgstr ""
#. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
#, fuzzy
msgid "Invalid IPv6 address."
msgstr "Le dilesi ye-IP ayisebenzi"
#. TRANSLATORS: Error message
#. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
msgid ""
"Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
"and must be at least one character long."
@@ -1364,79 +1361,73 @@
#. %{type} - replaced with record type (TXT or SPF)
#. %{max} - replaced with the maximal length
#. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
msgid ""
"Maximal length of a %{type} record is %{max} characters.\n"
"This message is %{current} characters long."
msgstr ""
#. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
msgid "CNAME cannot point to itself."
msgstr ""
#. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
msgid "An internal error has occurred."
msgstr ""
#. Dialog Caption - Expert Settings - Zone Editor
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
msgid "Zone Editor"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
msgid "&Basics"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
msgid "NS Recor&ds"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
msgid "&SOA"
msgstr ""
#. Menu Item - Zone Editor - Tab
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
msgid "R&ecords"
msgstr ""
#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
msgid "M&X Records"
msgstr ""
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
#. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
msgid "Settings for Zone"
msgstr ""
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "Oseku&qhubele phambili"
-
#. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
#, fuzzy
msgid "At least one NS server must be set."
msgstr "Kufuneka obona buncinci enye ye-%1 imiselwe."
@@ -1445,25 +1436,25 @@
#.
#. Automatically Generate Records From is a feature that makes YaST to generate
#. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
msgid ""
"Current zone records are automatically generated from %1 zone.\n"
"To change records manually disable the Automatically Generate Records From feature."
msgstr ""
#. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
#, fuzzy
msgid "&Master DNS Server IP"
msgstr "Iseva ye-DNS"
#. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
msgid "Missing Master Server"
msgstr ""
#. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
msgid ""
"Every slave zone must have its master server IP defined.\n"
"Configuration of a DNS server without a master server would fail.\n"
@@ -1471,33 +1462,33 @@
msgstr ""
#. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
#, fuzzy
msgid "No master DNS server defined."
msgstr "Akukho mthombo wombekelelo ochaziweyo."
#. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
msgid "The specified master name server is not a valid IP address."
msgstr ""
#. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
msgid "New &Forwarder IP Address"
msgstr ""
#. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
msgid "Current &Zone Forwarders"
msgstr ""
#. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
msgid "Forward Zone Editor"
msgstr ""
#. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
msgid ""
"This forward zone has no forwarders defined, which means\n"
"that all DNS queries for this zone are denied.\n"
@@ -2363,62 +2354,62 @@
msgstr ""
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
#, fuzzy
msgid "Initializing DNS Server Configuration"
msgstr "Kundululwa Ubumbeko lwe-Firewall"
#. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
msgid "Check the environment"
msgstr "Qwalasela imo engqongileyo"
#. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
msgid "Flush caches of the DNS daemon"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
#, fuzzy
msgid "Read the firewall settings"
msgstr "Bhala imimiselo ye-Firewall"
#. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
#, fuzzy
msgid "Read the settings"
msgstr "Ayikwazi kufundeka imimiselo yangoku."
#. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
#, fuzzy
msgid "Checking the environment..."
msgstr "Qwalasela imo engqongileyo"
#. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
msgid "Flushing caches of the DNS daemon..."
msgstr ""
#. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
#, fuzzy
msgid "Reading the firewall settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
#, fuzzy
msgid "Reading the settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
msgid "Finished"
msgstr "Kugqityiwe."
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
#, fuzzy
msgid ""
"Error occurred while calling netconfig.\n"
@@ -2426,81 +2417,81 @@
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
#, fuzzy
msgid "Saving DNS Server Configuration"
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
#. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
#, fuzzy
msgid "Save configuration files"
msgstr "Gcina ubumbeko"
#. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
msgid "Restart the DNS daemon"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
msgid "Update zone files"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
#, fuzzy
msgid "Adjust the DNS service"
msgstr "Qhelanisa inkonzo ye-firewall"
#. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
msgid "Call netconfig"
msgstr ""
#. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
#, fuzzy
msgid "Write the firewall settings"
msgstr "Bhala imimiselo ye-Firewall"
#. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
#, fuzzy
msgid "Saving configuration files..."
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
#. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
msgid "Restarting the DNS daemon..."
msgstr ""
#. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
#, fuzzy
msgid "Updating zone files..."
msgstr "Kuhlaziywa izixhomekeki zemodyuli ye-kernel..."
#. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
#, fuzzy
msgid "Adjusting the DNS service..."
msgstr "Kuqhelanisw inkonzo ye-firewall"
#. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
#, fuzzy
msgid "Calling netconfig..."
msgstr "Kuqaliswa ubumbeko lwe-SuSE"
#. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
#, fuzzy
msgid "Writing the firewall settings..."
msgstr "Bhala imimiselo ye-Firewall"
#. Cannot start service 'named', because of error that follows Error:. Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
#, fuzzy
msgid ""
"Error occurred while starting service named.\n"
@@ -2508,47 +2499,47 @@
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
msgid "Stub"
msgstr ""
#. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
msgid "Hint"
msgstr ""
#. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
#, fuzzy
#| msgid "The NTP daemon starts when starting the system."
msgid "The DNS server starts when booting the system."
msgstr "I-daemon ye-NTP iqalisa xa kuqaliswa isixokelelwano."
#. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
#, fuzzy
#| msgid "The NTP daemon starts when starting the system."
msgid "The DNS server does not start when booting the system."
msgstr "I-daemon ye-NTP iqalisa xa kuqaliswa isixokelelwano."
#. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
#, fuzzy, perl-format
msgid "Configured Zones: %s"
msgstr "Yenza Ubumbeko lwee-disk &ze-DASD"
#. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
#. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
msgid "Enable LDAP support?"
msgstr ""
#. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
#, fuzzy
msgid ""
"Installation of required packages failed.\n"
@@ -2556,34 +2547,37 @@
msgstr "Ukuhlohlwa kwemibekelelo efunekayo kusilele."
#. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
msgid "Unknown LDAP initialization error."
msgstr ""
#. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
#, fuzzy
msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
#. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
#, fuzzy
msgid "Error occurred while creating %1. Not using LDAP."
msgstr "Kwenzeke imposiso xa bekufundwa isixhobo sokufumanisa imposiso"
+#~ msgid "Ad&vanced"
+#~ msgstr "Oseku&qhubele phambili"
+
#~ msgid "When &Booting"
#~ msgstr "Xa &Kumiselwa Inkqubo"
Modified: trunk/yast/xh/po/docker.xh.po
===================================================================
--- trunk/yast/xh/po/docker.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/docker.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -15,6 +15,120 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid " Container"
+msgid "Changes in Container"
+msgstr "Isiqulathi"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "Isimo"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+msgid "&Exit"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid " Container"
+msgid "Commit Container"
+msgstr "Isiqulathi"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+#, fuzzy
+#| msgid "Package Repository"
+msgid "Repository"
+msgstr "Umthombo wePakethe"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+#, fuzzy
+#| msgid "Tab"
+msgid "Tag"
+msgstr "Isilungelelanisi sezintlu"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Terminals"
+msgid "Inject Shell"
+msgstr "Iziphelo"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
#. 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."
@@ -80,18 +194,6 @@
msgid "Running Docker Containers"
msgstr "Kuqhutywa Uvavanyo Lomdibaniso Ngonxibelelwano Ngekhompyutha"
-#: src/lib/ydocker/main_dialog.rb:217
-#, fuzzy
-#| msgid "Package Repository"
-msgid "Repository"
-msgstr "Umthombo wePakethe"
-
-#: src/lib/ydocker/main_dialog.rb:218
-#, fuzzy
-#| msgid "Tab"
-msgid "Tag"
-msgstr "Isilungelelanisi sezintlu"
-
#: src/lib/ydocker/main_dialog.rb:219
#, fuzzy
#| msgid "Image"
@@ -120,17 +222,13 @@
msgid "Image"
msgstr "Umfuziselo"
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
#, fuzzy
#| msgid "Commands:"
msgid "Command"
msgstr "Imiyalelo:"
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "Isimo"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
#, fuzzy
#| msgid "Port"
msgid "Ports"
@@ -180,12 +278,65 @@
msgid "&Commit"
msgstr "Phawula"
-#: src/lib/ydocker/main_dialog.rb:304
-msgid "&Exit"
-msgstr ""
-
#: src/lib/ydocker/main_dialog.rb:315
#, fuzzy
#| msgid "Do you really want to delete partition %1?"
msgid "Do you really want to delete image \"%s\"?"
msgstr "Ingaba uyafuna ngenene ukusicima isahlulelo %1?"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid " Container"
+msgid "Run Container"
+msgstr "Isiqulathi"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid " Container"
+msgid "Container"
+msgstr "Isiqulathi"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""
Modified: trunk/yast/xh/po/drbd.xh.po
===================================================================
--- trunk/yast/xh/po/drbd.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/drbd.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -243,7 +243,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
#, fuzzy
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>Ubumbeko Lomdibaniso</big></b></p>"
@@ -258,15 +258,16 @@
msgid ""
"\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>\"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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. 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"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -292,13 +293,13 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:112
+#: src/include/drbd/helps.rb:113
#, fuzzy
#| msgid "<p><b><big>Connection Configuration</big></b></p>"
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr "<p><b><big>Ubumbeko Lomdibaniso</big></b></p>"
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -307,21 +308,23 @@
"\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"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
"\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
+"\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
#, fuzzy
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr "<p><b><big>Ubumbeko Lomdibaniso</big></b></p>"
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr ""
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
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"
@@ -331,7 +334,7 @@
" set it to 0 to disable redrawing completely. </p>"
msgstr ""
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -341,7 +344,7 @@
msgstr ""
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
@@ -351,7 +354,7 @@
"Yakhela i-kdump apha.<br></p>\n"
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
#, fuzzy
#| msgid ""
#| "<p><b><big>Adding a Kdump:</big></b><br>\n"
@@ -370,7 +373,7 @@
"Uze ucinezele <b>Yakhela</b>.</p>\n"
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
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"
@@ -381,7 +384,7 @@
" ubumbeko luyavula.</p>\n"
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
@@ -393,7 +396,7 @@
"hlela ulwakhelo lwazo.<br></p>\n"
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
#, fuzzy
#| msgid ""
#| "<p><b><big>Adding a Kdump:</big></b><br>\n"
@@ -406,7 +409,7 @@
"Cinezela <b>Yongeza</b> ukwakhela i-kdump.</p>"
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
#, fuzzy
#| msgid ""
#| "<p><b><big>Editing or Deleting:</big></b><br>\n"
@@ -422,7 +425,7 @@
"Uze ucinezele <b>Hlela</b> okanye <b>Cima</b> njengokomnqweno.</p>\n"
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -434,7 +437,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -445,7 +448,7 @@
" </p>"
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -456,60 +459,138 @@
" <br></p>\n"
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
#, fuzzy
msgid "LVM Filter Configuration of DRBD"
msgstr "Ubumbeko Lwehlabathi"
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
#, fuzzy
#| msgid "Device type"
msgid "Device Filter"
msgstr "Uhlobo Lesixhobo"
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
#, fuzzy
#| msgid "Writing the SCPM database..."
msgid "Writing the LVM cache"
msgstr "Ibhala isiseko senkcukacha se-SCPM..."
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
#, fuzzy
#| msgid "Enable Microphone."
msgid "Enable LVM Cache"
msgstr "Yenza Isandisi-sandi sisebenze."
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning! Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning! Should not use lvmetad for cluster."
+msgstr ""
+
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:144
#, fuzzy
msgid "Resource Name"
msgstr "Oovimba"
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:151
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:156
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:188
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:336
msgid "Protocol"
msgstr "Inkqubo"
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:560
+msgid "OK"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:561
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:575
#, fuzzy
#| msgid "Scheme name must be set."
-msgid "Node names must be different."
+msgid "Node name can not be empty."
msgstr "Makumiselwe igama lesicwangciso."
-#: src/include/drbd/resource_conf.rb:578
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:719
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:739
msgid "Please fill out all fields."
msgstr ""
+#: src/include/drbd/resource_conf.rb:754
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:789
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:795
+#, fuzzy
+#| msgid "Scheme name must be set."
+msgid "Node name must be different."
+msgstr "Makumiselwe igama lesicwangciso."
+
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar <mlazar(a)suse.cz>
@@ -622,83 +703,83 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:114
msgid "Failed to merge separated DRBD conf files\n"
msgstr ""
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:136
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr ""
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:191
#, fuzzy
msgid "Initializing DRBD Configuration"
msgstr "Indulula uBumbeko lwe-DSL"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:199
#, fuzzy
msgid "Read global settings"
msgstr "Funda imimiselo yehlabathi ye-Samba"
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:200
#, fuzzy
msgid "Read resources"
msgstr "Ifunda amaqela ovimba"
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:201
#, fuzzy
#| msgid "LVM configuration"
msgid "Read LVM configurations"
msgstr "Ubumbeko lwe-LVM"
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:202
#, fuzzy
msgid "Read daemon status"
msgstr "Funda isimo se-winbind"
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
#, fuzzy
#| msgid "Read firewall settings"
msgid "Read SuSEFirewall Settings"
msgstr "Funda imimiselo yefirewall"
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:206
#, fuzzy
msgid "Reading global settings..."
msgstr "Kufundwa imimiselo yehlabathi ye-Samba..."
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:207
#, fuzzy
msgid "Reading resources..."
msgstr "Ifunda amaqela ovimba..."
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:208
#, fuzzy
#| msgid "Reading the configuration..."
msgid "Reading LVM configurations..."
msgstr "Kufundwa ubumbeko..."
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:209
#, fuzzy
msgid "Reading daemon status..."
msgstr "Kufundwa isimo se-winbind..."
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
msgid "Finished"
msgstr "Kugqityiwe"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:514
msgid "Failed to backup drbd.conf"
msgstr ""
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:523
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr ""
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:547
#, fuzzy
#| msgid "Configuration of Resource Groups"
msgid ""
@@ -706,12 +787,12 @@
"%2"
msgstr "Ubumbeko Lwamaqela Kavimba"
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:566
msgid "Failed to bring drbd.conf back"
msgstr ""
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:637
#, fuzzy
msgid "Writing DRBD Configuration"
msgstr "Ibhala Ubumbeko lwe-NFS"
@@ -720,59 +801,59 @@
#. 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:617
+#: src/modules/Drbd.rb:649
msgid "Write global settings"
msgstr "Bhala imimiselo yehlabathi"
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:650
#, fuzzy
msgid "Write resources"
msgstr "Ibhala amaqela ovimba"
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:651
#, fuzzy
#| msgid "Write configuration"
msgid "Write LVM configurations"
msgstr "Bhala ubumbeko"
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:652
#, fuzzy
msgid "Set daemon status"
msgstr "Fumana isimo sangoku"
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:653
#, fuzzy
#| msgid "Write firewall settings"
msgid "Write the SuSEfirewall settings"
msgstr "Bhala imimiselo ye-Firewall"
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:656
msgid "Writing global settings..."
msgstr "Kubhalwa imimiselo yehlabathi..."
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:657
#, fuzzy
msgid "Writing resources..."
msgstr "Ibhala amaqela ovimba..."
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:658
#, fuzzy
#| msgid "Writing configuration..."
msgid "Writing LVM configurations..."
msgstr "Ibhala ubumbeko..."
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:659
#, fuzzy
msgid "Setting daemon status..."
msgstr "Ifumana isimo sangoku..."
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:660
#, fuzzy
#| msgid "Writing firewall settings..."
msgid "Writing the SuSEFirewall settings"
msgstr "Bhala imimiselo ye-Firewall"
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:671
#, fuzzy
#| msgid "Unable to create directory '%1'."
msgid "Failed to make directory /etc/drbd.d"
Modified: trunk/yast/xh/po/fcoe-client.xh.po
===================================================================
--- trunk/yast/xh/po/fcoe-client.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/fcoe-client.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -611,39 +611,39 @@
msgstr "<p>Uyayihlohla ngoku?</p>"
#. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
msgid "Cannot start service 'lldpad'"
msgstr ""
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
#, fuzzy
#| msgid "Cannot detect devices."
msgid "Cannot start service 'fcoe'"
msgstr "Azikwazi kuchongeka izixhobo."
#. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
msgid "Cannot start lldpad systemd socket"
msgstr ""
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
#, fuzzy
#| msgid "Cannot start winbind service."
msgid "Cannot start lldpad service."
msgstr "Ayikwazi kuqalisa inkonzo ye-winbind."
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
msgid "Cannot start fcoemon systemd socket."
msgstr ""
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
#, fuzzy
#| msgid "Cannot start '%1' service"
msgid "Cannot start fcoe service."
msgstr "Ayikwazi kuqalisa `%1`inkonzo"
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -651,59 +651,59 @@
msgstr ""
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
#, fuzzy
#| msgid "Initializing inetd Configuration"
msgid "Initializing fcoe-client Configuration"
msgstr "Kundululwa Ubumbeko lwe-inetd"
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
msgid "Check installed packages"
msgstr "Qwalasela imibekelelo ehlohliweyo"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
#, fuzzy
#| msgid "Network services"
msgid "Check services"
msgstr "Iinkonzo zomsebenzi wothungelwano"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
#, fuzzy
#| msgid "Detecting network cards..."
msgid "Detect network cards"
msgstr "Kuchongwa iikhadi zomsebenzi wothungelwano..."
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
#, fuzzy
#| msgid "Read /etc/ipsec.conf"
msgid "Read /etc/fcoe/config"
msgstr "Funda njl.njl./ubumbeko lwe-ipsec"
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
#, fuzzy
#| msgid "Checking for installed RPM packages..."
msgid "Checking for installed packages..."
msgstr "Kuqwalaselwa imibekelelo ye-RPM ehlohliweyo..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
#, fuzzy
#| msgid "Checking for network devices..."
msgid "Checking for services..."
msgstr "Kuqwalaselwa izixhobo zomsebenzi wothungelwano_"
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
msgid "Detecting network cards..."
msgstr "Kuchongwa iikhadi zomsebenzi wothungelwano..."
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
#, fuzzy
#| msgid "Reading /etc/modprobe.conf..."
msgid "Reading /etc/fcoe/config"
@@ -711,123 +711,123 @@
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
msgid "Finished"
msgstr "Kugqityiwe"
#. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "Starting of services failed."
msgstr "Ukuqalisa inkonzo 'ye-lirc' kusilele."
#. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
msgid "Cannot detect devices."
msgstr "Azikwazi kuchongeka izixhobo."
#. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
#, fuzzy
#| msgid "Cannot read the configuration."
msgid "Cannot read /etc/fcoe/config."
msgstr "Ayinako ukufunda ulwakhelo."
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
#, fuzzy
#| msgid "Saving inetd Configuration"
msgid "Saving fcoe-client Configuration"
msgstr "Kugcinwa Ubumbeko lwe-inetd"
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
msgid "Write the settings"
msgstr "Bhala imimiselo"
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
#, fuzzy
#| msgid "Restart the service"
msgid "Restart FCoE service"
msgstr "Phinda uqalise inkonzo"
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
#, fuzzy
#| msgid "Adjust spooler services"
msgid "Adjust start of services"
msgstr "Lungelelanisa iisevea ze-spooler"
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
msgid "Writing the settings..."
msgstr "Kubhalwa imimiselo..."
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
#, fuzzy
#| msgid "Restarting service..."
msgid "Restarting FCoE service..."
msgstr "Kuqaliswa inkonzo kwakhona..."
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
#, fuzzy
#| msgid "Adjusting spooler services..."
msgid "Adjusting start of services..."
msgstr "Lungelelanisa iisevea ze-spooler..."
#. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
#, fuzzy
#| msgid "Cannot write settings to /etc/samba/smb.conf."
msgid "Cannot write settings to /etc/fcoe/config."
msgstr "Ayinabhala imimiselo eya kwi-/etc/samba/smb.ubumbeko."
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "Restarting of service fcoe failed."
msgstr "Ukuqalisa inkonzo 'ye-lirc' kusilele."
#. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
#, fuzzy
#| msgid "Cannot write sysconfig variables."
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr "Azikwazi kubhaleka iziguquki zobumbeko lwesixokelelwano."
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
#, fuzzy
#| msgid "<p><b><big>Connection Configuration</big></b></p>"
msgid "<b>General FCoE configuration</b>"
msgstr "<p><b><big>Ubumbeko Lomdibaniso</big></b></p>"
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
#, fuzzy
#| msgid "Interfaces"
msgid "<b>Interfaces</b>"
msgstr "Izithuba zomdibaniso"
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
msgid "<i>Netcard</i>:"
msgstr ""
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "<b>Starting of services</b>"
@@ -835,11 +835,11 @@
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
msgid "enabled"
msgstr "kunikwe isakhono"
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
msgid "disabled"
msgstr "kukhutshwe isakhono"
Modified: trunk/yast/xh/po/firewall.xh.po
===================================================================
--- trunk/yast/xh/po/firewall.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/firewall.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:28\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -15,6 +15,16 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
#. TRANSLATORS: message popup
#: src/clients/firewall_proposal.rb:113
msgid ""
@@ -177,7 +187,7 @@
#. TRANSLATORS: tree menu item
#: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
#: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
msgid "Logging Level"
msgstr "Inqanaba Lokungena"
@@ -677,7 +687,7 @@
#: src/include/firewall/subdialogs.rb:349
#: src/include/firewall/subdialogs.rb:509
#: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
msgid "Source Network"
msgstr "Umsebenzi Wothungelwano Wentsusa"
@@ -688,8 +698,8 @@
#: src/include/firewall/subdialogs.rb:351
#: src/include/firewall/subdialogs.rb:511
#: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
msgid "Protocol"
msgstr "Inkqubo"
@@ -743,28 +753,28 @@
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
msgid "Req. IP"
msgstr "Okucelwayo i- IP:"
#. TRANSLATORS: table header item, Req. == Requested
#. TRANSLATORS: CommandLine table header item, Req.=Requested
#: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
msgid "Req. Port"
msgstr "Okucelwayo Isiqhagamshelanisi"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
msgid "Redir. to IP"
msgstr "Phinda ubhekise intsingiselo kwi-IP"
#. TRANSLATORS: table header item, Redir. == Redirect
#. TRANSLATORS: CommandLine table header item, Redir.=Redirect
#: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
msgid "Redir. to Port"
msgstr "Phinda ubhekise intsingiselo Kwisiqhagamshelanisi se-IP"
@@ -889,10 +899,10 @@
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
msgid "Zone"
msgstr "Izowuni"
@@ -1414,219 +1424,221 @@
msgstr "Khetha inqaku oza kulicima."
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
msgid "Firewall configuration"
msgstr "Ubumbeko lwe-Firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
msgid "Start-up settings"
msgstr "Imimiselo yendlela yokuqalisa"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
msgid "Known firewall zones"
msgstr "Iizowuni ezaziwayo ze-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
msgid "Network interfaces configuration"
msgstr "Ubumbeko Lwezithuba Zomdibaniso Womsebenzi Wothungelwano"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
msgid "Allowed services, ports, and protocols"
msgstr "Zivunyelwe iinkonzo, iziqhagamshelanisi, iinkqubo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
msgid "Broadcast packet settings"
msgstr "Imimiselo yeepakethi zosasazo emoyeni"
#. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
msgid "Masquerading settings"
msgstr "Imimiselo Eyenza Nto Yimbi:"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
msgid "Redirect requests to masqueraded IP"
msgstr "Phinda Ubhekise Intsingiselo Yezicelo kwi-IP Eyenza Nto Yimbi"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
msgid "Logging settings"
msgstr "Kungena imimiselo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
msgid "Firewall configuration summary"
msgstr "Isishwankathelo sobumbeko be-Firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
#, fuzzy
msgid "Enables firewall"
msgstr "Bhala i-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
#, fuzzy
msgid "Disables firewall"
msgstr "Bhala i-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
msgid "Show current settings"
msgstr "Bonisa imimiselo yangoku"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
msgid "Start firewall in the boot process"
msgstr "Qalisa inkqubo yomiselo lwenkqubo lwe-firewall"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
msgid "Start firewall manually"
msgstr "Qalisa i-firewall ngokwenza ngesandla"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
msgid "List configured entries"
msgstr "Dwelisa amangeniso anobumbeko"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
msgid "Zone short name"
msgstr "FakaIzowuni Yegama Elifutshane"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
msgid "Add a new record"
msgstr "Fakela ingxelo entsha"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
msgid "Remove a record"
msgstr "Shenxisa ingxelo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
msgid "Network interface configuration name"
msgstr "Igama lobumbeko kwisithuba somdibaniso womsebenzi wothungelwano"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
msgid "Logging accepted packets (all|crit|none)"
msgstr "Kungena iipakethi ezamkelekileyo (konke|crit|akukho)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
msgid "Logging not accepted packets (all|crit|none)"
msgstr "Kungena iipakethi ezingamkelekanga (konke|crit|akukho)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
msgid "Logging broadcast packets (yes|no)"
msgstr "Kungena iipakethi zosasazo emoyeni (ewe|hayi)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
msgid "Set value"
msgstr "Misela ixabiso"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
msgid "Port name or number; comma-separate multiple ports"
msgstr "Igama lesiqhagamshelanisi okanye inombolo, iziqhagamshelanisi ezininzi ezahlukaniswe ngeekoma"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
msgid "Known firewall service; comma-separate multiple services"
msgstr "Inkonzo eyaziwayo ye-firewall, iinkonzo ezininzi ezahlukaniswa ngeekoma"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
msgid "TCP port name or number; comma-separate multiple ports"
msgstr "Igama lesiqhagamshelanisi se-TCP okanye inombolo, iziqhagamshelanisi ezininzi ezahlukaniswe ngeekoma"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
msgid "UDP port name or number; comma-separate multiple ports"
msgstr "Igama lesiqhagamshelanisi se-UDP okanye inombolo, iziqhagamshelanisi ezininzi ezahlukaniswe ngeekoma"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
msgid "RPC port name; comma-separate multiple ports"
msgstr "Igama lesiqhagamshelanisi se-RPC, iziqhagamshelanisi ezininzi ezahlukaniswe ngeekoma"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
msgid "IP protocol name; comma-separate multiple protocols"
msgstr "Igama lenkqubo ye-IP, iinkqubo ezininzi ezahlukaniswe ngeekoma"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
msgid "Set zone protection (yes|no)"
msgstr "Misela ukhuselo lwezowuni (ewe|hayi)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
msgid "Detailed information"
msgstr "Ulwazi olunobucukubhede"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
msgid "Enable option"
msgstr "Nika isikhethwa isakhono"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
msgid "Disable option"
msgstr "Khupha isakhono kwisikhethwa"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
msgstr "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
msgid "Protocol (tcp|udp)"
msgstr "Inkqubo (tcp|udp)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
msgid "Requested external IP (optional)"
msgstr "Kucelwe i-IP yangaphandle (ngokuzithandela)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
msgid "Requested port name or number"
msgstr "Kucelwe igama lesiqhagamshelanisi okanye inombolo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
msgid "Redirect to internal IP"
msgstr "Phinda ubhekise intsingiselo kwi-IP yangaphakathi"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
msgid "Redirect to port on internal IP (optional)"
msgstr "Phinda ubhekise intsingiselo kwi-IP yangaphakathi (ngokuzithandela)"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
msgid "Record number"
msgstr "Bhala ingxelo yenombolo"
#. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
msgid "Use port names instead of port numbers"
msgstr "Sebenzisa amagama esiqhagamshelanisi endaweni yamanani esiqhagamshelanisi"
#. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
msgid "Unknown zone %1."
msgstr "Izowuni Engaziwayo%1"
@@ -1639,180 +1651,180 @@
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
#. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
msgid "Parameter %1 must be set."
msgstr "Makumiselwe umda%1."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
msgid "Listing Known Firewall Zones:"
msgstr "Kudweliswa Iizowuni ze-Firewall Ezaziwayo:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
msgid "Shortcut"
msgstr "Indlela emfutshane"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
msgid "Zone Name"
msgstr "Igama Lezowuni"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
msgid "Summary:"
msgstr "Isishwankathelo:"
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
msgid "Only one parameter is allowed."
msgstr "Ngumda omnye kuphela ovunyelweyo."
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
msgid "Start-Up:"
msgstr "Indlela Yokuqalisa"
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
msgid "Enabling firewall in the boot process..."
msgstr "Kunikwa isakhono kwi-firewall kwinkqubo yomiselo lwenkqubo..."
#. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
msgid "Removing firewall from the boot process..."
msgstr "Kushenxiswa i-firewall kwinkqubo yomiselo lwenkqubo..."
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
msgid "Firewall is enabled in the boot process"
msgstr "Kunikwa isakhono kwi-firewall kwinkqubo yomiselo lwenkqubo"
#. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
msgid "Firewall needs manual starting"
msgstr "I-Firewall ifuna ukuqaliswa ngokwenza ngesandla"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
msgid "Network Interfaces in Firewall Zones:"
msgstr "Izithuba Zokudibana Komsebenzi Wothungelwano Kwiizowuni ze-Firewall:"
#. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
msgid "Special firewall string"
msgstr "Umtya owodwa we-firewall"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
msgid "Interface"
msgstr "Izithuba zomdibaniso"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
msgid "Device Name"
msgstr "Igama Lesixhobo"
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
msgid "Adding special string %1 into zone %2..."
msgstr "Kufakelwa umtya owodwa %1 kwizowuni %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
msgid "Adding interface %1 into zone %2..."
msgstr "Kufakelwa isithuba somdibaniso %1 kwizowuni %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
msgid "Removing special string %1 from zone %2..."
msgstr "Kushenxiswa umtya owodwa %1 kwizowuni %2..."
#. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
msgid "Removing interface %1 from zone %2..."
msgstr "Kushenxiswa isithuba somdibaniso %1 kwizowuni %2..."
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
msgid "Log all"
msgstr "Kungena konke"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
msgid "Log only critical"
msgstr "Kungena kuphela okuxhalabisayo"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
msgid "Do not log any"
msgstr "Akufuneki kungene nakuphi"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
msgid "Global Logging Settings:"
msgstr "Imimiselo Yehlabathi Yokungena:"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
msgid "Rule Type"
msgstr "Uhlobo Lomthetho"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
msgid "Value"
msgstr "Ixabiso"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
msgid "Accepted"
msgstr "Kwamkelwe"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
msgid "Not accepted"
msgstr "Akwamkelwanga"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
msgid "Logging Broadcast Packets:"
msgstr "Iipakethi Zokungena Kusasazo Emoyeni:"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
msgid "Logging enabled"
msgstr "Ukungena kunikwe isakhono"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
msgid "Logging disabled"
msgstr "Ukungena kuthathelwe isakhono"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
msgid "Short"
msgstr "Kufutshane"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
msgid "Logging Status"
msgstr "Isimo Sokungena"
@@ -1821,168 +1833,181 @@
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
#. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
msgid "Value %1 is not allowed for option %2."
msgstr "Ixabiso %1 alivunyelwa ngesikhethwa %2."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
msgid "Allowed Broadcast Ports:"
msgstr "Kuvunyelwa Iziqhagamshelanisi Zokusasaza Emoyeni:"
#. TRANSLATORS: CommandLine header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
msgid "Port"
msgstr "Isiqhagamshelanisi"
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
msgid "Only one action command is allowed here."
msgstr "Mnye kuphela umyalelo wenyathelo ovunyelweyo apha."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
msgid "Defined Firewall Services:"
msgstr "Zichaziweyo Inkonzo ze-Firewall:"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
msgid "ID"
msgstr "i-ID"
#. TRANSLATORS: CommandLine table header item
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
msgid "Service Name"
msgstr "Igama Lenkonzo"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
msgid "TCP port"
msgstr "Isiqhagamshelanisi se-TCP"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
msgid "UDP port"
msgstr "Isiqhagamshelanisi se-UDP"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
msgid "RPC port"
msgstr "Isiqhagamshelanisi se-RPC"
#. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
msgid "IP protocol"
msgstr "Inkqubo ye-IP"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
msgid "Allowed Services in Zones:"
msgstr "Iinkonzo Ezivunyelwe Kwiizowuni:"
#. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
msgid "All services"
msgstr "Zonke iinkonzo"
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
#. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
msgid "Entire zone unprotected"
msgstr "Ayikhuselekanga izowuni iphelele"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
msgid "Service ID"
msgstr "i-ID Yenkonzo"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
msgid "Additional Allowed Ports:"
msgstr "Iziqhagamshelanisi Ezifakelwayo Ezivunyelweyo:"
#. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
msgid "All ports"
msgstr "Zonke iziqhagamshelanisi"
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
msgid "Allowed Additional IP Protocols in Zones:"
msgstr "Iinkqubo ze-IP Ezivunyelwayo Ezifakelwayo kwiiZowuni:"
#. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
msgid "All IP protocols"
msgstr "Iinkqubo zeIP zonke"
#. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
msgid "IP Protocol"
msgstr "Inkqubo ye-IP"
#. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
msgid "Unknown service %1."
msgstr "Ayaziwa inkonzo %1."
#. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
msgid "Protection can only be set for internal zones."
msgstr "Ukhuseleko lunokumiselwa kuphela ukwenzela iizowuni zangaphakathi."
#. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
msgid "At least one of %1 must be set."
msgstr "Kufuneka obona buncinci enye ye-%1 imiselwe."
#. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
msgid "At least one action command from %1 must be set."
msgstr "Kufuneka obona buncinci bomyalelo wenyathelo omnye we-%1 umiselwe."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
msgid "Redirect Requests to Masqueraded IP:"
msgstr "Phinda Ubhekise Intsingiselo Yezicelo kwi-IP Eyenza Nto Yimbi:"
#. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
msgid "Unknown port name %1."
msgstr "Alaziwa igama lesiqhagamshelanisi se- %1."
#. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
msgid "Masquerading Settings:"
msgstr "Imimiselo Eyenza nto Yimbi:"
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
#. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
msgstr "Ukwenza Nto Yimbi yi %1"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
msgid "enabled"
msgstr "kunikwe isakhono"
#. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
msgid "disabled"
msgstr "kukhutshwe isakhono"
Modified: trunk/yast/xh/po/firstboot.xh.po
===================================================================
--- trunk/yast/xh/po/firstboot.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/firstboot.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:28\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -112,13 +112,13 @@
msgstr "Ileyibhile"
#: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "Isimo"
+
+#: src/clients/firstboot_config.rb:68
msgid "Module Name"
msgstr "Igama Lemodyuli"
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "Isimo"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
@@ -295,7 +295,7 @@
" </p>\n"
#. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
#, fuzzy
msgid "There is not enough space to install all additional packages."
msgstr ""
Modified: trunk/yast/xh/po/fonts.xh.po
===================================================================
--- trunk/yast/xh/po/fonts.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/fonts.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -18,63 +18,63 @@
#. 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
+#: src/lib/fonts/fonts-config-state.rb:59
#, fuzzy
#| msgid "Bitmap Editors"
msgid "Bitmap Fonts"
msgstr "Abahleli Beengqokelela Zamasuntsu"
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
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
+#: src/lib/fonts/fonts-config-state.rb:107
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
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
+#: src/lib/fonts/fonts-config-state.rb:127
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
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
+#: src/lib/fonts/fonts-config-state.rb:147
msgid "Default"
msgstr "Okuhlala kukhona"
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
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
+#: src/lib/fonts/fonts-config-state.rb:167
#, fuzzy
#| msgid "Fonts"
msgid "CFF Fonts"
msgstr "Iifonti"
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
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
+#: src/lib/fonts/fonts-config-state.rb:210
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
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
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: trunk/yast/xh/po/geo-cluster.xh.po
===================================================================
--- trunk/yast/xh/po/geo-cluster.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/geo-cluster.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,10 +59,8 @@
#.
#. $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:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
#, fuzzy
#| msgid "Class Configuration"
@@ -122,17 +120,17 @@
msgstr "Abatyhutyhi"
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:819
msgid "Add"
msgstr "Fakela"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:820
msgid "Edit"
msgstr "Hlela"
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:821
msgid "Delete"
msgstr "Cima "
@@ -140,19 +138,18 @@
msgid "site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
msgid "ticket"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:106
#, fuzzy
#| msgid "Authentication"
-msgid "Authentification"
+msgid "Authentication"
msgstr "Ungqinelwano ngobunyani"
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
#, fuzzy
#| msgid "Cancel"
msgid "Ca&ncel"
@@ -160,9 +157,9 @@
#. 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
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
msgid "OK"
msgstr "&KULUNGILE"
@@ -175,200 +172,207 @@
#: src/include/geo-cluster/dialogs.rb:128
#, fuzzy
#| msgid "Authentication"
-msgid "Authentification file"
+msgid "Authentication file"
msgstr "Ungqinelwano ngobunyani"
#: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:146
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:151
#, fuzzy
#| msgid "Select File for the Authentication Key"
-msgid "Generate Authentification Key File"
+msgid "Generate Authentication Key File"
msgstr "Khetha Ifayili Eneqhosha Elichanekileyo"
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:159
msgid "Basic"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
msgid "Cancel"
msgstr "Hlaba"
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
#, fuzzy
#| msgid "Enter a valid e-mail address."
msgid "Please enter a valid ip address"
msgstr "Faka idilesi ye-imeyle esebenzayo."
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
msgid "timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
#, fuzzy
#| msgid "Directories"
msgid "retries"
msgstr "Izalathisi"
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
msgid "weights"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
msgid "expire"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
#, fuzzy
#| msgid "Required patterns"
msgid "acquire-after"
msgstr "Izimbo ezifunekayo"
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
#, fuzzy
#| msgid "Action is invalid."
msgid "timeout is invalid"
msgstr "Isenzi asisebenzi."
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
#, fuzzy
#| msgid "' is not valid."
msgid "expire is invalid"
msgstr "' akusebenziseki."
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
#, fuzzy
#| msgid "The source is not valid."
msgid "acquireafter is invalid"
msgstr "Umthombo awusebenziseki."
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
#, fuzzy
#| msgid "' is not valid."
msgid "retries is invalid"
msgstr "' akusebenziseki."
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
#, fuzzy
#| msgid "' is not valid."
msgid "weights is invalid"
msgstr "' akusebenziseki."
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
#, fuzzy
#| msgid "URL cannot be empty."
msgid "ticket can not be empty"
msgstr "i-URL ayinakuba likhamte."
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407
-#: src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr "Ubumbeko lwe-Firewall"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:569
msgid "Enter an IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:580
msgid "Edit IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:596
msgid "Enter an IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:607
msgid "Edit IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:629
#, fuzzy
#| msgid "Provider name %1 already exists."
msgid "Ticket name already exist!"
msgstr "Igama lomboneleli%1 sele likhona."
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:661
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be empty."
msgstr "Igama lolwakhelo alikwazi ukungabinanto."
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:664
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be duplicated."
msgstr "Igama lolwakhelo alikwazi ukungabinanto."
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:672
#, fuzzy
#| msgid "Key is invalid."
msgid "port is invalid!"
msgstr "Iqhosha alisebenziseki."
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:678
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:684
#, fuzzy
#| msgid "Gateway IP address is invalid."
msgid "arbitrator have to be filled!"
msgstr "Indlela yedilesi ye-IP ayisebenziseki."
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:689
msgid "site have to be filled!"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:694
msgid "ticket have to be filled!"
msgstr ""
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
+#: src/include/geo-cluster/dialogs.rb:748
#, fuzzy
#| msgid "Failed to create the installation RAM disk."
-msgid "Failed to create authentification file "
+msgid "Failed to create authentication file "
msgstr "Isilele ukudala idiski yokuhlohla i-RAM."
-#: src/include/geo-cluster/dialogs.rb:736
+#: src/include/geo-cluster/dialogs.rb:751
#, fuzzy
-#| msgid "Set the authentication for proxy"
-msgid "Succeed to created authentification file "
-msgstr "Misela ungqinelwano ngobunyani obumele obunye"
+#| msgid "Authentication"
+msgid "Authentication file "
+msgstr "Ungqinelwano ngobunyani"
+#: src/include/geo-cluster/dialogs.rb:751
+msgid " created successfully."
+msgstr ""
+
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:810
#, fuzzy
#| msgid "Add Complete Configuration Files"
msgid "GeoCluster Configuration Select"
@@ -376,7 +380,7 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:816
#, fuzzy
#| msgid "Update configuration files"
msgid "Choose configuration file:"
@@ -385,7 +389,7 @@
#: src/include/geo-cluster/wizards.rb:47
#, fuzzy
#| msgid "TV Station Configuration"
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
msgstr "Ubumbeko Lwesitishi se-TV"
#. Initialization dialog contents
@@ -542,6 +546,11 @@
msgstr "Isishwankathelo sobumbeko..."
#, fuzzy
+#~| msgid "Set the authentication for proxy"
+#~ msgid "Succeed to created authentification file "
+#~ msgstr "Misela ungqinelwano ngobunyani obumele obunye"
+
+#, fuzzy
#~| msgid "Configuration name cannot be empty."
#~ msgid "Configuration name can not be null"
#~ msgstr "Igama lolwakhelo alikwazi ukungabinanto."
Modified: trunk/yast/xh/po/installation.xh.po
===================================================================
--- trunk/yast/xh/po/installation.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/installation.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -37,7 +37,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
msgid "Initializing..."
msgstr "Kuyandululwa..."
@@ -135,33 +135,33 @@
" ziyahluka kwezo zenziwa ngesandla.\n"
#. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
#, fuzzy
msgid "Start service %1"
msgstr "Qalisa Iinkonzo"
#. TRANSLATORS: progress stage, %1 stands for service name
#. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
#: src/lib/installation/clients/inst_restore_settings.rb:47
#, fuzzy
msgid "Starting service %1..."
msgstr "Ukuqalisa inkonzo kwakhona %1..."
#. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
#, fuzzy
msgid "Adjusting Network Settings"
msgstr "Kufundwa imimiselo yomsebenzi wothungelwano..."
#. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
#, fuzzy
msgid "Network settings are being adjusted."
msgstr "<p>Please wait while packages are installed.</p>"
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
msgid ""
"The previous installation has failed.\n"
"Would you like it to continue?\n"
@@ -174,7 +174,7 @@
" Qaphela: Kusenokufuneka ukuba ungenise olunye ulwazi kwakhona."
#. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
msgid ""
"The previous installation has been aborted.\n"
"Would you like it to continue?\n"
@@ -189,7 +189,7 @@
#. popup headline (#x1)
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
#: src/lib/installation/clients/inst_doit.rb:60
msgid "Starting Installation..."
msgstr "Kuqaliswa Ukuhlohla..."
@@ -236,21 +236,21 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:133
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>Buya umva uqwalasele imimiselo xa ungaqinisekanga.</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
+#: src/lib/installation/proposal_runner.rb:121
msgid "Confirm Update"
msgstr "Qinisekisa Uhlaziyo"
#. 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
+#: src/lib/installation/proposal_runner.rb:125
#, 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>"
@@ -259,7 +259,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:127
#, fuzzy
msgid ""
"\n"
@@ -273,7 +273,7 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:136
msgid "Start &Update"
msgstr "Qalisa &Uhlaziyo"
@@ -313,56 +313,7 @@
msgstr "Ukuqalisa inkonzo kwakhona %1..."
#. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr ""
-
-#. TRANSLATORS: help text
-#: 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"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"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 <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-"<p> Phinda <b> kabini</b> ukuba ufuna ukudala inkangeleko yecala le-AutoYaST.\n"
-" nI-AutoYaST yindlela yokugqiba ukuhlohla kwe-SUSE Linux ngaphandle kokudibaniselana nomsebenzisi. ukuba ufuna ukudala inkangeleko yecala le-\n"
-" AutoYaST. Ukuba oku kunokukhethwa\n"
-" kukhethiwe, kulondolozwe inkangeleko yecala lesixokelelwano sangoku /kwingcambu yamandla/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/lib/installation/clients/clone_proposal.rb:71
-#, fuzzy
-#| msgid "Writing the system configuration"
-msgid "Clone System Configuration"
-msgstr "Ukubhala ubumbeko lwesixokelelwano"
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Clone System Configuration"
-msgstr "&Tsiba Ubumbeko "
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
-msgstr ""
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
-msgstr ""
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:83
msgid "Copying files to installed system..."
msgstr "Kukhutshelwa iifayili kwisixokelelwano esihlohliweyo"
@@ -557,7 +508,7 @@
msgstr ""
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:321
#, fuzzy
msgid "Unknown Product"
msgstr "Imo esebenzayo engaziwa"
@@ -587,56 +538,28 @@
"Khetha ukuba uphumeza uhlaziyo ngekhompyutha na ngoku.\n"
"Unako ukulitsiba eli nyathelo uze uphumeze uhlaziyo ngekhompyutha kamva.\n"
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
msgid "Language, Keyboard and License Agreement"
msgstr ""
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: 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 "&Ulwimi"
-
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "&Ukumiswa Kakuhle Kwebhodi Yamaqhosha"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:319
#, fuzzy
-msgid "I &Agree to the License Terms."
-msgstr "&Ewe, Ndiyasivuma Isivumelwano Selayisensi"
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Khulula Amanqaku"
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
-#, fuzzy
-#| msgid "Keyboard"
-msgid "K&eyboard Test"
-msgstr "Ibhodi yamaqhosha"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "Isivumelwano Selayisensi"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-#, fuzzy
-msgid "License &Translations..."
-msgstr "Ibhala izitishi ze-TV..."
-
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
#, fuzzy
msgid ""
"<p>\n"
@@ -651,7 +574,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -660,7 +583,7 @@
msgstr ""
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -671,7 +594,7 @@
" </p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -684,7 +607,7 @@
" </p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
#, fuzzy
msgid ""
"<p>\n"
@@ -697,24 +620,59 @@
" nayiphi inkqubo yokuhlohla.\n"
" </p>\n"
-#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: 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
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
+msgid "License Agreement"
+msgstr "Isivumelwano Selayisensi"
+
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:429
+msgid "&Language"
+msgstr "&Ulwimi"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
+msgid "&Keyboard Layout"
+msgstr "&Ukumiswa Kakuhle Kwebhodi Yamaqhosha"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Khulula Amanqaku"
+msgid "I &Agree to the License Terms."
+msgstr "&Ewe, Ndiyasivuma Isivumelwano Selayisensi"
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. Report error about missing license acceptance
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
msgid "You must accept the license to install this product"
msgstr ""
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "Kuqwalaselwa isixokelelwano esihlohliweyo..."
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
+#, fuzzy
+#| msgid "Keyboard"
+msgid "K&eyboard Test"
+msgstr "Ibhodi yamaqhosha"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
+#, fuzzy
+msgid "License &Translations..."
+msgstr "Ibhala izitishi ze-TV..."
+
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
#, fuzzy
@@ -832,7 +790,7 @@
msgstr "Lo mbekelelo awuhlohlwanga kwaye awusayi kuhlohlwa."
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
msgid "The system will reboot now..."
msgstr "Isixokelelwano siza kumisela inkqubo kwakhona ngoku..."
@@ -841,17 +799,17 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
#: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
#, fuzzy
msgid "Deploying Images..."
msgstr "Sebenzisa Umfanekiso %1"
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:168
#, fuzzy
msgid ""
"Deploying images has failed.\n"
@@ -861,30 +819,30 @@
"Iyeka ukuhlohla."
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:200
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/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:376
#, fuzzy
msgid "Downloading image at speed %1/s"
msgstr "Kuthulwa umthwalo womfuziselo..."
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:381
#, fuzzy
msgid "Downloading image %1 at speed %2/s"
msgstr "Kuthulwa umthwalo womfuziselo..."
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:441
#, fuzzy
msgid "Deploying image..."
msgstr "Kuthulwa umthwalo womfuziselo..."
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:444
#, fuzzy
msgid "Deploying image %1..."
msgstr "Kuthulwa umthwalo womfuziselo..."
@@ -902,46 +860,47 @@
msgid "&Disk to Use"
msgstr ""
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
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/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
msgid "Hard Disk for Image Deployment"
msgstr ""
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
msgid "Detecting Available Controllers"
msgstr "Kuchongwa Izilawuli Ezikhoyo"
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
msgid "Disk Activation"
msgstr "Kunikwa i-Disk Isakhono Sokusebenziseka"
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
msgid "Configure &DASD Disks"
msgstr "Yenza Ubumbeko lwee-disk &ze-DASD"
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
msgid "Configure &ZFCP Disks"
msgstr "Yenza Ubumbeko lwee-disk &ze-DASD"
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
#, fuzzy
#| msgid "Configure &ZFCP Disks"
msgid "Configure &FCoE Interfaces"
msgstr "Yenza Ubumbeko lwee-disk &ze-DASD"
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
msgid "Configure &iSCSI Disks"
msgstr "Yenza Ubumbeko lwee-disk &iSCSI"
-#: src/lib/installation/clients/inst_disks_activate.rb:111
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
#, fuzzy
#| msgid "Saving network configuration..."
-msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
#. TRANSLATORS: dialog caption
@@ -961,7 +920,7 @@
#. bug #302384
#: 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
+#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "Kuyandululwa"
@@ -989,74 +948,77 @@
msgid "Show &package updates"
msgstr "Bonisa imibekelelo enesimo"
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+#, fuzzy
+msgid "Calling step %1..."
+msgstr "Kuqokelelwa iinkcukacha zesixokelelwano..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr ""
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "Imposiso Yokuhlohla"
+
#. Adjust a SlideShow dialog if not configured
#. kilobytes
#. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
msgid "Finishing Basic Installation"
msgstr "Kugqitywa Ukuhlohlwa Okusisiseko"
#. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
#, fuzzy
msgid "Creating list of finish scripts to call..."
msgstr "Izikripti Zaphambi Kokuhlohla"
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "Kugqityiwe"
+
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:456
msgid "Copy files to installed system"
msgstr "Kukhutshelwa iifayili kwisixokelelwano esihlohliweyo"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:463
msgid "Save configuration"
msgstr "Gcina ubumbeko"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:470
msgid "Save installation settings"
msgstr "Gcina imimiselo yokuhlohla"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:479
msgid "Install boot manager"
msgstr "Hlohla umphathi wokumisela inkqubo"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:486
msgid "Prepare system for initial boot"
msgstr "Lungisa isixokelelwano sokumisela inkqubo okokuqala"
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
#, fuzzy
msgid "Checking stage: %1..."
msgstr "Kuqwalaselwe %1 iziseko zezibini..."
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
-#, fuzzy
-msgid "Calling step %1..."
-msgstr "Kuqokelelwa iinkcukacha zesixokelelwano..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
-msgid " * %1"
-msgstr ""
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
-msgid "Finished"
-msgstr "Kugqityiwe"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
-msgid "Installation Error"
-msgstr "Imposiso Yokuhlohla"
-
#. Button to accept a license agreement
#: src/lib/installation/clients/inst_info.rb:63
msgid "I &Agree"
@@ -1083,26 +1045,26 @@
msgstr "Ukubhala ubumbeko lwesixokelelwano"
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
#, fuzzy
#| msgid "Installation Settings"
msgid "Installation Options"
msgstr "Imimiselo Yokuhlohla"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
msgid "&Add Online Repositories Before Installation"
msgstr ""
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
#, fuzzy
#| msgid "In&clude Add-On Products from Separate Media"
msgid "In&clude Add-on Products from Separate Media"
msgstr "Banda&kanya Iimveliso Ezifakelwayo ezivela Kwizilondolozi Ezahlukanisiweyo"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
#, fuzzy
#| msgid ""
#| "<p><big><b>Installation Mode</b></big><br>\n"
@@ -1113,7 +1075,7 @@
"Khetha okufanele ukwenziwa:</p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1121,7 +1083,7 @@
msgstr ""
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -1137,7 +1099,7 @@
" <b> Bandakanya Iimveliso Ezifakelwayo ezivela kwizilondolozi ezifakelwayo</b>.</p>\n"
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr ""
@@ -1263,7 +1225,7 @@
#. Use 'zero' if image installation is not used
#. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
#, fuzzy
msgid "Installing Packages..."
msgstr "Ukuhlohla imibekelo..."
@@ -1303,7 +1265,7 @@
"Linux. Anika isishwankathelo zeempawu ezintsha neenguquko.</p>"
#. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
#, fuzzy
msgid "<p>No release notes have been installed.</p>"
msgstr "Akukho zikhuselwa zihlohliweyo."
@@ -1328,97 +1290,97 @@
#. This dialog in not interactive
#. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
msgid "Analyzing the Computer"
msgstr "Kuhlalutywa Ikhompyutha"
#. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
#, fuzzy
msgid "Probe USB devices"
msgstr "Kugrunjwa izixhobo ze-USB"
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
#, fuzzy
msgid "Probing USB devices..."
msgstr "Kugrunjwa izixhobo ze-USB"
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
#, fuzzy
msgid "Probe FireWire devices"
msgstr "Kugrunjwa izixhobo Zocingo Lomlilo..."
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
msgid "Probing FireWire devices..."
msgstr "Kugrunjwa izixhobo Zocingo Lomlilo..."
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
msgid "Probe floppy disk devices"
msgstr "Grumba izixhobo zedisk yeenkcukacha"
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
msgid "Probing floppy disk devices..."
msgstr "Kugrunjwa izixhobo zedisk yeenkcukacha..."
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
msgid "Probe hard disk controllers"
msgstr "Grumba abalawuli beqokobhe lekhompyutha"
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
msgid "Probing hard disk controllers..."
msgstr "Kugrunjwa abalawuli beqokobhe leekhompyutha..."
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
msgid "Load kernel modules for hard disk controllers"
msgstr "Layisha iimodyuli ze-kernel ukwenzela abalawuli beqokobhe lekhompyutha"
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
msgid "Loading kernel modules for hard disk controllers..."
msgstr "Kulayishwa iimodyuli ze-kernel ukwenzela abalawuli beqokobhe leekhompyutha..."
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
msgid "Probe hard disks"
msgstr "Grumba amaqokobhe eekhompyutha"
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
msgid "Probing hard disks..."
msgstr "Kugrunjwa amaqokobhe eekhompyutha..."
#. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
#, fuzzy
msgid "Search for system files"
msgstr "Zingela izaHlulelo eziLahlekileyo"
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
#, fuzzy
msgid "Searching for system files..."
msgstr "Ukuzingela ingcambu yesixhobo..."
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
#, fuzzy
msgid "Initialize software manager"
msgstr "Kundululwa umbekelo omtsha wesiseko senkcukacha..."
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
#, fuzzy
msgid "Initializing software manager..."
msgstr "Kundululwa umbekelo omtsha wesiseko senkcukacha..."
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
#, fuzzy
msgid "System Probing"
msgstr "Ukuqwalaselwa Kwesixokelelwano"
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
#, fuzzy
msgid "YaST is probing computer hardware and installed systems now."
msgstr "<p>Please wait while the system is being configured.</p>"
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:257
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1431,7 +1393,7 @@
"Nceda qwalasela iqokobhe lakho lekhompyutha!\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:271
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1444,7 +1406,7 @@
"Akukho maqokobhe ekhompyutha afunyanelwe ukuhlohla.\n"
"Nceda qwalasela iqokobhe lakho lekhompyutha!\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:281
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1452,7 +1414,7 @@
msgstr ""
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:292
#, fuzzy
#| msgid ""
#| "No hard disks and no hard disk controllers were\n"
@@ -1469,7 +1431,7 @@
" Qwalasela iqokobhe lekhompyutha lakho.\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:337
#, fuzzy
msgid ""
"Failed to initialize the software repositories.\n"
@@ -1478,6 +1440,52 @@
"Isilele ukundulula iikhatalogu.\n"
"Iyeka ukuhlohla."
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:187
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:193
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:265
+msgid ""
+"Downloading the optional installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
+msgstr ""
+
#. TRANSLATORS: Table item status (repository)
#: src/lib/installation/clients/inst_upgrade_urls.rb:109
#, fuzzy
@@ -1534,8 +1542,8 @@
#. 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
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
msgid "&Change..."
msgstr "&Guqula..."
@@ -1749,7 +1757,7 @@
" kubumbeko lwesixokelelwano.</p>\n"
#. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
#, fuzzy
msgid "No workflow defined for this kind of installation."
msgstr "Akukho qukuqelo lomsebenzi luchaziweyo ngale mo yokuhlohla."
@@ -1773,7 +1781,7 @@
msgstr "Kumiselwa isilondolozi esiqukezayo sokunxulumanisa"
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
msgid "Saving network configuration..."
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
@@ -1831,6 +1839,26 @@
msgid "Saving hardware configuration..."
msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..."
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+#| msgid "Writing the system configuration"
+msgid "Import SSH Host Keys and Configuration"
+msgstr "Ukubhala ubumbeko lwesixokelelwano"
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "&Tsiba Ubumbeko "
+
#. progress step title
#: src/lib/installation/clients/ssh_settings_finish.rb:64
msgid "Copying SSH settings to installed system..."
@@ -1888,6 +1916,34 @@
msgid "Copying log files to installed system..."
msgstr "Kukhutshelwa iifayili zokungena kwisixokelelwano esihlohliweyo..."
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "Isixhobo"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "Import SSH Configuration"
+msgstr "&Tsiba Ubumbeko "
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
#, fuzzy
@@ -1895,34 +1951,22 @@
msgstr "Ukuzingela izahlulelo ze-Linux ezisebenzisekayo..."
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
msgid "Really reset everything to default values?"
msgstr "Uphinda umisele ngokwenene yonke into kumaxabiso ahlala ekho?"
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
msgid "You will lose all changes."
msgstr "Uya kulahlekelwa zizo zonke iinguquko."
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-#, fuzzy
-msgid "Location of Stored Configuration"
-msgstr "&Sebenzisa Ubumbeko Olulandelayo"
-
-#. 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 ""
-
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
msgid "Skipping configuration upon user request"
msgstr "Kutsitywa ubumbeko phezu kwesicelo somsebenzi"
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
@@ -1931,26 +1975,26 @@
"ukusonjululwa phambi kokuqhuba.\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
#, fuzzy
msgid "Adapting the proposal to the current settings..."
msgstr "Bonisa isishwankathelo semimiselo yangoku"
#. 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
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
msgid "Analyzing your system..."
msgstr "Kuhlalutywa isixokelelwano sakho..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
msgid "ERROR: No proposal"
msgstr "IMPOSISO: Akukho sindululo"
#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1963,48 +2007,40 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
msgid "&Skip Configuration"
msgstr "&Tsiba Ubumbeko "
#. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
msgid "&Use Following Configuration"
msgstr "&Sebenzisa Ubumbeko Olulandelayo"
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Export Configuration"
-msgstr "&Tsiba Ubumbeko "
-
#. 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
+#: src/lib/installation/proposal_runner.rb:693
#, 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 "Nqomfa nawuphi umgca wesihloko ukuze usebenzise imenyu yo \"Guqulo...\" ngezantsi."
-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
#, fuzzy
#| msgid "Click any headline to make changes or use the \"Change...\" menu below."
msgid "Click a headline to make changes."
msgstr "Nqomfa nawuphi umgca wesihloko ukuze usebenzise imenyu yo \"Guqulo...\" ngezantsi."
#. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
msgid "&Reset to defaults"
msgstr "&Phinda umisele ukuya kokuhlala kukho"
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Update"
msgstr "&Uhlaziyo"
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
msgid "&Install"
msgstr "&Hlohla"
@@ -2045,7 +2081,7 @@
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
#, fuzzy
msgid ""
"<p>\n"
@@ -2059,7 +2095,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:434
#, fuzzy
msgid ""
"<p>\n"
@@ -2072,7 +2108,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:443
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -2084,7 +2120,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:451
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -2096,7 +2132,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -2107,12 +2143,12 @@
" </p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr "<P><B>UML Isindululo Sokuhlohla</B></P>"
#. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -2123,7 +2159,7 @@
#. 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
+#: src/lib/installation/proposal_store.rb:482
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2142,6 +2178,11 @@
msgid "Enabling remote administration..."
msgstr "Umlawuli Omgama"
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:79
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
#. Writes configuration
#.
#. It creates a snapshot when no second stage is required and
@@ -2149,22 +2190,115 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
#, fuzzy
#| msgid "Checking root file system entry of fstab..."
msgid "Creating root filesystem snapshot..."
msgstr "Ukuqwalasela ungeniso lwengcambu yesixokelelwano sefayili ye-fstab... "
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+#, fuzzy
+#| msgid "No Linux root partition found."
+msgid "No previous Linux installation found"
+msgstr "Akukho candela lamacwecwe eLinux afunyenweyo."
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. 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/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. 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/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+msgid "Unknown protocol %1."
+msgstr "Imo esebenzayo engaziwa"
+
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
#, fuzzy
msgid "Failed to read information about installation images"
msgstr "Isilele ukudala idiski yokuhlohla i-RAM."
#. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
#, fuzzy
msgid "Deploying..."
msgstr "Kuthulwa umthwalo womfuziselo..."
@@ -2173,7 +2307,7 @@
#.
#. @see #all_supported_types
#. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
#, fuzzy
msgid "Storing user preferences..."
msgstr "Kunqunyanyiswa iinkonzo..."
@@ -2181,18 +2315,34 @@
#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
#.
#. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
#, fuzzy
msgid "Restoring user preferences..."
msgstr "Ukubuyisela umbekelo %1..."
#. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
msgid ""
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "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 <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgstr ""
+#~ "<p> Phinda <b> kabini</b> ukuba ufuna ukudala inkangeleko yecala le-AutoYaST.\n"
+#~ " nI-AutoYaST yindlela yokugqiba ukuhlohla kwe-SUSE Linux ngaphandle kokudibaniselana nomsebenzisi. ukuba ufuna ukudala inkangeleko yecala le-\n"
+#~ " AutoYaST. Ukuba oku kunokukhethwa\n"
+#~ " kukhethiwe, kulondolozwe inkangeleko yecala lesixokelelwano sangoku /kwingcambu yamandla/autoyast.xml.</p>\n"
+
+#, fuzzy
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "&Sebenzisa Ubumbeko Olulandelayo"
+
#~ msgid "ERROR: Missing Title"
#~ msgstr "IMPOSISO: Kulahleke Isihloko"
@@ -2314,9 +2464,6 @@
#~ msgid "Network Card"
#~ msgstr "Ikhadi Lothungelwano"
-#~ msgid "Device"
-#~ msgstr "Isixhobo"
-
#, fuzzy
#~ msgid "Hardware Information of the Selected Network Card"
#~ msgstr "Bonisa ulwazi lomsebenzisi okhethiweyo"
@@ -2937,9 +3084,6 @@
#~ msgid "Evaluating root partition. One moment please..."
#~ msgstr "Kuhlolwa icandelo lamacwecwe engcambu yamandla. Linda umzuzwana..."
-#~ msgid "No Linux root partition found."
-#~ msgstr "Akukho candela lamacwecwe eLinux afunyenweyo."
-
#~ msgid "Booting from %1"
#~ msgstr "Kumiselwa inkqubo ukusuka %1"
Modified: trunk/yast/xh/po/iscsi-client.xh.po
===================================================================
--- trunk/yast/xh/po/iscsi-client.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/iscsi-client.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: iscsi-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -111,7 +111,6 @@
msgid "Add"
msgstr "Fakela"
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
#: src/include/iscsi-client/dialogs.rb:160
msgid "Edit"
msgstr "Hlela"
@@ -172,47 +171,64 @@
msgid "Startup"
msgstr "Qalisa"
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "Ngokwenza ngesandla"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr "Idilesi ye-IP"
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
msgid "Port"
msgstr "Isiqhagamshelanisi"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Key"
msgstr "Iqhosha"
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
msgid "Value"
msgstr "Ixabiso"
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
msgid "Service"
msgstr "Inkonzo"
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
msgid "Connected Targets"
msgstr "Izinto Ekujoliswe Kuzo Ezidityanisiweyo"
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
msgid "Discovered Targets"
msgstr "Izinto Ekujoliswe Kuzo Ezifunyanisiweyo"
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
msgid "iSCSI Initiator Overview"
msgstr "Umqalisi Gabalala we-iSCSI"
#. discovery new target
#. 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/dialogs.rb:407
#: 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>"
@@ -221,9 +237,9 @@
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
msgid "iSCSI Initiator Discovery"
msgstr "Ukufumanisa Umqalisi we-iSCSI"
@@ -444,31 +460,29 @@
msgid "Error occurred while logging out from the selected target."
msgstr "Kwenzeke imposiso xa ubusimka kokujoliswe kuko okukhethiweyo."
-#. toggle all 3 possible values (bnc#457252)
#: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
msgid "No record found."
msgstr "Akukho ngxelo ifunyanisiweyo."
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
#, fuzzy
msgid "No valid IP address"
msgstr "Idilesi ye-IP yesixhobo"
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
#, fuzzy
msgid "Port field cannot be empty"
msgstr "Igama lolwabelwano alikwazi kuba likhamte."
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:393
#, fuzzy
#| msgid "Initiator Name"
msgid "Incorrect Initiator Name"
msgstr "Igama lomQalisi"
-#: src/include/iscsi-client/widgets.rb:429
+#: src/include/iscsi-client/widgets.rb:394
#, fuzzy
msgid ""
"\n"
@@ -488,13 +502,18 @@
"Umzekelo:\n"
"iqn.2007-04.cz.seva:isitore.idiski.sdb\n"
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
msgid "Insert the IP address."
msgstr "Faka idilesi ye-IP."
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
#. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:596
msgid "Insert the port."
msgstr "Faka isiqhagamshelanisi."
@@ -502,37 +521,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:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
msgid "True"
msgstr "Yinyaniso"
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
msgid "False"
msgstr "Asiyonyaniso"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
#, fuzzy
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr "Injongo ngeli Gama leNjongo sele iqhagamshelwe. Qinisekisa ukuba indlela ezininzi zenziwe zasebenza ukunqanda ukonakala kwedata."
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Continue"
msgstr "Uyaqhuba"
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
msgid "Cancel"
msgstr "Hlaba"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:869
msgid "The target is already connected."
msgstr "Ekujoliswe kuko sekudityanisiwe."
@@ -627,7 +646,7 @@
msgstr "Konke"
#. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:730
#, fuzzy
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
@@ -639,15 +658,16 @@
"OIgama lomqalisi elidala liza kubuyiselwa ngexabiso ukusuka kwi-iBFT kunye nokwenza ugcino olukhuselekileyo.\n"
" Ukuba ufuna ukusebenzisa igama lomqalisi elahlukileyo litshintshe kwi-BIOS."
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
#, fuzzy
#| msgid "Image creation failed."
msgid "Target connection failed.\n"
msgstr "Akuphumelelanga ukwenziwa komfanekiso."
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1208
msgid "Configuration summary..."
msgstr "Isishwankathelo sobumbeko..."
Modified: trunk/yast/xh/po/iscsi-lio-server.xh.po
===================================================================
--- trunk/yast/xh/po/iscsi-lio-server.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/iscsi-lio-server.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -42,15 +42,14 @@
msgstr "Inkonzo"
#. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73
-#: src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
msgid "Global"
msgstr "Ilizwe jikelele"
#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#: src/modules/IscsiLioServer.rb:443
#, fuzzy
#| msgid "Target Name"
@@ -73,7 +72,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
#, fuzzy
#| msgid "Write groups"
msgid "Portal group"
@@ -104,7 +103,7 @@
msgstr "Ungqinelwano Ngobunyani Nomsebenzisi"
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
msgid "LUN"
msgstr ""
@@ -117,133 +116,136 @@
msgstr "Indlela yothungelwano"
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/widgets.rb:453
msgid "Add"
msgstr "Fakela"
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
msgid "Edit"
msgstr "Hlela"
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
+#: src/include/iscsi-lio-server/widgets.rb:454
msgid "Delete"
msgstr "Cima "
-#: src/include/iscsi-lio-server/dialogs.rb:193
-#, fuzzy
-#| msgid "Clients"
-msgid "Client"
-msgstr "Abaxumi"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
+msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "LUN Mapping"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
#, fuzzy
#| msgid "&Author"
msgid "Auth"
msgstr "&Umbhali"
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
#, fuzzy
#| msgid "Edit "
msgid "Edit LUN"
msgstr "Hlela"
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
#, fuzzy
#| msgid "Edit "
msgid "Edit Auth"
msgstr "Hlela"
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
msgid "Copy"
msgstr ""
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "Akukho Ngqinelwano Ngobunyani"
-#: src/include/iscsi-lio-server/dialogs.rb:225
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/widgets.rb:229
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "Ungqinelwano Ngobunyani Olufikayo"
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:721
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
msgid "Username"
msgstr "Igama lomsebenzisi"
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: 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:722
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
msgid "Password"
msgstr "Igama lokugqithisela"
-#: src/include/iscsi-lio-server/dialogs.rb:248
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/widgets.rb:242
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "Ungqinelwano Lobunyani Oluphumayo"
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
msgid "When &Booting"
msgstr "Xa &Kumiselwa Inkqubo"
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
msgid "&Manually"
msgstr "&Ngokwenza ngesandla"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "Xa Kumiselwa Inkqubo"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "Ngokwenza ngesandla"
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Key"
msgstr "Iqhosha"
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
msgid "Value"
msgstr "Ixabiso"
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
#, fuzzy
#| msgid "iSCSI Initiator Overview"
msgid "iSCSI LIO Target Overview"
@@ -251,33 +253,34 @@
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
#, fuzzy
#| msgid "<h1>iSCSI Initiator</h1>"
msgid "<h1>iSCSI Target</h1>"
msgstr "<h1>Umqalisi we-iSCSI</h1>"
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
#, fuzzy
#| msgid "iSCSI Target"
msgid "Add iSCSI Target"
msgstr "I-iSCSI Ekujoliswe kuyo"
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+msgid "Modify iSCSI Target Initiator Setup"
msgstr ""
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
msgid "Modify iSCSI Target Lun Setup"
msgstr ""
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
#, fuzzy
#| msgid "CUPS Expert Settings"
msgid "iSCSI Target Expert Settings"
@@ -467,19 +470,24 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
msgstr ""
#: src/include/iscsi-lio-server/helps.rb:130
-msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+msgid ""
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
msgstr ""
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
#, fuzzy
#| msgid ""
#| "List of Discovery Domain Sets. Create a new dds by clicking <b>Add</b>. \n"
@@ -493,12 +501,12 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
msgid ""
"It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -507,19 +515,19 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
msgid ""
"<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
"and port the service will be available. Default for port number is 3260.\n"
"Only ip addresses assigned to one of the network cards are possible."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
msgid "Create a new target. Replace template values with the correct values."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
msgid ""
"It is possible to make arbitary block devices or files available under a lun.\n"
"You have to provide <b>path</b> to either block devices or file. \n"
@@ -528,255 +536,279 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
msgid ""
"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
msgstr ""
#. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
#, fuzzy
#| msgid "Incoming Authentication"
msgid "Problem changing authentication"
msgstr "Ungqinelwano Ngobunyani Olufikayo"
#. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
#, fuzzy
#| msgid "Enter a valid username."
msgid "Invalid Username"
msgstr "Faka igama lomsebenzisi elisebenzayo."
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
#, fuzzy
#| msgid "Enter Provider Password"
msgid "Invalid Password."
msgstr "Ngenisa Igama Lokugqithisa Lomboneleli"
-#: src/include/iscsi-lio-server/widgets.rb:251
+#: src/include/iscsi-lio-server/widgets.rb:262
#, fuzzy
#| msgid "The selected option is already present."
-msgid "Selected Lun is already in use!"
+msgid "Selected LUN is already in use!"
msgstr "Ukhetho olukhethiweyo selukhona."
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "Selected Name is already in use!"
msgstr "Igama lokrozo elichongiweyo %1 sele lisetyenzisiwe."
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected Path must be either block device or normal file!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
#, fuzzy
#| msgid "The selected option is already present."
msgid "Selected Path is already in use!"
msgstr "Ukhetho olukhethiweyo selukhona."
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
#, fuzzy
#| msgid "&Path:"
msgid "Path:"
msgstr "&Indlela yothungelwano:"
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
#, fuzzy
#| msgid "&Browse"
msgid "Browse"
msgstr "&Khangela"
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
#, fuzzy
#| msgid "Select a device."
msgid "Select file or device"
msgstr "Khetha isixhobo."
-#: src/include/iscsi-lio-server/widgets.rb:436
-#, fuzzy
-#| msgid "Clients"
-msgid "Client Lun"
-msgstr "Abaxumi"
+#: src/include/iscsi-lio-server/widgets.rb:447
+msgid "Initiator LUN"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
#, fuzzy
#| msgid "Target Name"
msgid "Target LUN"
msgstr "Igama Ekujoliswe Kulo"
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
#, fuzzy
#| msgid "Changes:"
msgid "Change:"
msgstr "Utshintsho:"
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
msgid "Target LUN %1 used more than once!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
#, fuzzy
#| msgid "Select File with the Authentication Key"
msgid "Need to enable at least one Authentification!"
msgstr "Khetha Ifayili Eneqhosha Elichanekileyo"
-#: src/include/iscsi-lio-server/widgets.rb:619
-#, fuzzy
-#| msgid "NIS client"
-msgid "Client name:"
-msgstr "Umxumi we-NIS"
+#: src/include/iscsi-lio-server/widgets.rb:630
+msgid "Initiator name:"
+msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
#, fuzzy
#| msgid "&Import from File"
msgid "Import LUNs from TPG"
msgstr "&Thatha ngaphandle okuvela Kwifayili"
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
#, fuzzy
#| msgid "Phone numbers must not be empty."
-msgid "Client name must not be empty!"
+msgid "Initiator name must not be empty!"
msgstr "Iinamba zefowni akufuneki zingabi nanto."
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. 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:701
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
#, fuzzy
#| msgid "Provider name %1 already exists."
-msgid "Client name already exists!"
+msgid "Initiator name already exists!"
msgstr "Igama lomboneleli%1 sele likhona."
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
+#: src/include/iscsi-lio-server/widgets.rb:689
#, fuzzy
#| msgid "NIS client"
-msgid "New client name:"
+msgid "New initiator name:"
msgstr "Umxumi we-NIS"
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
msgid "OK"
msgstr "&KULUNGILE"
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
msgid "Cancel"
msgstr "Hlaba"
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:796
+#, fuzzy
+#| msgid "Disabled"
+msgid "Enabled"
+msgstr "Kususwe isakhono"
+
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
+msgid "Disabled"
+msgstr "Kususwe isakhono"
+
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
msgid "Really delete the selected item?"
msgstr "Uyayicima ngenene into ekhethiweyo?"
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1015
msgid "Problem creating target %1 with tpg %2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1037
msgid "Problem setting network portal to %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1058
msgid "Problem removing lun %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1083
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1097
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:1198
+#: src/include/iscsi-lio-server/widgets.rb:1211
#, fuzzy
#| msgid "Share name cannot be empty."
msgid "The target cannot be empty."
msgstr "Igama lolwabelwano alikwazi kuba likhamte."
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1215
#, fuzzy
#| msgid "Share path cannot be empty."
msgid "The target portal group cannot be empty."
msgstr "Indlela yothungelwano yolwabelwano ayikwazi kuba likhamte."
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1226
#, fuzzy
#| msgid "Share %1 already exists."
msgid "The target already exists."
msgstr "Ulwabelwano '%1' selukhona."
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1246
#, fuzzy
#| msgid "Incoming Mail"
msgid "Incoming"
msgstr "Imeyile Efikayo"
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1249
#, fuzzy
#| msgid "Outgoing Mail"
msgid "Outgoing"
msgstr "Imeyile Ephumela Ngaphandle"
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1251
msgid "None"
msgstr "Akukho"
-#: 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 "Kususwe isakhono"
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1463
msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator 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?"
+"Really want to continue without initiator access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1477
+#, fuzzy
+#| msgid ""
+#| "Error occurred while creating directory %1:\n"
+#| "%2"
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr ""
+"Kwenzeke imposiso xa kudalwa uvimba weefayili %1:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1492
+#, fuzzy
+#| msgid ""
+#| "Error occurred while creating directory %1:\n"
+#| "%2"
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr ""
+"Kwenzeke imposiso xa kudalwa uvimba weefayili %1:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1513
+#, fuzzy
+#| msgid ""
+#| "Error occurred while creating directory %1:\n"
+#| "%2"
+msgid "Problem removing initiator %3 from %1:%2"
msgstr ""
+"Kwenzeke imposiso xa kudalwa uvimba weefayili %1:\n"
+"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1524
+#: src/include/iscsi-lio-server/widgets.rb:1537
#, fuzzy
#| msgid ""
#| "Error occurred while creating directory %1:\n"
#| "%2"
-msgid "Problem creating client %3 for %1:%2"
+msgid "Problem creating initiator %3 for %1:%2"
msgstr ""
"Kwenzeke imposiso xa kudalwa uvimba weefayili %1:\n"
"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
-msgstr ""
+#: src/include/iscsi-lio-server/widgets.rb:1572
+#, fuzzy
+#| msgid "Incoming Authentication"
+msgid "Problem changing auth for initiator %3 in %1:%2"
+msgstr "Ungqinelwano Ngobunyani Olufikayo"
#. Initialization dialog caption
#: src/include/iscsi-lio-server/wizards.rb:110
@@ -791,11 +823,11 @@
msgstr "Kuyandululwa..."
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save lio setup"
msgstr ""
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
msgid "Cannot save tcm setup"
msgstr ""
@@ -905,6 +937,21 @@
msgid "Configuration summary..."
msgstr "Isishwankathelo sobumbeko..."
+#, fuzzy
+#~| msgid "Clients"
+#~ msgid "Client"
+#~ msgstr "Abaxumi"
+
+#, fuzzy
+#~| msgid "Clients"
+#~ msgid "Client Lun"
+#~ msgstr "Abaxumi"
+
+#, fuzzy
+#~| msgid "NIS client"
+#~ msgid "Client name:"
+#~ msgstr "Umxumi we-NIS"
+
#~ msgid "Run SuSEconfig"
#~ msgstr "Qhuba ubumbeko lwe-SuSE"
Added: trunk/yast/xh/po/journalctl.xh.po
===================================================================
--- trunk/yast/xh/po/journalctl.xh.po (rev 0)
+++ trunk/yast/xh/po/journalctl.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -0,0 +1,125 @@
+# Xhosa translations for opensuse-i package.
+# Copyright (C) 2016 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the opensuse-i package.
+# Automatically generated, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: opensuse-i 18n\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"PO-Revision-Date: 2016-08-04 14:55+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: xh\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr ""
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr ""
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr ""
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr ""
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr ""
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr ""
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr ""
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr ""
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr ""
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:116
+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/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr ""
Modified: trunk/yast/xh/po/kdump.xh.po
===================================================================
--- trunk/yast/xh/po/kdump.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/kdump.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -401,10 +401,8 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
msgid "To apply changes a reboot is necessary."
msgstr "Ukusebenzisa iinguqu, ukuqalisa ngokutsha kubalulekile."
@@ -1311,163 +1309,178 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
msgid "Use &Firmware-Assisted Dump"
msgstr ""
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:511
#, fuzzy
msgid "Initializing kdump Configuration"
msgstr "Indulula uBumbeko lwe-Modem"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
#, fuzzy
msgid "Reading the config file..."
msgstr "Kufundwa ubumbeko..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:522
#, fuzzy
msgid "Reading kernel boot options..."
msgstr "Ayifundeki imimiselo jikelele."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:524
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:530
#, fuzzy
msgid "Reading partitions of disks..."
msgstr "Kufundwa ngezahlulelo..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:532
#, fuzzy
msgid "Reading available memory and calibrating usage..."
msgstr "Kuchongwa iikhathalogu ezikhoyo..."
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:544
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "Akukwazeki ukufunda ifayili yolwakh /etc/sysconfig/kdump"
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:552
#, fuzzy
msgid "Cannot read kernel boot options."
msgstr "Ayifundeki imimiselo jikelele."
#. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:560
#, fuzzy
msgid "Cannot read available memory."
msgstr "Ayikwazi kufundeka ifayili '%1'"
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:586
#, fuzzy
msgid "Saving kdump Configuration"
msgstr "Igcina uBumbeko lwe-Modem"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:615
msgid "Write the settings"
msgstr "Bhala imimiselo"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:617
#, fuzzy
msgid "Update boot options"
msgstr "Hlaziya Izikhethwa"
#. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:621
msgid "Writing the settings..."
msgstr "Kubhalwa imimiselo..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:623
#, fuzzy
msgid "Updating boot options..."
msgstr "Kuhlaziywa ubumbeko..."
#. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:625
msgid "Finished"
msgstr "Kugqityiwe"
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:635
msgid "Cannot write settings."
msgstr "Ayikwazi kubhaleka imimselo."
#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:644
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "Yongeza iparamitha ye-crashkernel kwingxaki yelowuda yokuqalisa."
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:764
#, fuzzy
msgid "Kdump status: %1"
msgstr "kumgangatho osebenzayo %1"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "enabled"
msgstr "kunikwe isakhono"
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
msgid "disabled"
msgstr "kukhutshwe isakhono"
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:772
#, fuzzy
msgid "Value(s) of crashkernel option: %1"
msgstr "Ixabiso elingenanto lesikhethwa: %1"
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:779
#, fuzzy
msgid "Dump format: %1"
msgstr "&Cwangcisa"
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:786
#, fuzzy
msgid "Target of dumps: %1"
msgstr "Elona Nani Li&phezulu Lokugcinwe Kukhuseleko Kudala"
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:793
#, fuzzy
msgid "Number of dumps: %1"
msgstr "Elona Nani Li&phezulu Lokugcinwe Kukhuseleko Kudala"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:879
+#: src/modules/Kdump.rb:885
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:974
+#: src/modules/Kdump.rb:972
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/xh/po/live-installer.xh.po
===================================================================
--- trunk/yast/xh/po/live-installer.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/live-installer.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -37,17 +37,17 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
#, fuzzy
msgid "Evaluating filesystems to copy..."
msgstr "Kuvavanywa izahlulelo zengcambu yamandla. Nceda linda kancinci..."
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
#, fuzzy
msgid "Copying root filesystem..."
msgstr "Ukuqwalasela isixokelelwano sefayili..."
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
#, fuzzy
msgid "Copying live image..."
msgstr "Kukotshwa imibekelelo..."
@@ -55,13 +55,13 @@
#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
#, fuzzy
msgid "Copying %1..."
msgstr "Kuyakotshwa..."
#. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -71,75 +71,56 @@
msgstr ""
#. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
msgid "Copying the live image to hard disk failed."
msgstr ""
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
msgid "Installation Settings"
msgstr "Imimiselo Yokuhlohla"
#. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
#, fuzzy
msgid "Analyzing the system..."
msgstr "Kuhlalutywa isixokelelwano sakho..."
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
msgid "Use %1%% of disk %2 for Linux"
msgstr ""
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
#, fuzzy
msgid "Do not use disk %1"
msgstr "Musa &ukusebenzisa i-NIS"
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
msgid "Partitioning"
msgstr "Ukwahlula"
#. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-#, fuzzy
-msgid "System start-up"
-msgstr "Ukugcina Kukhuseleko Kwesixokelelwano"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr ""
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr ""
-
-#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
msgid "Keyboard"
msgstr "Ibhodi yamaqhosha"
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
msgid "Time Zone"
msgstr "Izowuni Yexesha"
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
#, fuzzy
msgid "Change Installation Settings"
msgstr "Imimiselo Yokuhlohla"
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
#, fuzzy
msgid ""
"<p>\n"
@@ -150,7 +131,7 @@
" </p>\n"
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
#, fuzzy
msgid ""
"<p>\n"
@@ -163,7 +144,7 @@
" </p>\n"
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
#, fuzzy
msgid ""
"<p>\n"
@@ -257,7 +238,7 @@
msgstr ""
#. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
msgid "Copying files to installed system..."
msgstr "Kukhutshelwa iifayili kwisixokelelwano esihlohliweyo"
@@ -282,6 +263,10 @@
msgstr "Kugcinwa izowuni yexesha..."
#, fuzzy
+#~ msgid "System start-up"
+#~ msgstr "Ukugcina Kukhuseleko Kwesixokelelwano"
+
+#, fuzzy
#~ msgid "Installation settings"
#~ msgstr "Imimiselo Yokuhlohla"
Modified: trunk/yast/xh/po/mail.xh.po
===================================================================
--- trunk/yast/xh/po/mail.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/mail.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: mail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -312,75 +312,80 @@
#. Translators: dialog caption
#. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
msgid "Outgoing Mail"
msgstr "Imeyile Ephumela Ngaphandle"
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr ""
+
#. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
msgid "TLS encryption"
msgstr ""
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
msgid "No"
msgstr "Hayi"
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
#, fuzzy
msgid "Use"
msgstr "Umsebenzisi"
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
msgid "Enforce"
msgstr ""
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
msgid "&Masquerading"
msgstr "&Ukwenza Nto Yimbi"
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
msgid "&Authentication"
msgstr "&Ungqinelwano ngobunyani"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
msgid "Incoming Mail"
msgstr "Imeyile Efikayo"
#. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
msgid "&Details..."
msgstr "&Iinkcukacha..."
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
#, fuzzy
msgid "Start &fetchmail"
msgstr "Qalisa ukuFumana"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
#, fuzzy
#| msgid "Manually"
msgid "manual"
msgstr "Ngokwenza ngesandla"
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
#, fuzzy
#| msgid "Daemon"
msgid "daemon"
msgstr "i-Daemon"
#. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
msgid "&Downloading"
msgstr "&Thula umthwalo"
#. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
msgid "&Aliases..."
msgstr "&Amagama eziqhulo..."
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
msgid "&Virtual domains..."
msgstr "&Imimandla yolawulo yenene..."
@@ -388,7 +393,7 @@
#. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
#. %2: file name (eg. /etc/sysconfig/postfix)
#. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
msgid ""
"To be able to deliver mail to your local MTA,\n"
"the value of %1 in %2 will be set to\n"
@@ -402,7 +407,7 @@
#. correct and complete. The login name may contain only
#. certain characters and must begin with a letter.
#. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
msgid ""
"The user login may contain only\n"
"lower case letters, digits, \"-\" and \"_\"\n"
@@ -415,39 +420,39 @@
" Nceda zama kwakhona.\n"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
msgid "Sender address rewriting"
msgstr "Ukubhalwa ngokutsha kwedilesi yomthumeli"
#. Translators: text entry label
#. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
#: src/include/mail/widgets.rb:269
msgid "&Local user"
msgstr "&Umsebenzisi wendawo leyo"
#. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
msgid "&Display as"
msgstr "&Bonisa kanje"
#. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
msgid "The address for this user is already defined."
msgstr "Idilesi yomsebenzisi seyichaziwe."
#. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
msgid "The mail address format is incorrect."
msgstr "Ucwangciso lwedilesi yemeyile alichananga."
#. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
msgid "Masquerading"
msgstr "Ukwenza Nto Yimbi"
#. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
msgid "Masquerade &local domains"
msgstr "Ukwenza nto yimbi &nemimandla yolawulo yendawo leyo"
@@ -457,23 +462,23 @@
#. // `Left (`Label (`opt (`outputField, `hstretch), ld))
#. ),
#. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
msgid "Ma&squerade other domains"
msgstr "Ye&nza nto yimbi kweminye imimandla yolawulo"
#. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
msgid "Do&mains to masquerade"
msgstr "Imi&mandla yolawulo yokwenza nto yimbi"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
msgid "Local user"
msgstr "Umsebenzisi wendawo leyo"
#. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
msgid "Display as"
msgstr "Bonisa kanje"
@@ -482,23 +487,23 @@
#. ["holly", "jane", "tarzan"])),
#. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly(a)red.dwarf"))
#. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
msgid "A&dd"
msgstr "Fa&kela"
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
msgid "&Edit"
msgstr "&Hlela"
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
msgid "Dele&te"
msgstr "Ci&ma"
#. Translators: error popup
#. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
msgid "The domain name is incorrect"
msgstr "Igama lommandla wolawulo alichanekanga"
@@ -506,106 +511,106 @@
#. list<string> lmod = [];
#. list<map> mu = Mail::masquerade_users;
#. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
msgid "Outgoing Server Authentication"
msgstr "Ungqinelwano Ngobunyani Ngeseva Ephumela Ngaphandle"
#. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
msgid "Outgoing &Server"
msgstr "I&seva Ephumela Ngaphandle"
#. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
msgid "&User name"
msgstr "&Igama Lomsebenzisi"
#. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
msgid "&Password"
msgstr "&Igama lokugqithisa"
#. Translators: popup dialog heading
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
msgid "Mail downloading"
msgstr "Ukuthula umthwalo wemeyile"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
msgid "Server"
msgstr "Iseva"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
msgid "Protocol"
msgstr "Inkqubo"
#. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
msgid "User"
msgstr "Umsebenzisi"
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
msgid "De&lete"
msgstr "Ci&ma"
#. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
msgid "Incoming mail redirection"
msgstr "Ukujikwa kwentsingiselo yemeyile efikayo"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
msgid "&Alias"
msgstr "&Igama elisisiqhulo"
#. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
msgid "&Destinations"
msgstr "&Iindawo ekusingiswe kuzo"
#. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
msgid "The alias format is incorrect."
msgstr "Ucwangciso lwegama elisisiqhulo alichanekanga."
#. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
msgid "The destinations for this alias are already defined."
msgstr "Iindawo ekusingiswe kuzo zeli gama elisisiqhulo sezichaziwe."
#. Translators: dialog caption
#. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
msgid "Aliases"
msgstr "Amagama eziqhulo"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
msgid "Alias"
msgstr "Igama elisisiqhulo"
#. Translators: table column headings
#. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
msgid "Destinations"
msgstr "Iindawo ekusingiswe kuzo"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
msgid "Virtual domains"
msgstr "Imimandla yolawulo yenene"
#. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
msgid "Mail configuration"
msgstr "Ubumbeko lwemeyile"
#. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
msgid "Initializing..."
msgstr "Kuyandululwa..."
@@ -884,12 +889,12 @@
msgstr "Ukuya Kwiseva ye-Cyrus IMAP"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr "Kuza kuhlohlwa i-AmaViS, isifoti seskena sevayirasi.\n"
#. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
msgid ""
"AMaViS needs a virus scanner such as ClamAV\n"
"to do the actual scanning, but ClamAV was not found.\n"
@@ -900,58 +905,58 @@
" Yenza ubumbeko lweskena ngokwenza ngesandla."
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr "Umlandimeyile, umsebenzi wokuthula umthwalo wemeyile, uza kuhlohlwa.\n"
#. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
#, fuzzy
#| msgid "Cyrus-imapd, an IMAP server, will be installed.\n"
msgid "Dovecot IMAP server, will be installed.\n"
msgstr "i-Cyrus-imapd, iseva ye-IMAP, iza kuhlohlwa.\n"
#. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
msgid "Initializing mail configuration"
msgstr "Kundululwa ubumbeko lwemeyile"
#. Translators: progress label
#. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
msgid "Determining Mail Transport Agent (MTA)"
msgstr "Kuqinisekiswa Umthunywa Wothutho Lwemeyile (MTA)"
#. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
msgid "Reading general settings"
msgstr "Kufundwa imimiselo jikelele"
#. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
msgid "Reading masquerading settings"
msgstr "Kufundwa imimiselo eyenza nto yimbi"
#. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
msgid "Reading downloading settings"
msgstr "Kufundwa imimiselo yokuthula umthwalo"
#. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
msgid "Reading alias tables"
msgstr "Kufundwa iitheyibhile zamagama eziqhulo"
#. Translators: progress label
#. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
msgid "Reading authentication settings..."
msgstr "Kufundwa imimiselo yongqinelwano ngobunyani..."
#. Translators: error message,
#. %1 is a file name,
#. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
#, fuzzy
msgid ""
"Error reading file %1. The file must have\n"
@@ -963,18 +968,18 @@
" %2"
#. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
msgid "Error writing the fetchmail configuration."
msgstr "Ubumbeko lwesilandi-meyile lokubhala imposiso."
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
msgid "Error writing file %1"
msgstr "Ifayili yokubhala imposiso %1"
#. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
#, fuzzy
#| msgid "Error running SuSEconfig."
msgid "Error running config.postfix"
@@ -983,147 +988,147 @@
#. Translators: error message
#. Translators: error message
#. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
msgid "Error starting service %1."
msgstr "Inkonzo yokuqalisa imposiso %1."
#. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
msgid "Writing general settings"
msgstr "Kubhalwa imimiselo jikelele"
#. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
msgid "Writing masquerading settings"
msgstr "Kubhalwa imimiselo yento yimbi"
#. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
msgid "Writing alias tables"
msgstr "Kubhalwa iitheyibhile zamagama eziqhulo"
#. Write them unconditionally, because it is now possible to
#. enter them also in the Permanent mode. Bug #17417.
#. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
msgid "Writing downloading settings"
msgstr "Kubhalwa imimiselo yokuthula umthwalo"
#. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
msgid "Writing authentication settings..."
msgstr "Kubhalwa imimiselo yongqinelwano ngobunyani..."
#. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
msgid "Finishing writing configuration files"
msgstr "Kugqityezelwa ukubhala iifayili zobumbeko"
#. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
#, fuzzy
#| msgid "Routing Configuration"
msgid "Running Config Postfix"
msgstr "Ubumbeko Lokhokelo-mgaqo"
#. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
msgid "Restarting services"
msgstr "Kuqaliswa iinkonzo kwakhona"
#. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
msgid "Saving mail configuration"
msgstr "Kugcinwa ubumbeko lwemeyile"
#. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
msgid "Other"
msgstr "Ezinye"
#. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
msgid "Permanent"
msgstr "Okusisigxina"
#. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
msgid "Dial-up"
msgstr "Gqobhozela ngonxibelelwano"
#. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
msgid "None"
msgstr "Akukho"
#. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
msgid "MTA"
msgstr "MTA"
#. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
msgid "Connection Type"
msgstr "Uhlobo lonxulumano"
#. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
msgid "Outgoing Mail Server"
msgstr "Iseva Yemeyile Ephumayo"
#. summary header; the "From: foo(a)bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
msgid "From Header"
msgstr "Ukusuka Kokungasentla Kwekhasi"
#. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
msgid "Local Domains"
msgstr "Imimandla Yolawulo Lwendawo Leyo"
#. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
msgid "Masquerade Other Domains"
msgstr "Yenza Nto Yimbi Ngeminye Imimandla Yolawulo"
#. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
msgid "Masquerade Users"
msgstr "Yenza Nto Yimbi Ngabasebenzisi"
#. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
msgid "Accept remote SMTP connections"
msgstr "Yamkela imidibaniso ye-SMTP emgama"
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
msgid "Yes"
msgstr "Ewe"
#. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
msgid "Use AMaViS"
msgstr "Sebenzisa i-AMaViS"
#. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
#, fuzzy
#| msgid "&Use NIS"
msgid "Use DKIM"
msgstr "&Sebenzisa i-NIS"
#. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
msgid "Fetchmail"
msgstr "Umlandimeyile"
#. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
msgid "Virtual Users"
msgstr "Abasebenzisi Benene"
#. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
msgid "Authentication"
msgstr "Ungqinelwano ngobunyani"
Modified: trunk/yast/xh/po/network.xh.po
===================================================================
--- trunk/yast/xh/po/network.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/network.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -240,7 +240,7 @@
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
msgid "Host Configuration Summary:"
msgstr "Isishwankathelo Sobumbeko Somamkeli:"
@@ -361,13 +361,13 @@
msgstr "Ukuhlohlwa kwamanqaku okukhulula umthwalo othotyiweyo kusilele."
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
msgid "Opening of Connection"
msgstr "Ukuvulwa Komdibaniso"
#. popup to inform user about the failure
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
msgid ""
"Connecting to the Internet failed. View\n"
"the logs for details.\n"
@@ -376,13 +376,13 @@
"izichongi zemposiso ngobucukubhede obufunayo.\n"
#. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
+#: src/clients/inst_do_net_test.rb:870
msgid "No URL for the release notes defined. Internet test cannot be performed."
msgstr ""
#. popup informing user about the failure to retrieve release notes
#. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
#, fuzzy
msgid ""
"Download of latest release notes failed due to server-side error. \n"
@@ -400,7 +400,7 @@
"cofa <b>Rhoxisa</b>.\n"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
#, fuzzy
msgid ""
"Download of latest release notes failed. View\n"
@@ -410,12 +410,12 @@
"izichongi zemposiso ngobucukubhede obufunayo.\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
msgid "Check for Patches"
msgstr "Qwalasela Izibhaxu"
#. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
msgid ""
"Check for latest updates failed. View\n"
"the logs for details.\n"
@@ -424,7 +424,7 @@
"izichongi zemposiso ngobucukubhede obufunayo.\n"
#. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
msgid "Closing of Connection"
msgstr "Ukuvalwa Komdibaniso"
@@ -517,7 +517,7 @@
#. 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
+#: src/clients/lan_auto.rb:108
#, fuzzy
msgid "Configuration Error: uninitialized interface."
msgstr "Imposiso Yobumbeko : isithuba somdibaniso asindululwanga!"
@@ -614,7 +614,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
msgid "Routing Configuration"
msgstr "Ubumbeko Lokhokelo-mgaqo"
@@ -713,7 +713,7 @@
msgstr "Indlela"
#. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
msgid "Netmask"
msgstr "Isintsu elilawulayo lothungelwano"
@@ -731,87 +731,87 @@
#. Handler for action "list"
#. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
msgid "No entry for destination '%1' in routing table"
msgstr ""
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
#, fuzzy
msgid "%s forwarding is enabled"
msgstr "I-IP Ithumela: imo yokusebenza"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
#, fuzzy
msgid "%s forwarding is disabled"
msgstr "Ulawulo lwe-infrard lwenziwe alwasebenza"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
#, fuzzy
msgid "Enabling %s forwarding..."
msgstr "Yenza Ukuthumela i-IP kusebenza"
#. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
#, fuzzy
msgid "Disabling %s forwarding..."
msgstr "Yenza Ukuthumela i-IP kusebenza"
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
#, fuzzy
msgid "IPv4 Forwarding:"
msgstr "I-IP Ithumela: imo yokusebenza"
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
#, fuzzy
msgid "IPv6 Forwarding:"
msgstr "I-IP Ithumela: imo yokusebenza"
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
#, fuzzy
msgid "IPv4 and IPv6 Forwarding:"
msgstr "I-IP Ithumela: imo yokusebenza"
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
#, fuzzy
msgid "At least destination and gateway IP addresses must be specified."
msgstr "Igama lecandelo malixelwe."
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
#, fuzzy
msgid "Adding '%1' destination to routing table ..."
msgstr "Kufakelwa iifayili kwitheyibhile..."
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
#, fuzzy
msgid "Destination IP address must be specified."
msgstr "Igama lecandelo malixelwe."
-#: src/clients/routing.rb:348
+#: src/clients/routing.rb:349
msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
msgstr ""
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
#, fuzzy
msgid "Updating '%1' destination in routing table ..."
msgstr "Kwenziwa uhlaziyo lweenguqulelo kwimenyu yomlayishi wokumisela inkqubo..."
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
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:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
msgid "Warning: no encryption is used."
msgstr "Isilumkiso: akukho ntsokotho lusetyenzisiweyo."
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
msgid "Change."
msgstr "Guqula."
@@ -912,72 +912,72 @@
msgstr "Ikhadi Lothungelwano Olungenangcingo lwe-USB"
#. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
msgid "Unknown Network Device"
msgstr "Isixhobo Sothungelwano Esingaziwa"
#. Modem status (%1 is device)
#. ISDN device status (%1 is device)
#. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
msgid "Configured as %1"
msgstr "Ibunjwe njenge %1"
#. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
msgid "Configured as %1 with provider %2"
msgstr "Yenziwe ubumbeko njenge%1 ngomboneleli%2 "
#. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
msgid "Configured as %1 with provider %2 (protocol %3)"
msgstr "Yenziwe ubumbeko njenge%1 ngomboneleli%2 (umthetho wokusebenza%3) "
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
#, fuzzy
msgid "Configured without address (NONE)"
msgstr "Yenziwe ubumbeko ngedilesi%1 "
#. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
#, fuzzy
msgid "Configured without an address"
msgstr "Yenziwe ubumbeko ngedilesi%1 "
#. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
msgid "Configured with address %1"
msgstr "Yenziwe ubumbeko ngedilesi%1 "
#. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
msgid "Configured with address %1 (remote %2)"
msgstr "Yenziwe ubumbeko ngedilesi%1 (olumgama%2)"
#. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
msgid "Configured with %1"
msgstr "Yenziwe ubumbeko nge%1 "
#. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
msgid "Configured as %1 with address %2"
msgstr "Yenziwe ubumbeko njenge%1 ngedilesi%2 "
#. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
msgid "Configured as %1 with address %2 (remote %3)"
msgstr "Yenziwe ubumbeko njenge%1 ngedilesi%2 (emgama%3)"
#. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
msgid "Configured as %1 with %2"
msgstr "Yenziwe ubumbeko njenge%1 nge%2 "
#. Abbreviation for "The interface is Managed by NetworkManager"
#. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
msgid "Managed"
msgstr "Elawulwayo"
@@ -1117,12 +1117,12 @@
msgstr "&Khetha Isichongi Semposiso:"
#. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
msgid "Additional Addresses"
msgstr "Iidilesi Ezifakelweyo"
#. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
#, fuzzy
#| msgid "IP Address"
msgid "IPv4 Address Label"
@@ -1130,16 +1130,16 @@
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr "Idilesi ye-IP"
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/lan/address.rb:108
+#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "Fake&la"
@@ -1148,8 +1148,8 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/lan/address.rb:110
+#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1159,176 +1159,176 @@
#. PushButton label
#. PushButton label
#. Pushbutton label
-#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/lan/address.rb:112
+#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
msgstr "Ci&ma"
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
msgid "&Name of Interface"
msgstr "&Igama Lesithuba Somdibaniso"
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
msgid "<p>TODO kind of vague!</p>"
msgstr "<p>i-TODO yinto engacacanga kakuhle!</p>"
#. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
#, fuzzy
msgid "Assign Interface to Firewall &Zone"
msgstr "Izithuba Zokudibana Komsebenzi Wothungelwano Kwiizowuni ze-Firewall:"
#. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
msgid "&Mandatory Interface"
msgstr "&Isithuba Somdibaniso Ekuvunyelwene Ngaso"
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
#: src/include/network/lan/hardware.rb:351
msgid "&Device Type"
msgstr "&Uhlobo Lwesixhobo"
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
#: src/include/network/lan/hardware.rb:337
msgid "&Configuration Name"
msgstr "&Igama Lobumbeko"
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
msgid "Tunnel owner"
msgstr ""
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
#, fuzzy
msgid "Tunnel group"
msgstr "Fakela iqela elitsha"
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
#, fuzzy
msgid "Bridged Devices"
msgstr "Izixhobo ze-Modem"
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
#, fuzzy
msgid "Real Interface for &VLAN"
msgstr "Izithuba Zomdibaniso ze-Firewall"
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
#, fuzzy
#| msgid "CHAN IDS"
msgid "VLAN ID"
msgstr "CHAN IDS"
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
#, fuzzy
#| msgid "Bond Slaves"
msgid "Bond Slaves and Order"
msgstr "Amakhoboka Esibophelelo"
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
#, fuzzy
#| msgid "&Up"
msgid "Up"
msgstr "&Phezulu"
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
#, fuzzy
#| msgid "&Down"
msgid "Down"
msgstr "&Phantsi"
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
#, fuzzy
msgid "Bond &Slaves"
msgstr "Amakhoboka Esibophelelo"
#. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
#, fuzzy
msgid "&Bond Driver Options"
msgstr "Izikhethwa Zezibophelelo Zomqhubi"
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
#, fuzzy
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr "<p>Khetha izikhethwa zomqhubi wesibophelelo, uze uzihlele ukuba uyafuna. </p>"
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr ""
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
msgid "Use iBFT Values"
msgstr ""
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
#, fuzzy
msgid "Dynamic Address"
msgstr "Idilesi ye-IP &Eguquguqukayo"
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
#, fuzzy
msgid "DHCP both version 4 and 6"
msgstr "Uguqulelo lwemveliso nokukhululwa kwayo"
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
#, fuzzy
msgid "DHCP version 4 only"
msgstr "Uguqulelo 2 lwe-LDAP"
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
#, fuzzy
msgid "DHCP version 6 only"
msgstr "Uguqulelo 2 lwe-LDAP"
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
#, fuzzy
msgid "Statically Assigned IP Address"
msgstr "Idilesi ye-IP Yendawo Leyo"
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
msgid "&IP Address"
msgstr "&Idilesi ye-IP"
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
msgid "&Subnet Mask"
msgstr "&Isigqumathelo Sothungelwano Olonganyelweyo"
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
msgid "&Hostname"
msgstr "&Igama likamamkeli"
#. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
msgid "R&emote IP Address"
msgstr "Idilesi ye-IP E&mgama"
#. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
msgid "The remote IP address is invalid."
msgstr "Idilesi ye-IP emgama ayisebenziseki."
#. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
msgid "&S/390"
msgstr "i-&S/390"
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1030
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1339,13 +1339,13 @@
" xa usazi ukuba ukuchongeka kunemposiso."
#. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1050
msgid "Configuration %1 already present."
msgstr "Ubumbeko %1 selukhona."
#. 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:1062
+#: src/include/network/lan/address.rb:1074
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1359,23 +1359,23 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1094
#, fuzzy
msgid "No valid IP address."
msgstr "Idilesi ye-IP yesixhobo"
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1101
#, fuzzy
msgid "No valid netmask or prefix length."
msgstr "Faka igama lomsebenzisi elisebenzayo."
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1109
#, fuzzy
msgid "Invalid hostname."
msgstr "Faka igama lomsebenzisi elisebenzayo."
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1116
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1385,7 +1385,7 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1134
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1395,58 +1395,58 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1187
msgid "&General"
msgstr "&Jikelele"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1198
#, fuzzy
msgid "Device Activation"
msgstr "&Isixhobo Sokwenza ingasebenzi"
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1202
#, fuzzy
msgid "Firewall Zone"
msgstr "&Izowuni ye-Firewall"
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1207
#, fuzzy
msgid "Maximum Transfer Unit (MTU)"
msgstr "Mail transfer agent"
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1217
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>Yenza ubumbeko lwemimiselo yekhadi yomsebenzi wothungelwano onobucukubhede</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1284
msgid "&Address"
msgstr "&Idilesi"
#. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1287
msgid "<p>Configure your IP address.</p>"
msgstr "<p>Yenza ubumbeko lwedilesi ye-IP.</p>"
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1293
msgid "&Hardware"
msgstr "&Okungaphakathi eqokobheni lekhompyutha"
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1300
#, fuzzy
msgid "&Bond Slaves"
msgstr "Amakhoboka Esibophelelo"
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1314
msgid "&Wireless"
msgstr "&Akukho cingo"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1398
#, fuzzy
#| msgid "Swap &Priority"
msgid "Ifplugd Priority"
@@ -1454,7 +1454,7 @@
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1404
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"
@@ -1464,13 +1464,24 @@
msgstr ""
#. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1486
#, fuzzy
msgid "Network Card Setup"
msgstr "Ikhadi Lothungelwano"
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
#, fuzzy
msgid ""
"At least one selected device is already configured.\n"
@@ -1667,25 +1678,25 @@
#. @param [Hash{String => String}] options action options
#. Handler for action "edit"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
#, fuzzy
msgid "Impossible value for bootproto."
msgstr "Asiloxabiso linokwenzeka le-proto yomiselo lwenkqubo!"
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
#, fuzzy
msgid "Impossible value for startmode."
msgstr "Asiloxabiso linokwenzeka lemo yokuqalisa!"
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
msgid "For static configuration, the \"ip\" option is needed."
msgstr ""
#. Handler for action "delete"
#. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
msgid "The device was deleted."
msgstr "Isixhobo sacinywa."
@@ -1748,7 +1759,7 @@
#. Write settings dialog
#. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
#, fuzzy
msgid ""
"Firmware is needed. Install it from \n"
@@ -1761,7 +1772,7 @@
" Ukuhlohla inkqubo ye-firm, fakela u-Fakela-kwiCD kwiintsusa zokuhlohla zakho ze-YaST uze ubuyele \n"
"kule ngxoxo yobumbeko."
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
#, fuzzy
msgid ""
"The device needs a firmware to function properly. Usually, it can be\n"
@@ -1780,22 +1791,22 @@
#. - kernel modules (InstallKernel): before loaded
#. - wlan firmware: here, just because it is copied from modems
#. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
#, fuzzy
msgid "Installing firmware"
msgstr "Ihlohla i-firmware..."
-#: src/include/network/lan/complex.rb:233
+#: src/include/network/lan/complex.rb:232
msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
msgstr ""
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
#, fuzzy
msgid "An error occurred during firmware installation."
msgstr "Imposiso ivele ngexesha kuhlohlwa."
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -1810,12 +1821,12 @@
" isithuba somdibaniso asisayi kuphinda silawulwe ngu-MphathiWomsebenziWothungelwano.\n"
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:453
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr ""
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
msgid "Network Setup Method"
msgstr "Indlela Yokumisela Umsebenzi Wothungelwano"
@@ -1824,7 +1835,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:519
+#: src/include/network/lan/complex.rb:515
#, fuzzy
msgid "Network Settings"
msgstr "Funda imimiselo yomsebenzi wothungelwano"
@@ -2004,7 +2015,7 @@
#. Selection box label
#. Selection box title
#: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
msgid "&Network Card"
msgstr "&Ikhadi Yomsebenzi Wothungelwano"
@@ -2014,7 +2025,7 @@
msgstr "&Funa"
#. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
#, fuzzy
msgid ""
"Configuration name %1 already exists.\n"
@@ -2024,7 +2035,7 @@
"Khetha elahlukileyo."
#. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
msgid "S/390 Network Card Configuration"
msgstr "S/390 Ubumbeko Lwekhadi Yomsebenzi Wothungelwano"
@@ -2032,135 +2043,135 @@
#. Frame label
#. Frame label
#. Frame label
-#: 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
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
msgid "S/390 Device Settings"
msgstr "S/390 Imimiselo Yesixhobo"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
msgid "&Port Name"
msgstr "&Igama Lesiqhagamshelanisi"
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
#, fuzzy
msgid "Port Number"
msgstr "&Inombolo Yesiqhagamshelanisi"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
msgid "&Enable IPA Takeover"
msgstr "&Nika Isakhono Sokuthatha Kwindawo Eshiywe yi-IPA"
#. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
msgid "Enable &Layer 2 Support"
msgstr "Nika Isakhono &Kwinkxaso Yomaleko 2"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
msgid "Layer2 &MAC Address"
msgstr "Idilesi Yomaleko2 &MAC"
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
#, fuzzy
msgid "Read Channel"
msgstr "Isitishi"
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
#, fuzzy
msgid "Write Channel"
msgstr "&Bhala Iinguquko Ngoku"
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
#, fuzzy
msgid "Control Channel"
msgstr "Lawula ifayili eguqulweyo."
#. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
msgstr "<p>Ngenisa <b>Igama Lesiqhagamshelanisi</b> ukwenzela esi sithuba (liyabuvela ubukhulu boonobumba).</p>"
#. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:950
msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
msgstr "<p>Ngenisa naziphi ezifakelweyo <b>Izikhethwa</b> ukwenzela esi sithuba somdibaniso (esahlukaniswe ngezithuba).</p>"
-#: src/include/network/lan/hardware.rb:954
+#: src/include/network/lan/hardware.rb:953
msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
msgstr "<p>Khetha <b>Isakhono Ekuthathwe Apho Sishiywe Khona se-IPA</b> ukuba idilesi ethathwa apho ishiywe khona ye-IP inikwe isakhono ukwenzela esi sithuba somdibaniso.</p>"
-#: src/include/network/lan/hardware.rb:957
+#: src/include/network/lan/hardware.rb:956
msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>Khetha <b>uku-Nika Isakhono Kwinkxaso Yomaleko 2</b> ukuba le khadi yenziwe ubumbeko lwenkxaso yomaleko 2.</p>"
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:959
msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
msgstr "<p>Khetha <b>Idilesi Yomaleko 2 MAC</b> ukuba le khadi yenziwe ubumbeko lwenkxaso yomaleko 2.</p>"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
msgid "&Port Number"
msgstr "&Inombolo Yesiqhagamshelanisi"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
msgid "&LANCMD Time-Out"
msgstr "Ixesha Lokuphuma le-&LANCMD"
#. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
msgstr "<p>Khetha <b>Inombolo Yesiqhagamshelanisi</b> ukwenzela esi sithuba somdibaniso.</p>"
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
msgstr "<p>Xela <b>Ixesha Lokuphuma le-LANCMD</b> ukwenzela esi sithuba somdibaniso.</p>"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
msgid "Compatibility Mode"
msgstr "Imo Yongqinelwano"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
msgid "Extended Mode"
msgstr "Imo Yesolulo"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
msgid "CTC-Based tty (Linux to Linux Connections)"
msgstr "i-tty Esekwe kwi-CTC (Imidibaniso ye-Linux ukuya kweminye ye-Linux)"
#. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
msgid "Compatibility Mode with OS/390 and z/OS"
msgstr "Imo Yongqinelwano ene-OS/390 ne-z/OS"
#. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
msgid "&Protocol"
msgstr "&Umthetho wokusebenza"
#. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
msgstr "<p>Khetha <b>Iumthetho wokusebenza</b> ukwenzela esi sithuba somdibaniso.</p>"
#. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
msgid "&Peer Name"
msgstr "Igama &Leqabane"
#. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
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"
@@ -2168,8 +2179,7 @@
"<p>Ngenisa iqabane le-IUCV,\n"
"umzekelo, igama lomsebenzisi we-z/VM ekuza kudityaniswa kuyo (ivelana nobukhulu boonobumba).</p>\n"
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
#, fuzzy
msgid ""
"An error occurred while creating device.\n"
@@ -2178,7 +2188,7 @@
#. Manual network card configuration dialog
#. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
#, fuzzy
msgid "Hardware Dialog"
msgstr "Idata Engaphakathi kweqokobhe lekhompyutha"
@@ -2787,31 +2797,31 @@
" ezifumanekayo.</p>"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
#, fuzzy
#| msgid "IP Address"
msgid "IPv4 &Address Label"
msgstr "Idilesi ye-IP"
#. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
msgid "Net&mask"
msgstr "Isuntsu elilawula &uthungelwano"
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
msgid "Label is too long."
msgstr ""
#. Popup::Error text
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
msgid "The IP address is invalid."
msgstr "Idilesi ye-IP ayisebenziseki."
#. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
msgid "The subnet mask is invalid."
msgstr "Isigqumathelo sothungelwano olonganyelweyo asisebenziseki."
@@ -2992,130 +3002,130 @@
#. Wireless authentication modes:
#. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
#, fuzzy
msgid "No Encryption"
msgstr "&Uguqulelo oluntsonkothileyo"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
msgid "WEP - Open"
msgstr ""
#. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
#, fuzzy
msgid "WEP - Shared Key"
msgstr "Iqhosha Elabiwayo"
#. ComboBox item
#. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
msgid "WPA-PSK (WPA version 1 or 2)"
msgstr ""
#. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
msgid "WPA-EAP (WPA version 1 or 2)"
msgstr ""
#. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
msgid "Wireless Network Card Configuration"
msgstr "Ubumbeko Lwekhadi Yomsebenzi Wothungelwano Ongenazingcingo"
#. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
msgid "Wireless Device Settings"
msgstr "Imimiselo Yezixhobo Ezingenangcingo"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
msgid "O&perating Mode"
msgstr "Imo Yokwenza Um&sebenzi"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
msgid "Ad-Hoc"
msgstr "Ngokwenjongo ethile"
#. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
msgid "Master"
msgstr "Ingcali"
#. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
msgid "Ne&twork Name (ESSID)"
msgstr "Igama Lomsebenzi&Wothungelwano (ESSID)"
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
#, fuzzy
msgid "Scan Network"
msgstr "Umsebenzi Wothungelwano Wentsusa"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
msgid "&Authentication Mode"
msgstr "&Imo Yongqinelwano Ngobunyani"
#. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
msgid "&Encryption Key"
msgstr "&Iqhosha Loguqulelo Oluntsonkothileyo"
#. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
msgid "E&xpert Settings"
msgstr "Imimiselo Yobu&ngcaphephe"
#. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
msgid "&WEP Keys"
msgstr "&Amaqhosha e-WEP"
#. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:558
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr "Imo yokusebenza ngongqinelwano lwe-WPA inokubakho kuphela kwimo yokwenza umsebenzi elawulwayo."
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:569
msgid "Specify the network name for this mode."
msgstr "Xela igama lomsebenzi wothungelwano ukwenzela le mo yokusebenza."
#. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:576
msgid "The network name must be shorter than 32 characters."
msgstr "Igama lomsebenzi wothungelwano mayibe mfutshane kuneempawu ezithatha izithuba ezingama-32."
#. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:596
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "Isigamasokugqithisa kufuneka sibe neempawu ezithatha izithuba eziphakathi kwesi-8 nama-63 (kuyaqukaniswa)."
#. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:607
msgid "The key must have %1 hexadecimal digits."
msgstr "Iqhosha malibe namanani edesimali ezithandathu ze-%1."
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:619
+#: src/include/network/lan/wireless.rb:941
msgid "The encryption key is invalid."
msgstr "Iqhosha loguqulelo oluntsonkothileyo alisebenziseki."
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:627
msgid "The encryption key must be specified for this authentication mode."
msgstr "Iqhosha loguqulelo oluntsonkothileyo malixelwe ukwenzela imo yomsebenzi wongqinelwano ngobunyani."
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:634
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3215,27 +3225,27 @@
msgstr "Imo &Yokusebenza ye-EAP"
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
msgid "Enter Encryption Key"
msgstr "Ngenisa Iqhosha Loguqulelo Oluntsonkothileyo"
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
msgid "&Key"
msgstr "&Iqhosha"
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
msgid "Help"
msgstr "Uncedo"
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
msgid "Wireless Keys"
msgstr "Amaqhosha Angenazingcingo"
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
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"
@@ -3249,7 +3259,7 @@
" elinye kuphela.</p>"
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
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"
@@ -3264,50 +3274,50 @@
" ixabiso ukufikelela kuma-64.</p>"
#. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
msgid "WEP Keys"
msgstr "Amaqhosha e-WEP"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
msgid "&Key Length"
msgstr "&Ubude Beqhosha"
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
msgid "No."
msgstr "Hayi."
#. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
msgid "Key"
msgstr "Iqhosha"
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
msgid "Default"
msgstr "Into ehlala ikhona"
#. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
msgid "&Set as Default"
msgstr "&Misela njengeNto ehlala ikhona"
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1214
msgid "Choose a Certificate"
msgstr "Khetha Isatifikethi"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1257
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:1283
+#: src/include/network/lan/wireless.rb:1285
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
@@ -3316,47 +3326,47 @@
"okanye isatifikethi somxumi."
#. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1331
msgid "WPA-EAP"
msgstr "i-WPA-EAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1353
msgid "Any"
msgstr "Nakuphi"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1357
msgid "MD5"
msgstr "i-MD5"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1359
msgid "GTC"
msgstr "i-GTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1361
msgid "CHAP"
msgstr "i-CHAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1363
msgid "PAP"
msgstr "i-PAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv1"
msgstr "i-MSCHAPv1"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1369
msgid "MSCHAPv2"
msgstr "i-MSCHAPv2"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1392
msgid "WPA-EAP Details"
msgstr "Ubucukubhede be-WPA-EAP"
@@ -3371,25 +3381,37 @@
#. RadioButton label
#: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
msgstr "&Vumela Ulawulo Olumgama"
#. RadioButton label
#: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "&Vumela Ulawulo Olumgama"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
msgid "&Do Not Allow Remote Administration"
msgstr "&Ungaluvumeli Ulawulo Olumgama"
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
#, fuzzy
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
"administer this machine remotely from another machine. Use a VNC\n"
"client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
msgstr ""
"<p>Ukuba olu phawu lwenziwe alwasebenza, \n"
"ungalawula lo matshini mgama ukusuka komnye umatshini. Sebenzisa umxumi\n"
@@ -3398,17 +3420,17 @@
" Le ndlela mgama yolawulo ikhuselekile kunokusebenzisa i-SSH.</p>\n"
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
msgid "Remote Administration Settings"
msgstr "Imimiselo Yolawulo Olumgama"
#. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
msgid "These packages need to be installed:"
msgstr "Le mibekelelo kufuneka ihlohliwe:"
#. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3420,111 +3442,61 @@
" \n"
" Zama kwakhona?\n"
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
msgid "Unknown"
msgstr "Akwaziwa"
-#. Popup headline
-#: src/include/network/routines.rb:279
-msgid "Configuration Successfully Saved"
-msgstr "Ubumbeko Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "Ubumbeko lwe-DNS Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "Ubumbeko lwe-DSL Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "Ubumbeko Lomamkeli Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "Ubumbeko lwe-ISDN Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "Ubumbeko Lwekhadi Lothungelwano Lugcinwe Ngempumelelo "
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "Ubumbeko lwe-Modem Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "Ubumbeko Lelungelo lokumela Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "Ubumbeko Lomboneleli Lugcinwe Ngempumelelo"
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "Ubumbeko Lokholeko-gaqo Lugcinwe Ngempumelelo"
-
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "Yenza ubumbeko lweposi ngoku?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "Qhuba ubumbeko luka%1?"
-
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:829
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:1064
+#: src/include/network/routines.rb:889
msgid "Network Cards"
msgstr "Ikhadi Yomsebenzi Wothungelwano"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:893
msgid "Modems"
msgstr "ii-Modems"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:897
msgid "ISDN Cards"
msgstr "Amakhadi e-ISDN"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:901
msgid "DSL Devices"
msgstr "Izixhobo ze-DSL"
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:906
msgid "All Network Devices"
msgstr "Zonke Izixhobo Zothungelwano "
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:387
msgid "The hostname is invalid."
msgstr "Igama lomamkeli elifakiweyo alisebenzi."
@@ -3601,8 +3573,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
msgid "Hostname and Domain Name"
msgstr "Igama lomamkeli kunye neGama le-Domain"
@@ -3630,28 +3602,28 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
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:520
+#: src/include/network/services/dns.rb:513
msgid "The search list can have at most %1 domains."
msgstr "Uluhlu lokufuna linganee-domain%1 ezininzi."
#. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
msgid "The search list can have at most %1 characters."
msgstr "Uluhlu lokufuna linganeempawu%1 ezininzi."
#. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
msgid "The search domain '%1' is invalid."
msgstr "I-domain yokufuna '%1' alisebenzi."
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
msgid "Hostname and Name Server Configuration"
msgstr "Igama lomamkeli kunye noBumbeko lokuThiya iSeva igama"
@@ -3685,27 +3657,27 @@
"<b>abanokukhethwa</b>, abahlolwe ngezithuba.</p>\n"
#. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
msgid "Current Hosts"
msgstr "Abamkeli Bangoku"
#. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
msgid "Hostnames"
msgstr "Amagama Abamkeli"
#. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
msgid "Host Aliases"
msgstr "Amanye amagama Abamkeli"
#. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:340
msgid "Hos&t Aliases"
msgstr "Ama&nye amagama Abamkeli"
#. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:403
msgid "Alias name \"%1\" is invalid."
msgstr "Igama Elilelinye %1 alisebenzi."
@@ -3749,43 +3721,43 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
msgid "&Destination"
msgstr "&Indawo ekuthunyelwa kuyo into"
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:171
#, fuzzy
#| msgid "Net&mask"
msgid "Ge&nmask"
msgstr "Isuntsu elilawula &uthungelwano"
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:180
msgid "&Gateway"
msgstr "&Indlela"
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:188
#, fuzzy
msgid "De&vice"
msgstr "Isixhobo"
#. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:247
msgid "Destination is invalid."
msgstr "Indawo ekuthunyelwa kuyo into ayisebenzi."
#. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:255
msgid "Gateway IP address is invalid."
msgstr "Indlela yedilesi ye-IP ayisebenziseki."
#. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:263
msgid "Subnetmask is invalid."
msgstr "Isiqhubuthelo se-subnet asisebenzi."
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:422
msgid "The default gateway is invalid."
msgstr "Indlela ehlala ikhona ayisebenzi."
@@ -4041,37 +4013,37 @@
"Be sure it's running and if not, start it manually."
msgstr ""
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
#, fuzzy
msgid "General Network Settings"
msgstr "Imimiselo Jikelele"
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
#, fuzzy
msgid "IPv6 Protocol Settings"
msgstr "Iinkqubo ze-IP"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
msgid "Enable IPv6"
msgstr "Yenza i-IPv6 ukuba isebenze"
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
msgid "Unknown device"
msgstr "Asaziwa isixhobo"
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
msgid "DHCP address"
msgstr "Idilesi ye-DHCP"
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
msgid "No IP address assigned"
msgstr "Akukho dilesi yabelweyo ye-IP "
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
#, fuzzy
msgid ""
"%1 \n"
@@ -4079,12 +4051,12 @@
msgstr "Okulandelayo %1: %2 -- %3"
#. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
msgid "&Change Device"
msgstr "&Isixhobo Soguquko"
#. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
msgid "Network Device Select"
msgstr "Ukukhethwa Kwesixhobo Somsebenzi Wothungelwano"
@@ -4093,7 +4065,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
#, fuzzy
#| msgid "Unconfigured"
msgid "configured"
@@ -4152,7 +4124,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
msgid "Update configuration"
msgstr "Ubumbeko lohlaziyo"
@@ -4178,7 +4150,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
msgid "Updating configuration..."
msgstr "Kuhlaziywa ubumbeko..."
@@ -4191,364 +4163,357 @@
msgstr "Ifunda /etc/modprobe.conf..."
#. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
msgid "Hostname: Set by DHCP"
msgstr "Igama likamamkeli: Misela nge-DHCP"
#. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
msgid "Hostname: %1"
msgstr "Igama likamamkeli: %1"
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
msgid "Hostname will not be written to /etc/hosts"
msgstr "Igama likamamkeli aliyikubhalwa kwi /etc/ abamkeli"
#. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
msgid "Name Servers: %1"
msgstr "Amagama Eeseva: %1"
#. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
msgid "Search List: %1"
msgstr "Uluhlu lokuFuna: %1"
#. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
#, fuzzy
msgid "Update /etc/hosts"
msgstr "Imimiselo Yohlaziyo"
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
#, fuzzy
msgid "Saving Hostname Configuration"
msgstr "Igcina Ubumbeko"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
#, fuzzy
msgid "Updating /etc/hosts ..."
msgstr "Ukuhlaziya imibekelo..."
#. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:276
msgid "Initializing Network Configuration"
msgstr "Indulula uBumbeko Lothungelwano"
#. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:289
msgid "Detect network devices"
msgstr "Fumana izixhobo zothungelwano"
#. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:291
msgid "Read driver information"
msgstr "Funda ulwazi lomqhubi"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:293
msgid "Read device configuration"
msgstr "Funda ubumbeko lwesixhobo"
#. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:295
msgid "Read network configuration"
msgstr "Funda ubumbeko lomsebenzi wothungelwano"
#. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:297
msgid "Read firewall settings"
msgstr "Funda imimiselo yefirewall"
#. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:299
msgid "Read hostname and DNS configuration"
msgstr "Funda igama lomamkeli kunye nobumbeko lwe-DNS"
#. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:301
msgid "Read installation information"
msgstr "Funda ulwazi lokuhlohla"
#. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:303
msgid "Read routing configuration"
msgstr "Funda ubumbeko lokhokelo-mgaqo"
#. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:305
msgid "Detect current status"
msgstr "Fumana isimo sangoku"
#. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:319
#, fuzzy
msgid "Detecting ndiswrapper..."
msgstr "Ifumana okungaphakathi kwiqokobhe lekhompyutha..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:338
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
"Do you want to modprobe ndiswrapper?\n"
msgstr ""
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:346
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
msgstr ""
#. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:360
msgid "Detecting network devices..."
msgstr "Ifumana izixhobo zothungelwano..."
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:368
msgid "Reading device configuration..."
msgstr "Ifunda ubumbeko lwesixhobo..."
#. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:374
msgid "Reading network configuration..."
msgstr "Ifunda ubumbeko lomsebenzi wothungelwano..."
#. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:383
msgid "Reading firewall settings..."
msgstr "Kufundwa imimiselo yodonga lomlilo..."
#. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:391
msgid "Reading hostname and DNS configuration..."
msgstr "Ifunda igama lomamkeli kunye nobumbeko lwe-DNS..."
#. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:398
msgid "Reading installation information..."
msgstr "Ifunda ulwazi lokuhlohla..."
#. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:404
msgid "Reading routing configuration..."
msgstr "Ifunda ubumbeko lokhokelo-mgaqo..."
#. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:410
msgid "Detecting current status..."
msgstr "Ifumana isimo sangoku..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
msgid "Finished"
msgstr "Kugqityiwe"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:441
#, fuzzy
#| msgid "To apply changes a reboot is necessary."
msgid "To apply this change, a reboot is needed."
msgstr "Ukusebenzisa iinguqu, ukuqalisa ngokutsha kubalulekile."
#. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:509
msgid "Saving Network Configuration"
msgstr "Igcina ubumbeko lomsebenzi wothungelwano"
#. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:516
msgid "Write drivers information"
msgstr "Bhala ulwazi labaqhubi"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:518
msgid "Write device configuration"
msgstr "Bhala ubumbeko lwesixhobo"
#. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:520
msgid "Write network configuration"
msgstr "Bhala ubumbeko lothungelwano"
#. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:522
msgid "Write routing configuration"
msgstr "Bhala ulwazi lokhokelo-mgaqo"
#. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:524
msgid "Write hostname and DNS configuration"
msgstr "Bhala igama lomamkeli kunye nobumbeko lwe-DNS"
#. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:526
msgid "Set up network services"
msgstr "Misela iinkonzo zothungelwano"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr "Bhala imimiselo ye-Firewall"
#. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:534
msgid "Activate network services"
msgstr "Yenza iinkonzo zothungelwano zisebenze"
#. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:550
msgid "Writing /etc/modprobe.conf..."
msgstr "Ibhala /etc/modprobe.conf..."
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:555
msgid "Writing device configuration..."
msgstr "Ibhala ubumbeko lwesixhobo..."
#. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:561
msgid "Writing network configuration..."
msgstr "Ibhala ubumbeko lothungelwano..."
#. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:567
msgid "Writing routing configuration..."
msgstr "Ibhala ubumbeko lokhokelo-mgaqo..."
#. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:575
msgid "Writing hostname and DNS configuration..."
msgstr "Ibhala igama lomamkeli kunye nobumbeko lwe-DNS..."
#. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:588
msgid "Setting up network services..."
msgstr "Imisela iinkonzo zothungelwano..."
#. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr "Bhala imimiselo ye-Firewall..."
#. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:606
msgid "Activating network services..."
msgstr "Yenza iinkonzo zothungelwano zisebenze..."
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:642
#, fuzzy
msgid "No network running"
msgstr "Funda imimiselo yomsebenzi wothungelwano"
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: 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:782
+#: src/modules/Lan.rb:759
msgid "Network Mode"
msgstr "Imo Yokusebenza Kumsebenzi Wothungelwano"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:764
#, fuzzy
msgid "Interfaces controlled by NetworkManager"
msgstr "&Kulawulwa Ngabasebenzi ngu-MlawuliWomsebenziWothungelwano"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:766
msgid "Disable NetworkManager"
msgstr "Yenza Umlawuli Wothungelwano Angasebenzi"
#. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:770
#, fuzzy
msgid "Traditional network setup with NetControl - ifup"
msgstr "&Indlela Yesiqhelo nge-ifup"
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:773
msgid "Enable NetworkManager"
msgstr "Yenza Umlawuli Wothungelwano Asebenze"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:779
#, fuzzy
msgid "Support for IPv6 protocol is enabled"
msgstr "Kwenziwe Inkxaso ka-IPv6 Yomthetho wokusebenza ukuba usebenze"
#. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:781
msgid "Disable IPv6"
msgstr "Yenza i-IPv6 ingasebenzi"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:785
#, fuzzy
msgid "Support for IPv6 protocol is disabled"
msgstr "Kwenziwe Inkxaso ka-IPv6 Yomthetho wokusebenza ukuba usebenze"
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:198
#, fuzzy
msgid "connected"
msgstr "(ayiqhagamshelwanga)"
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:199
msgid "datagram"
msgstr ""
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
msgid "Started automatically at boot"
msgstr "Iqalise ngokuzenzekelayo kumiselo lwenkqubo"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1280
msgid "Started automatically on cable connection"
msgstr "Iqalise ngokuzenzekelayo kuqhagamshelwano locingo"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1284
msgid "Managed by NetworkManager"
msgstr "Ilawulwe nguMlawuli Wothungelwano"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1288
msgid "Will not be started at all"
msgstr "Ayinakuqaliswa konke konke"
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1294
msgid "Started manually"
msgstr "Iqaliswe ngesandla"
#. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1306
#, fuzzy
msgid "IP address assigned using"
msgstr "Idilesi ye-IP eyabelweyo isebenzisa i-DHCP"
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1310
#, fuzzy
msgid "IP address: %s/%s"
msgstr "Idilesi ye-IPv4"
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1313
#, fuzzy
#| msgid "IP address: %1, subnet mask %2"
msgid "IP address: %s, subnet mask %s"
@@ -4556,47 +4521,47 @@
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1337
msgid "Not configured"
msgstr "Ayibumbekanga"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
#, fuzzy
#| msgid "Device Name: %1"
msgid "Device Name: %s"
msgstr "Igama Lesixhobo: %1"
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1380
#, fuzzy
#| msgid "Bond slaves"
msgid "Bonding slaves"
msgstr "Isivumelwano Samakhoboka"
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1394
msgid "enslaved in %s"
msgstr ""
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1395
#, fuzzy
#| msgid "&Ending Banner"
msgid "Bonding master"
msgstr "&Iphelisa Ibhanile"
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1409
#, fuzzy
msgid "Not connected"
msgstr "(ayiqhagamshelwanga)"
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1410
msgid "No hwinfo"
msgstr ""
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1427
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 ""
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1433
#, fuzzy
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
@@ -4606,18 +4571,18 @@
"<b>Bumba Amakhadi Esandi</b> ukuqalisa imodyuli yobumbeko lwesandi.\n"
" </P>"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
#, fuzzy
msgid "Needed firmware"
msgstr "Kufunwa Ulwazi"
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
msgid "unknown"
msgstr "akwaziwa"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:158
#, fuzzy
#| msgid "This package is not installed and it will not be installed."
msgid ""
@@ -4626,42 +4591,47 @@
msgstr "Lo mbekelelo awuhlohlwanga kwaye awusayi kuhlohlwa."
#. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:203
#, fuzzy
msgid "Configure display manager"
msgstr "Yenza ubumbeko lweposi ngoku?"
#. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:208
#, fuzzy
msgid "Restart the services"
msgstr "Phinda uqalise inkonzo"
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:211
#, fuzzy
msgid "Saving Remote Administration Configuration"
msgstr "Kugcinwa Ubumbeko Lomqalisi we-iSCSI"
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:220
#, fuzzy
msgid "Configuring display manager..."
msgstr "Kwenziwa ubumbeko lolwimi..."
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:224
#, fuzzy
msgid "Restarting the service..."
msgstr "Kuqaliswa inkonzo kwakhona..."
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#. Install required packages
+#: src/modules/Remote.rb:261
#, fuzzy
#| msgid "Starting the 'lirc' service failed."
msgid "Enabling service %{service} has failed"
msgstr "Ukuqalisa inkonzo 'ye-lirc' kusilele."
+#: src/modules/Remote.rb:267
+#, fuzzy
+#| msgid "Starting the 'lirc' service failed."
+msgid "Disabling service %{service} has failed"
+msgstr "Ukuqalisa inkonzo 'ye-lirc' kusilele."
+
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:295
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4669,33 +4639,33 @@
msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is enabled."
msgstr "Ulawulo olumgama lwenziwe lwasebenza."
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
msgid "Remote administration is disabled."
msgstr "Ulawulo olumgama lwenziwe alwasebenza."
#. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
#, fuzzy
msgid "Write IP forwarding settings"
msgstr "Kubhalwa imimiselo yokuthula umthwalo"
#. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
#, fuzzy
msgid "Write routing settings"
msgstr "Bhala imimiselo"
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
#, fuzzy
msgid "Saving Routing Configuration"
msgstr "Ubumbeko Lokhokelo-mgaqo"
#. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
#, fuzzy
msgid "Writing IP forwarding settings..."
msgstr "Bhala imimiselo ye-Firewall..."
@@ -4705,26 +4675,26 @@
#. 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:281
+#: src/modules/Routing.rb:284
#, fuzzy
msgid "Writing routing settings..."
msgstr "Kubhalwa imimiselo..."
#. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
#, fuzzy
#| msgid "Gateway: %1"
msgid "Gateway: %s"
msgstr "Indlela: %1"
#. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
#, fuzzy
msgid "IP Forwarding for IPv4: %s"
msgstr "I-IP Ithumela: imo yokusebenza"
#. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
#, fuzzy
msgid "IP Forwarding for IPv6: %s"
msgstr "I-IP Ithumela: imo yokusebenza"
@@ -4745,6 +4715,42 @@
msgid "(Unprotected)"
msgstr "(Ayikhuselekanga)"
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "Ubumbeko Lugcinwe Ngempumelelo"
+
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "Ubumbeko lwe-DNS Lugcinwe Ngempumelelo"
+
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "Ubumbeko lwe-DSL Lugcinwe Ngempumelelo"
+
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "Ubumbeko Lomamkeli Lugcinwe Ngempumelelo"
+
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "Ubumbeko lwe-ISDN Lugcinwe Ngempumelelo"
+
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "Ubumbeko Lwekhadi Lothungelwano Lugcinwe Ngempumelelo "
+
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "Ubumbeko lwe-Modem Lugcinwe Ngempumelelo"
+
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "Ubumbeko Lelungelo lokumela Lugcinwe Ngempumelelo"
+
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "Ubumbeko Lomboneleli Lugcinwe Ngempumelelo"
+
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "Ubumbeko Lokholeko-gaqo Lugcinwe Ngempumelelo"
+
+#~ msgid "Configure mail now?"
+#~ msgstr "Yenza ubumbeko lweposi ngoku?"
+
+#~ msgid "Run configuration of %1?"
+#~ msgstr "Qhuba ubumbeko luka%1?"
+
#~ msgid "Device boot protocol"
#~ msgstr "Inkqubo yomiselo lwenkqubo ngesixhobo"
Modified: trunk/yast/xh/po/nfs.xh.po
===================================================================
--- trunk/yast/xh/po/nfs.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/nfs.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: nfs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -135,7 +135,7 @@
" 0-9 ,A-Z, a-z, amachaphaza, ne _."
#. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
msgid ""
"fstab already contains an entry\n"
"with mount point '%1'."
@@ -144,7 +144,7 @@
"ngendawo yesakhelo '%1'."
#. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
msgid ""
"The path entered is invalid.\n"
"It must be shorter than 70 characters\n"
@@ -385,12 +385,12 @@
msgstr "Ubumbeko loMxumi we-NFS"
#. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
msgid "Unable to create directory '%1'."
msgstr "Ayikwazi kudala uvimba weefayili '%1'."
#. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
msgid ""
"Unable to write to /etc/fstab.\n"
"No changes will be made to the\n"
@@ -401,52 +401,52 @@
" bumbeko lomxumi we-NFS.\n"
#. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
msgid "Writing NFS Configuration"
msgstr "Ibhala Ubumbeko lwe-NFS"
#. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
msgid "Stop services"
msgstr "Yekisa iinkonzo"
#. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
msgid "Start services"
msgstr "Kuqaliswa iinkonzo"
#. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
msgid "Stopping services..."
msgstr "Iyekisa iinkonzo..."
#. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
msgid "Starting services..."
msgstr "Iqalisa iinkonzo..."
#. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
msgid "Finished"
msgstr "Kugqityiwe"
#. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
msgid "Writing NFS client settings. Please wait..."
msgstr "Ibhala izakhelo zomxumi we-NFS. Nceda Linda…"
#. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr "Ayikwazi kugxumeka amangeniso e-NFS kwi/etc.fstab."
#. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
msgid "NFS Entries"
msgstr "Amangeniso e-NFS"
#. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
msgid "%1 entries configured"
msgstr "%1 amangeniso abumbekileyo"
Modified: trunk/yast/xh/po/nis.xh.po
===================================================================
--- trunk/yast/xh/po/nis.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/nis.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -257,9 +257,10 @@
msgstr "&Iidilesi ze-NIS yeeseva"
#. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "Isa&saza"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "&Ukusasaza"
#. pushbutton label, find nis servers
#. Shortcut must not conflict with Finish and Next (#29960)
@@ -374,11 +375,6 @@
msgstr "&Iiseva (ezahlukaniswe ngezithuba okanye iikoma)"
#. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "&Ukusasaza"
-
-#. checkbox label
#: src/include/nis/ui.rb:859
msgid "&SLP"
msgstr "&I-SLP"
@@ -587,6 +583,9 @@
msgid "NIS server not found."
msgstr "Iseva ye-NIS ayifunyanwanga."
+#~ msgid "Br&oadcast"
+#~ msgstr "Isa&saza"
+
#~ msgid "<p>If you are using <b>DHCP</b> and the server provides the NIS domain name or servers, you can enable their use here. DHCP itself can be set up in the network module.</p>"
#~ msgstr "<p>Ukuba usebenzisa <b>i-DHCP</b> kunye neseva ibonelela igama lommandla we-NIS okanye iiseva, ungazenza zisebenze apha. I-DHCP ngokwayo ingamiselwa kwimodyuli yothungelwano.</p>"
Modified: trunk/yast/xh/po/ntp-client.xh.po
===================================================================
--- trunk/yast/xh/po/ntp-client.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/ntp-client.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: ntp-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -21,7 +21,7 @@
msgstr "Ibhala Ubumbeko lwe-NFS..."
#. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
msgstr ""
@@ -30,68 +30,68 @@
msgstr ""
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
#, fuzzy
msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
msgstr "<p>Sebenzisa <b>Okulandelayo</b> ukuqhubeka ngolwakhelo.</p>"
#. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
msgstr ""
#. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
#, fuzzy
msgid "Invalid NTP server hostname %1"
msgstr "Faka igama leseva elisebenzisekayo."
#. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
#, fuzzy
msgid "&NTP Server Address"
msgstr "Idilesi Yeseva"
#. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
#, fuzzy
#| msgid "Restart NTP daemon"
msgid "&Run NTP as daemon"
msgstr "Phinda uqalise i-daemon ye-NTP"
#. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
#, fuzzy
msgid "&Save NTP Configuration"
msgstr "Ubumbeko lwe-NTP"
#. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
#, fuzzy
msgid "S&ynchronize now"
msgstr "&Hambisa Ngesingqisho Esifanayo Amagama Okugqithisa"
#. push button label
#. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
msgid "&Configure..."
msgstr "&Yenza ubumbeko_"
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
msgstr ""
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
#, fuzzy
msgid "Synchronizing with NTP server..."
msgstr "Kuhanjiswa ngesingqisho esifanayo nemisebenzi ye-ZEN"
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
#, fuzzy
#| msgid "Connection to the LDAP server cannot be established."
msgid "Connection to selected NTP server failed."
@@ -99,7 +99,7 @@
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
msgid ""
"Test query to server '%1' failed.\n"
"If server is not yet accessible or network is not configured\n"
@@ -304,273 +304,267 @@
msgstr "Abamkeli be-JJY"
#. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
msgid "NTP client configuration module."
msgstr "Imodyuli yobumbeko lomxumi we-NTP."
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
msgid "Print the status of the NTP daemon"
msgstr "Shicilela isimo se-daemon ye-NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
msgid "Print all configured synchronization relationships"
msgstr "Shicilela zonke iziganeko zobudlelwana ezenzelwe ubumbeko lwesingqisho esihambelanayo"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
msgid "Enable the NTP daemon"
msgstr "Nika isakhono kwi-daemon ye-NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
msgid "Disable the NTP daemon"
msgstr "Susa isakhono kwi-daemon ye-NTP"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
msgid "Add new synchronization relationship"
msgstr "Fakela ubudlelwana obutsha besingqisho esihambelanayo"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
msgid "Edit existing synchronization relationship"
msgstr "Hlela ubudlelwana osebukho besingqisho esihambelanayo"
#. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
msgid "Delete a synchronization relationship"
msgstr "Cima ubudlelwana besingqisho esihambelanayo"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
msgid "The address of the server"
msgstr "Idilesi yeseva"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
msgid "The address of the peer"
msgstr "Idilesi yeqabane"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
msgid "The address to which to broadcast"
msgstr "Idilesi ekusasazelwa kuyo emoyeni"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
msgid "The address from which to accept broadcasts"
msgstr "Idilesi ekwamkelwa kuyo iziganeko zosasazo"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
msgid "The options of the relationship"
msgstr "Izikhethwa zobudlelwana"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
msgid "Options for clock driver calibration"
msgstr "Izikhethwa zemilinganiselo yomqhubi wewotshi"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
msgid "Use the server for initial synchronization"
msgstr "Sebenzisa iseva yesingqisho esihambelanayo ekuqalwa ngaso"
#. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
msgid "Do not use the server for initial synchronization"
msgstr "Musa ukusebenzisa iseva yesingqisho esihambelanayo ekuqalwa ngaso"
#. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
msgid "The synchronization peer not specified."
msgstr "Iqabane lesingqisho esihambelanayo alixelwanga."
#. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
msgid "Specified synchronization peer not found."
msgstr "Iqabane elihambelana ngesingqisho elixeliweyo alifunyenwanga."
#. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is enabled."
msgstr "I-daemon ye-NTP inikwe isakhono."
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
msgid "NTP daemon is disabled."
msgstr "I-daemon ye-NTP isuswe isakhono."
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
msgid "Server"
msgstr "Iseva"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
msgid "Peer"
msgstr "Iqabane"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
msgid "Broadcast"
msgstr "Usasazo emoyeni"
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
msgid "Accepting Broadcasts"
msgstr "Kwamkelwa Iziganeko Zosasazo Emoyeni"
#. table cell, %1 is integer 0-3
#. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
msgid "Unit Number: %1"
msgstr "Inani Lecandelo: %1"
#. table cell, NTP relationship type
#. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
msgid "Local Radio Clock"
msgstr "Iwotshi Yerediyo Yendawo Leyo"
#. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
msgid "Reading the settings failed."
msgstr "Ukufunda imimiselo kusilele."
#. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
msgid "NTP Server Configuration"
msgstr " Ubumbeko Lweseva ye-NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
msgid "NTP Configuration"
msgstr "Ubumbeko lwe-NTP"
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "Imimiselo ye-Firewall"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
msgid "General Settings"
msgstr "Imimiselo Jikelele"
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
msgid "Security Settings"
msgstr "Imimiselo Yokhuseleko"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
msgid "Advanced NTP Configuration"
msgstr "Ubumbeko Oselukwibanga Eseliphambili le-NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
msgid "New Synchronization"
msgstr "Ukuhambelana Kwesingqisho Okutsha"
#. Server editing dialog
#. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
msgid "Server Settings"
msgstr "Imimiselo Yeseva"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
msgid "NTP Server"
msgstr "Iseva ye-NTP"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
msgid "Local NTP Server"
msgstr "Iseva Yendawo Leyo ye-NTP"
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
msgid "Public NTP Server"
msgstr "Iseva Kawonkewonke ye-NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
msgid "NTP Peer"
msgstr "Iqabane le-NTP"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
msgid "Local Reference Clock"
msgstr "Iwotshi Yesalathi Sendawo Leyo"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
msgid "Outgoing Broadcast"
msgstr "Usasazo Lwasemoyeni Oluphumayo"
#. dialog caption
#. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
msgid "Incoming Broadcast"
msgstr "Usasazo Lwasemoyeni Olufikayo"
#. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
msgid "&Reference ID"
msgstr "i-ID &Yesalathi"
#. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
msgid "&Stratum"
msgstr "&Umgangatho"
#. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
msgid "Calibration Offset 1"
msgstr "Ukuphuma Kumiselo Womlinganiselo 1"
#. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
msgid "Calibration Offset 2"
msgstr "Ukuphuma Kumiselo Womlinganiselo 2"
#. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
msgid "Flag &1"
msgstr "Ukuphawula &1"
#. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
msgid "Flag &2"
msgstr "Ukuphawula &2"
#. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
msgid "Flag &3"
msgstr "Ukuphawula &3"
#. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
msgid "Flag &4"
msgstr "Ukuphawula &4"
#. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
msgid "Clock Driver Calibration"
msgstr "Umlinganiselo Womqhubi Wewotshi"
#. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
msgid ""
"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -579,7 +573,7 @@
"Nceda linda...<br></p>"
#. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
msgid ""
"<p><b><big>Aborting Initialization:</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -588,7 +582,7 @@
"Lahla ngokhuselo ukusetyenziswa kobumbeko ngokucinezela <b>u-Lahla</b> ngoku.</p>"
#. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
msgid ""
"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
"Please wait...<br></p>"
@@ -597,7 +591,7 @@
"Nceda linda...<br></p>"
#. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -607,17 +601,15 @@
"Lahla inkqubo yokugcina ngokucinezela <b>ku-Lahla</b>.\n"
" Ingxoxo efakelwayo iya kwazisa ukuba ingaba kukhuselekile na ukwenza njalo.</p>"
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
#, fuzzy
msgid ""
"<p><b><big>Start NTP Daemon</big></b><br>\n"
"Select whether to start the NTP daemon now and on every system boot. \n"
-"The NTP daemon resolves host names when initializing. Your\n"
-"network connection must be started before the NTP daemon starts.</p>\n"
-"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
-"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
-" You can change this when the system was set up."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
msgstr ""
"<p><b><big>Qalisa i-Daemon ye-NTP ngokuzenzekela</big></b><br>\n"
"Khetha ukuba ingaba ufuna ukuqalisa i-daemon ye-NTP na xa umisela inkqubo kwisixokelelwano. I-daemon ye\n"
@@ -645,7 +637,7 @@
msgstr ""
#. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
msgid ""
"<p><b><big>Configuring via DHCP</big></b><br>\n"
"To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -660,7 +652,7 @@
" ingaba ulwazi ngeeseva ze-NTP lunikwa yiseva ye-DHCP na.</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
msgid ""
"<p><b><big>Configured Servers</big></b><br>\n"
"To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -676,7 +668,7 @@
"<b> u-Cima</b>.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
#, fuzzy
msgid ""
"<p><b><big>Display Log</big></b></p>\n"
@@ -686,7 +678,7 @@
"Ukubona i-logs ze-daemon ze-NTP kwifestile entsha, nqomfa kwi <b>Qhosha</b> lokubonisa i-Log.</p>"
#. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
msgid ""
"<p><b><big>Advanced configuration</big></b><br>\n"
"To configure this host to synchronize against multiple remote hosts or against\n"
@@ -697,7 +689,7 @@
"nabamkeli abaninzi abamgama okanye abachasene newotshi yomdibaniso wendawo leyo, sebenzisa oku <b>Ubumbeko Oselukwibanga Eseliphambili</b>."
#. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
msgid ""
"<p><b><big>Clock Type</big></b><br>\n"
"Select the driver for the clock to configure.</p>"
@@ -706,7 +698,7 @@
"Khetha umqhubi wewotshi efanele ukwenzelwa ubumbeko.</p>"
#. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
msgid ""
"<p><b><big>Unit Number</big></b><br>\n"
"If you have multiple clocks of the same type, you must set\n"
@@ -717,7 +709,7 @@
" <b>Inombolo Yomlinganiselo</b>.</p>"
#. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
msgid ""
"<p><b><big>Device</big></b><br>\n"
"To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -736,7 +728,7 @@
" maludalwe ngokwenza ngesandla.</p>"
#. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
msgid ""
"<p><b><big>Driver Calibration</big></b><br>\n"
"To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -745,7 +737,7 @@
"Ukwenza umlinganiselo womqhubi wewotshi, nqomfa apha <b>Umlinganiselo Womqhubi</b>.</p>"
#. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
msgid ""
"<p><b><big>Address of the NTP Server</big></b><br>\n"
"To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -758,7 +750,7 @@
" wenkonzo Yonxibelelwano Ngekhompyutha.</p>"
#. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
msgid ""
"<p><b><big>Selecting a Server</big></b><br>\n"
"To select an NTP server from those found in the local network\n"
@@ -771,7 +763,7 @@
" khetha phakathi <b>Kweseva ye-NTP Yendawo Leyo</b> ngokunjalo <b>Iseva Kawonkewonke ye-NTP</b>.</p>"
#. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
msgid ""
"<p><b><big>Testing Server Accessibility</big></b><br>\n"
"To test if the selected server is up and responds properly,\n"
@@ -782,7 +774,7 @@
" nqomfa <b>ku-Vavanya</b>.</p>"
#. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address of the host with which to synchronize mutually,\n"
@@ -793,7 +785,7 @@
" sebenzisa <b>Idilesi</b>.</p>"
#. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -804,7 +796,7 @@
" yommandla wesiqendu.</p>"
#. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
msgid ""
"<p><b><big>Address</big></b><br>\n"
"To set the address from which to accept broadcast packets, use \n"
@@ -816,7 +808,7 @@
#. help text 2/4, was removed
#. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
#, fuzzy
msgid ""
"<p><b><big>Options</big></b><br>\n"
@@ -829,7 +821,7 @@
" <b>Izikhethwa </b> zommandla weziqendu. Ngobucukubhede, jonga\n"
" <i>/usr/izabelwano/uxwebhu/imibekelelo/xntp-doc/html/confopt.htm</i>.</p>"
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
msgid ""
"<p><b><big>Access Control Options</big></b><br>\n"
"Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -841,7 +833,7 @@
msgstr ""
#. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
msgid ""
"<p><b><big>Synchronization Peer Type</big></b><br>\n"
"Select the kind of synchronization peer to add here.</p>"
@@ -850,7 +842,7 @@
"Khetha uhlobo lokuhanjiswa ngesingqisho esinye kwamaqabane ukuze kufakelwe apha.</p>"
#. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
msgid ""
"<p>To add an NTP server to which to synchronize,\n"
"select <b>Server</b>.</p>"
@@ -859,7 +851,7 @@
"khetha <b>Iseva</b>.</p>"
#. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
msgid ""
"<p>To add an NTP peer to synchronize mutually, select\n"
"<b>Peer</b>.</p>"
@@ -868,7 +860,7 @@
"<b>u-Iqabane</b>.</p>"
#. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
msgid ""
"<p>To configure a local clock connected directly to your computer,\n"
"select <b>Radio Clock</b>.</p>"
@@ -877,7 +869,7 @@
"khetha <b>ku-Iwotshi Yerediyo</b>.</p>"
#. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
msgid ""
"<p>To broadcast time information through your network, select\n"
"<b>Outgoing Broadcast</b>.</p>"
@@ -886,7 +878,7 @@
"<b>ku-Usasazo Lwasemoyeni Olukhutshwayo</b>.</p>"
#. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
msgid ""
"<p>To accept NTP packets broadcasted by other hosts on the network\n"
"and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
@@ -895,7 +887,7 @@
"ukuze uzisebenzise xa umisela ixesha lendawo leyo, khetha <b>ku-Usasazo Olungenayo Lwasemoyeni<b>.</p>"
#. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
msgid ""
"<p><big><b>Server Location</b></big>\n"
"Select if you want to find the NTP server in the local network or select\n"
@@ -906,7 +898,7 @@
" iseva ye-NTP kuludwe olwaziwayo lweeseva ze-NTP.</p>"
#. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
msgid ""
"<p><big><b>Finding Server in the Local\n"
"Network</b></big><br>\n"
@@ -921,7 +913,7 @@
" Emva koko khetha iseva kuludwe lweeseva ezifunyenweyo.</p>"
#. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
msgid ""
"<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
"Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -932,7 +924,7 @@
" ze-NTP kuphela kusenzelwa ilizwe elithile, likhethe apha<b>Ilizwe</b>.</p>"
#. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
msgid ""
"<p><big><b>Note</b></big><br>\n"
"The listed NTP servers may not be available from any country, but only\n"
@@ -952,7 +944,7 @@
" ukufumana iseva ye-NTP ekufutshane kuwe.</p>"
#. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
msgid ""
"<p><big><b>Testing Server Accessibility</b></big><br>\n"
"To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -962,7 +954,7 @@
#. help text connected with checkbox: "Use Random Server from pool.ntp.org"
#. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
msgid ""
"<p><big><b>Use Random Servers</b></big><br>\n"
"This service is offered by pool.ntp.org. If you select this option,\n"
@@ -977,7 +969,7 @@
" umxumi wakho we-NTP uhanjiswa ngesingqisho esifanayo neeseva ezahlukahlukeneyo ngeyure nganye.</p>\n"
#. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
msgid ""
"<p><big><b>Clock Driver Calibration</b></big><br>\n"
"The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -990,7 +982,7 @@
"kumqhubi othile. Abaqhubi abathile abazisebenzisi zonke izikhethwa.</p>"
#. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
#, fuzzy
msgid ""
"To learn more about available options, install the package\n"
@@ -1010,17 +1002,17 @@
"Zonke iinguquko ziya kulahleka."
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
msgid "Restart NTP Daemon"
msgstr "Phinda uqalise i-Daemon ye-NTP"
#. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
msgid "Save Settings and Restart NTP Daemon"
msgstr "Gcina Imimiselo uze Uqalise nge-Daemon ye-NTP"
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
msgid ""
"Warning!\n"
"\n"
@@ -1035,7 +1027,7 @@
"daemon isenokungaqhubi kakuhle."
#. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
msgid ""
"NTP server '%1' is not a valid hostname,\n"
"fully qualified hostname, IPv4 address, or IPv6 address."
@@ -1044,7 +1036,7 @@
"igama likamamkeli elichazwe ngokupheleleyo, idilesi ye-IPv4 , okanye idilesi ye-IPv6."
#. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
msgid ""
"Enabling Random Servers from pool.ntp.org would\n"
"replace the current NTP server.\n"
@@ -1057,44 +1049,44 @@
" Ususa ngenene ngokubeka enye iseva yangoku ye-NTP?"
#. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
msgid "Select the Device"
msgstr "Khetha Isixhobo"
#. selection box header
#. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
msgid "Public NTP &Servers"
msgstr "&Iiseva Zikawonkewonke ze-NTP"
#. message report (no server selected)
#. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
msgid "Select an NTP server."
msgstr "Khetha iseva ye-NTP."
#. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
msgid "All Countries"
msgstr "Onke Amazwe"
#. combo box header
#. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
msgid "&Country"
msgstr "&Ilizwe"
#. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
msgid "Scanning for NTP servers on your network..."
msgstr "Kufotwa ngokuskena iiseva ze-NTP kumsebenzi wothungelwano wakho..."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
#. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
msgid ""
"No NTP server has been found on your network.\n"
"This could be caused by a running SuSEfirewall2,\n"
@@ -1105,216 +1097,216 @@
" ethi mhlawumbi ithintele ukufotwa ngokuskena komsebenzi wothungelwano."
#. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
msgid "No NTP server has been found on your network."
msgstr "Akukho seva ye-NTP ifunyenwe kumsebenzi wakho wothungelwano."
#. combo box label
#. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
msgid "Address"
msgstr "Idilesi"
#. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
msgid "No server is selected."
msgstr "Akukho seva ikhethiweyo."
#. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
msgid "A&ddress"
msgstr "I&dilesi"
#. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
msgid "Ad&vanced Configuration"
msgstr "Ubumbeko Oselukwi&banga Eseliphambili"
#. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
msgid "&Driver Calibration"
msgstr "Umlinganiselo &Womqhubi"
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
#, fuzzy
#| msgid "Remote Synchronization"
msgid "&Interval of the Synchronization in Minutes"
msgstr "Ungqinelwaniso Olumgama"
#. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
#, fuzzy
msgid "Start NTP Daemon"
msgstr "Phinda uqalise i-Daemon ye-NTP"
#. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
#, fuzzy
msgid "Only &Manually"
msgstr "&Ngokwenza ngesandla"
#. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
#, fuzzy
#| msgid "Synchronizing with ZENworks"
msgid "&Synchronize without Daemon"
msgstr "Kuhanjiswa ngesingqisho esifanayo nemisebenzi ye-ZEN"
#. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
msgid "Now and on &Boot"
msgstr ""
#. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
msgid "Run NTP Daemon in Chroot &Jail"
msgstr "Qhuba nge-Daemon ye-NTP kwi-Chroot &Jail"
#. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
msgid "&Restrict NTP Service to Configured Servers Only "
msgstr ""
#. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
#, fuzzy
msgid "Manual"
msgstr "Ngokwenza ngesandla"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
#, fuzzy
msgid "Auto"
msgstr "Ngokuzenzekela"
#. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
msgid "Custom"
msgstr "Lungisela"
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
#, fuzzy
msgid "&Runtime Configuration Policy"
msgstr "Isishwankathelo Sobumbeko lwempuku."
#. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
#, fuzzy
msgid "&Custom Policy"
msgstr "Umgaqonkqubo &Wamaza Esandi"
#. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
msgid "&Use Random Servers from pool.ntp.org"
msgstr "&Sebenzisa Iiseva Ezikhethwa Ngendlela Yeqashiso ukusuka kwi-pool.ntp.org"
#. text entry label
#. text entry
#. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
msgid "&Address"
msgstr "&Idilesi"
#. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
msgid "&Select..."
msgstr "&Khetha..."
#. push button
#. push button
#. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
msgid "&Test"
msgstr "&Uvavanyo"
#. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
msgid "Synchronization Type"
msgstr "Uhlobo Lwesingqisho Esihambelanayo"
#. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
msgid "Display &Log..."
msgstr "Bonisa &mgciningxelo..."
#. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
msgid "Clock &Type"
msgstr "&Uhlobo Lwewotshi"
#. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
msgid "Unit &Number"
msgstr "Inani &Lecandelo"
#. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
msgid "Create &Symlink"
msgstr "Dala &Unxulumano Lomqondiso"
#. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
msgid "&Device"
msgstr "&Isixhobo"
#. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
#, fuzzy
msgid "Access Control Options"
msgstr "&Izintlu zokuLawula uFikelwlo (ILF)"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
msgid "&Server"
msgstr "&Iseva"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
msgid "&Peer"
msgstr "&Iqabane"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
msgid "&Radio Clock"
msgstr "&Iiwotshi Zerediyo:"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
msgid "&Outgoing Broadcast"
msgstr "Usasazo Lwasemoyeni &Olukhutshwayo"
#. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
msgid "&Incoming Broadcast"
msgstr "Usasazo Lwasemoyeni &Olufikayo"
#. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
msgid "Type"
msgstr "Uhlobo"
#. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
msgid "Loc&al Network"
msgstr "Umsebenzi Wothungelwano Wend&awo Leyo"
#. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
msgid "&Public NTP Server"
msgstr "Iseva &Kawonkewonke ye-NTP"
#. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
msgid "NTP Server Location"
msgstr "Indawo Yeseva ye-NTP"
#. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
msgid "&Lookup"
msgstr "&Funa"
@@ -1328,155 +1320,166 @@
msgid "Initializing ..."
msgstr "Kuyandululwa..."
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "Kundululwa Ubumbeko Lomxumi we-NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "Funda ubumbeko lomsebenzi wothungelwano"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "Funda imimiselo ye-NTP"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "Kufundwa ubumbeko lomsebenzi wothungelwano..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "Kufundwa imimiselo ye-NTP..."
-
-#. progress step
#. While calling "yast clone_system" it is possible that
#. the ntp server has not already been installed at that time.
#. (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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
#. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
msgid "Finished"
msgstr "Kugqityiwe"
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "Kugcinwa Ubumbeko Lomxumi we-NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "Bhala imimiselo ye-NTP"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "Phinda uqalise i-daemon ye-NTP"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "Kubhalwa imimiselo..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "Kuqaliswa Ngokutsha i-daemon ye-NTP"
-
-#. error message
-#: src/modules/NtpClient.rb:850
-#, fuzzy
-msgid "Cannot update the dynamic configuration policy."
-msgstr "Ayinako ukufunda ulwakhelo."
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "Ayikwazi kuqaleka ngokutsha i-daemon ye-NTP."
-
#. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
msgid "The NTP daemon starts when starting the system."
msgstr "I-daemon ye-NTP iqalisa xa kuqaliswa isixokelelwano."
#. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
msgid "The NTP daemon does not start automatically."
msgstr "I-daemon ye-NTP ayiqalisi ngokuzenzekela."
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
msgid "Servers: %1"
msgstr "Iiseva: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
msgid "Radio Clocks: %1"
msgstr "Iiwotshi Zerediyo: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
msgid "Peers: %1"
msgstr "Amaqabane: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
msgid "Broadcast time information to: %1"
msgstr "Ulwazi ngexesha lokusasaza emoyeni luya: %1"
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
msgid "Accept broadcasted time information from: %1"
msgstr "Yamkela ulwazi ngexesha lokusasaza emoyeni ukusuka: %1"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
#, fuzzy
msgid "Combine static and DHCP configuration."
msgstr "Bhala igama lomamkeli kunye nobumbeko lwe-DNS"
#. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
#, fuzzy
msgid "Static configuration only."
msgstr "Kuhlaziywa iifayili zobumbeko..."
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
#, fuzzy
msgid "Custom configuration policy."
msgstr "Isishwankathelo Sobumbeko lwempuku."
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
msgid "Testing the NTP server..."
msgstr "Kuvavanywa iseva ye-NTP..."
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
msgid "Server is reachable and responds properly."
msgstr "Iseva iyafikeleleka kwaye iphendula ngokufanelekileyo."
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
msgid "Server is unreachable or does not respond properly."
msgstr "Iseva ayifikeleleki okanye ayiphenduli ngokufanelekileyo."
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
msgstr ""
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "Kundululwa Ubumbeko Lomxumi we-NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "Funda ubumbeko lomsebenzi wothungelwano"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "Funda imimiselo ye-NTP"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "Kufundwa ubumbeko lomsebenzi wothungelwano..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "Kufundwa imimiselo ye-NTP..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "Kugcinwa Ubumbeko Lomxumi we-NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "Bhala imimiselo ye-NTP"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "Phinda uqalise i-daemon ye-NTP"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "Kubhalwa imimiselo..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "Kuqaliswa Ngokutsha i-daemon ye-NTP"
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+#, fuzzy
+msgid "Cannot update the dynamic configuration policy."
+msgstr "Ayinako ukufunda ulwakhelo."
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "Ayikwazi kuqaleka ngokutsha i-daemon ye-NTP."
+
+#~ msgid "Firewall Settings"
+#~ msgstr "Imimiselo ye-Firewall"
+
#~ msgid "Cannot write sysconfig variables."
#~ msgstr "Azikwazi kubhaleka iziguquki zobumbeko lwesixokelelwano."
Modified: trunk/yast/xh/po/packager.xh.po
===================================================================
--- trunk/yast/xh/po/packager.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/packager.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -428,7 +428,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:95
#, fuzzy
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr ""
@@ -551,7 +551,7 @@
#. dialog caption
#. dialog caption
#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/modules/AddOnProduct.rb:688
msgid "Initializing..."
msgstr "Kuyandululwa..."
@@ -576,12 +576,6 @@
msgid "&Media"
msgstr "&Izilondolozi"
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-#, fuzzy
-msgid "Saving the software manager configuration..."
-msgstr "Kugcinwa ubumbeko lomlawuli wemibekelelo..."
-
#. default (minimal) priority of a repository
#: src/clients/repositories.rb:58
#, fuzzy
@@ -621,7 +615,7 @@
#. 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/modules/AddOnProduct.rb:1351
msgid "URL: %1"
msgstr "I-URL: %1"
@@ -906,7 +900,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:1040 src/modules/Packages.rb:1328
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Ubucukubhede:"
@@ -914,7 +908,7 @@
#. 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:1042 src/modules/Packages.rb:1336
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Uyazama kwakhona?"
@@ -1525,50 +1519,50 @@
msgstr "Uyayicima ngenene i-'%1'?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:81
#, fuzzy
msgid "Adding a New Repository"
msgstr "Kufakelwa ikhathalofu..."
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
#, fuzzy
msgid "Check Repository Type"
msgstr "Khetha Uhlobo lweNgxelo"
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:86
#, fuzzy
msgid "Add Repository"
msgstr "&Indawo Yokuhlala Yenkangeleko Yecala:"
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:87
#, fuzzy
msgid "Read Repository License"
msgstr "Iikhathaogu Ezibhalisiweyo"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
#, fuzzy
msgid "Checking Repository Type"
msgstr "Kudalwa umthombo we-%1"
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:91
#, fuzzy
msgid "Adding Repository"
msgstr "Kufakelwa ikhathalofu..."
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:92
#, fuzzy
msgid "Reading Repository License"
msgstr "Kudalwa umthombo we-%1"
#. 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:156
#, fuzzy
msgid "Repository"
msgstr "&Indawo Yokuhlala Yenkangeleko Yecala:"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:228
#: src/modules/SourceManager.rb:330
#, fuzzy
#| msgid ""
@@ -1592,8 +1586,8 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
#, fuzzy
msgid ""
"Unable to create repository\n"
@@ -1603,25 +1597,31 @@
"ukusuka kwi-URL '%1'."
#. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:335
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:345
#, fuzzy
msgid "Change the URL and try again?"
msgstr "Tshintsha Isikhethwa"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:422
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
msgstr ""
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+#, fuzzy
+msgid "Saving the software manager configuration..."
+msgstr "Kugcinwa ubumbeko lomlawuli wemibekelelo..."
+
#. New add-on product might add also new agents.
#. Functions Rereads all available agents.
#.
@@ -1629,20 +1629,20 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
msgid "An error occurred while preparing the installation system."
msgstr "Kwenzeke imposiso xa bekudalwa umthombo wokuhlohla."
#. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:659
#, fuzzy
msgid "Control file %1 not found on media."
msgstr "Ifayili yokulawula %1 ayikhange ifunyanwe."
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:900
#, fuzzy
#| msgid "Package %1 was not installed. The service cannot be edited."
msgid ""
@@ -1650,76 +1650,83 @@
"The add-on product cannot be registered."
msgstr "Umbekelelo %1 awuhlohlwanga. Le nkonzo ayikwazi kuhlelwa."
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+#, fuzzy
+msgid "Unknown Product"
+msgstr "Imo esebenzayo engaziwa"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+msgid "Re&lease Notes..."
+msgstr "Khulula Amanqaku"
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
#, fuzzy
msgid "Unable to use additional products."
msgstr "Faka i-CD yemveliso efakelwayo"
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
#, fuzzy
msgid "%1, URL: %2"
msgstr "I-URL: %1"
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1345
#, fuzzy
msgid "URL: %1, Path: %2"
msgstr "I-URL: %1, Uvimba weefayili: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1376
#, fuzzy
msgid "Additional Products"
msgstr "Ulwazi Olufakelweyo"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1382
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:1393
#, fuzzy
msgid "Additional Products to Select"
msgstr "Ukukhetha Imveliso"
#. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1400
#, fuzzy
msgid "Add Selected &Products"
msgstr "Iimveliso Ezifakelwayo"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1532
#, fuzzy
#| msgid "Insert the add-on product CD"
msgid "Insert the addon %1 medium"
msgstr "Faka i-CD yemveliso efakelwayo"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1537
#, fuzzy
#| msgid "Insert the first installation medium."
msgid "Insert the %1 %2 medium"
msgstr "Faka isilondolozi sokuhlohla sokuqala."
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1589
#, fuzzy
msgid "Unable to add product %1."
msgstr "Ayikwazi kubhala %1."
-#. 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/Packages.rb:471
-#, fuzzy
-msgid "Unknown Product"
-msgstr "Imo esebenzayo engaziwa"
-
#. update the trusted flag
#: src/modules/KeyManager.rb:214
#, fuzzy
@@ -1749,31 +1756,31 @@
"kuvimba weefayili wexeshana.\n"
#. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
msgid "&Show Failed Packages List"
msgstr "&Bonisa Uludwe Lwemibekelelo Olusileleyo"
#. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
msgid "&Show Full Log"
msgstr "&Bonisa Isigcini-ngxelo Esipheleleyo"
#. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
#, fuzzy
#| msgid "Installation of Some Packages Failed"
msgid "Installation of some Packages Failed"
msgstr "Kusilele ukuhlohla Kweminye Yemibekelelo"
#. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
#, fuzzy
#| msgid "Installation aborted."
msgid "Installation aborted by user."
msgstr "Ukuhlohla kulahliwe."
#. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
#, fuzzy
msgid "Medium %1"
msgstr "&Isilondolozi"
@@ -1782,13 +1789,13 @@
#. When data throughput goes downhill (stalled network connection etc.),
#. cut off the predicted time at a reasonable maximum.
#. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:204
+#: src/modules/PackageSlideShow.rb:202
msgid ">%1"
msgstr ">%1"
#. Nothing more to install from this CD (very concise - little space!!)
#. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
msgid "Done."
msgstr "Kwenziwe."
@@ -1796,7 +1803,7 @@
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
#. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:262
+#: src/modules/PackageSlideShow.rb:260
#, fuzzy
#| msgid "Next %1: %2"
msgid "Next: %1 -- %2"
@@ -1805,7 +1812,7 @@
#. Status line informing about the next CD that will be used
#. %1: Media type ("CD" / "DVD", ???)
#. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:279
+#: src/modules/PackageSlideShow.rb:277
#, fuzzy
#| msgid "Name: %1"
msgid "Next: %1"
@@ -1814,7 +1821,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:918
+#: src/modules/PackageSlideShow.rb:922
msgid "Total"
msgstr "Isixa esipheleleyo"
@@ -1823,46 +1830,46 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
msgid "Downloading %1 (download size %2)"
msgstr "Kuthotywa umthwalo %1 (ubukhulu bomthwalo othulwayo %2)"
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
#, fuzzy
msgid " (Remaining: %1%2 packages)"
msgstr "%1 Okuseleyo)"
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
#, fuzzy
#| msgid "Downloading Package"
msgid "Downloading Packages..."
msgstr "Kuthotywa Umthwalo Wombekelelo"
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
#, fuzzy
msgid " (Downloaded %1 of %2 packages)"
msgstr "Kuthotywa Umthwalo Wombekelelo"
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
msgid "Deleting %1"
msgstr "Kucinywa u-%1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
#, fuzzy
msgid "Installing %1 (installed size %2)"
msgstr "Ayihlohlwanga (%1 -> %2)"
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
msgid "Applying delta RPM: %1"
msgstr "Kusetyenziswa i-delta RPM: %1"
@@ -2003,8 +2010,10 @@
msgstr ""
#: src/modules/Packages.rb:734
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
-msgstr ""
+#, fuzzy
+#| msgid "%1 packages will be updated"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
+msgstr "%1 imibekelelo iya kuhlaziywa"
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
@@ -2019,13 +2028,13 @@
msgstr ""
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
#, fuzzy
msgid "No repository found at '%1'."
msgstr "Akukho khathalogu ifunyenweyo apha '%1'."
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
#, fuzzy
#| msgid ""
#| "<p><b>These are the release notes made for the first initial release. They are\n"
@@ -2043,33 +2052,33 @@
" ukusuka kwiseva Yothungelwano lwe-SUSE Linux. </b></p>"
#. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
msgid "Integrating booted media..."
msgstr "Kwenziwa ubumbano wezilondolozi ezimiselwe inkqubo..."
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
#, fuzzy
msgid "Failed to integrate the service pack repository."
msgstr "Kusilele ukwenza ubumbano lomthombo wombekelelo wenkonzo."
#. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
#, fuzzy
msgid "Initializing repositories..."
msgstr "Kundululwa umthombo omtsha..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
msgid "Insert %1 CD 1"
msgstr "Faka i-%1 CD 1"
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
msgid "%1 CD 1 not found"
msgstr "%1 ye-CD 1 ayifunyanwa"
#. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -2079,19 +2088,19 @@
"yokugcina ingxelo ngobucukubhede %1 obuthe chatha kobunikiweyo."
#. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
msgstr ""
#. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
msgid "Evaluating package selection..."
msgstr "Kuvavanywa okukhethwayo kombekelelo..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -2100,37 +2109,45 @@
#. Sets that the license (file) has been already accepted
#.
#. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
#, fuzzy
msgid "Cannot read license file %1"
msgstr "Ayikwazi kufundeka ifayili '%1'"
-#: src/modules/ProductLicense.rb:151
+#: src/modules/ProductLicense.rb:153
msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
msgstr ""
#. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
msgid "&Language"
msgstr "&Ulwimi"
#. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
#, fuzzy
#| msgid "&Yes, I Agree to the License Agreement"
msgid "I &Agree to the License Terms."
msgstr "&Ewe, Ndiyasivuma Isivumelwano Selayisensi"
#. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+msgid ""
"If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
msgstr ""
#. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
msgid ""
"<p>Read the license agreement carefully and select\n"
"one of the available options. If you do not agree to the license agreement,\n"
@@ -2144,38 +2161,39 @@
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
msgid "License Agreement"
msgstr "Isivumelwano Selayisensi"
#. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
#, fuzzy
msgid "Really abort the add-on product installation?"
msgstr "Ukuyeka ngenene ukuhlohla imveliso efakelwayo?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
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:1048
+#: src/modules/ProductLicense.rb:1044
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:1058
+#: src/modules/ProductLicense.rb:1054
#, fuzzy
msgid "The system is shutting down..."
msgstr "Isixokelelwano siyavala..."
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
#: src/modules/ProductLicense.rb:1153
#, fuzzy
#| msgid "License Agreement"
@@ -2183,7 +2201,7 @@
msgstr "Isivumelwano Selayisensi"
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
@@ -2289,7 +2307,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
#, fuzzy
#| msgid "&SMB/CIFS"
msgid "S&MB/CIFS"
@@ -2341,7 +2359,7 @@
msgstr "Akukho Nkcazelo"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
msgid ""
"<p>If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>"
@@ -2350,7 +2368,7 @@
"wezilondolozi, misela <b>ku-Umfuziselo we-ISO</b>.</p>"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
#, fuzzy
msgid ""
"<p>If the repository is on multiple media,\n"
@@ -2360,53 +2378,53 @@
"misela indawo yezilondolozi zokuqala zeseti.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
msgid "&Server Name"
msgstr "Igama &Leseva:"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
msgid "&Path to Directory or ISO Image"
msgstr "&Indlela Yothungelwano eya Kuvimba Weefayili okanye Umfuziselo we-ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
#, fuzzy
msgid "&ISO Image"
msgstr "ISO Image"
#. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
#, fuzzy
#| msgid "&Protocol"
msgid "N&FS v4 Protocol"
msgstr "&Inkqubo"
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
msgid "Mount Options"
msgstr "Izikhethwa Zokugxumeka"
#. 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:163
+#: src/modules/SourceDialogs.rb:164
#, fuzzy
#| msgid " (default)"
msgid "(default)"
msgstr "(okuhlala kukhona)"
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
#, fuzzy
msgid "URL of the Repository"
msgstr "Igama &Lesikhethwa"
#. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
msgid "P&rotocol"
msgstr "In&kqubo yomthetho"
#. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
#, fuzzy
msgid "&URL of the Repository"
msgstr "Igama &Lesikhethwa"
@@ -2414,40 +2432,40 @@
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
#, fuzzy
msgid "Repository URL"
msgstr "&Indawo Yokuhlala Yenkangeleko Yecala:"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
msgid "NFS Server"
msgstr "Iseva ye-NFS"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
msgid "CD or DVD Media"
msgstr "Izilondolozi ze-CD okanye ze-DVD"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
msgid "Hard Disk"
msgstr "Okuseqokobheni Lekhompyutha"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
msgid "USB Stick or Disk"
msgstr ""
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
msgid "Local Directory"
msgstr "Uvimba Weefayili Wendawo Ethile"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
#, fuzzy
msgid "Local ISO Image"
msgstr "ISO Image"
@@ -2457,26 +2475,26 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: 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
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
msgid "Server and Directory"
msgstr "Iseva Novimba Weefayili"
#. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:469
#, fuzzy
msgid "The name of the repository cannot be empty."
msgstr "Indlela yothungelwano yolwabelwano ayikwazi kuba likhamte."
#. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:482
#, fuzzy
msgid "&Repository Name"
msgstr "&Indawo Yokuhlala Yenkangeleko Yecala:"
#. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:497
#, fuzzy
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
@@ -2487,13 +2505,13 @@
" kuvimba weefayili okanye ifayili ephethe umfuziselo we-ISO wezilondolizi zokuhlohla.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:511
#, fuzzy
msgid "&Service Name"
msgstr "Igama Lenkonzo"
#. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:519
#, fuzzy
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
@@ -2504,17 +2522,17 @@
" kuvimba weefayili okanye ifayili ephethe umfuziselo we-ISO wezilondolizi zokuhlohla.</p>"
#. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:554
msgid "URL cannot be empty."
msgstr "i-URL ayinakuba likhamte."
#. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:568
msgid "&URL"
msgstr "&i-URL"
#. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:582
#, fuzzy
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
@@ -2527,16 +2545,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
msgid "Edit Parts of the URL"
msgstr ""
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
msgid "Edit Complete URL"
msgstr ""
#. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:774
#, fuzzy
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
@@ -2547,7 +2565,7 @@
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
" to specify the NFS server host name and path on the server.<p>"
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:781
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2556,16 +2574,16 @@
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:836
msgid "&CD-ROM"
msgstr "&i-CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:838
msgid "&DVD-ROM"
msgstr "&i-DVD-ROM"
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:843
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2574,12 +2592,12 @@
"Misela <b>i-CD-ROM</b> okanye <b>i-DVD-ROM</b> ukuxela uhlobo lwezilondolozi.</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:943
msgid "ISO Image File"
msgstr "Ifayili Yomfuziselo we-ISO"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:966
#, fuzzy
msgid ""
"The entered path is not a directory\n"
@@ -2589,7 +2607,7 @@
"Zama kwakhona.\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:996
#, fuzzy
msgid ""
"The entered path is not a file\n"
@@ -2597,7 +2615,7 @@
msgstr "Ifayili exeliweyo ayikho kwayona."
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1020
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2605,18 +2623,18 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1041
msgid "&Path to Directory"
msgstr "&Indlela Yothungelwano eya Kuvimba Weefayili"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
#, fuzzy
msgid "&Plain RPM Directory"
msgstr "&Path to Directory"
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1064
#, fuzzy
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
@@ -2630,23 +2648,23 @@
" directory holding RPM packages.</p>"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1300
#, fuzzy
msgid "&USB Mass Storage Device"
msgstr "Isixhobo sokugcina okuninzi"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
#, fuzzy
msgid "&File System"
msgstr "Isixokelelwano Seefayili"
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
#, fuzzy
msgid "Dire&ctory"
msgstr "Uvimba weefayili:"
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1311
#, fuzzy
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
@@ -2663,7 +2681,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:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
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"
@@ -2671,12 +2689,12 @@
msgstr ""
#. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1371
#, fuzzy
msgid "&Disk Device"
msgstr "&Isixhobo se-Diski ye-Floppy"
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1378
#, fuzzy
msgid ""
"<p><big><b>Disk</b></big><br>\n"
@@ -2692,13 +2710,13 @@
" directory holding RPM packages.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1404
#, fuzzy
msgid "&Path to ISO Image"
msgstr "&Path to Directory or ISO Image"
#. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1424
#, fuzzy
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
@@ -2710,73 +2728,73 @@
" directory holding RPM packages.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1605
msgid "Server &Name"
msgstr "&Igama Leseva:"
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1609
msgid "&Port"
msgstr "&Isiqhagamshelanisi"
#. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1614
msgid "&Share"
msgstr "&Ukwabelana"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1627
#, fuzzy
msgid "ISO &Image"
msgstr "ISO Image"
#. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1630
msgid "&Directory on Server"
msgstr "&Uvimba Weefayili Kwiseva"
#. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1635
msgid "Au&thentication"
msgstr "U&ngqinelwano ngobunyani"
#. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1642
msgid "&Anonymous"
msgstr "&Ukungaxelwa kwegama"
#. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1651
#, fuzzy
msgid "&Workgroup or Domain"
msgstr "Workgroup or Domain"
#. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1660
msgid "&User Name"
msgstr "&Igama Lomsebenzisi"
#. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1667
msgid "&Password"
msgstr "&Igama lokugqithisa"
#. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1742
msgid "&FTP"
msgstr "I-&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1745
msgid "H&TTP"
msgstr "i-H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1752
msgid "HTT&PS"
msgstr "I-HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1926
#, fuzzy
msgid ""
"<p><big><b>Server and Directory</b></big><br>\n"
@@ -2802,7 +2820,7 @@
" of the media, set <b>ISO Image</b>.</p>"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1939
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"
@@ -2811,12 +2829,17 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+msgid "I would li&ke to install an additional Add On Product"
msgstr ""
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+msgid "Net&work Configuration..."
+msgstr "Ifunda ubumbeko lomsebenzi wothungelwano..."
+
#. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2136
#, fuzzy
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
@@ -2828,7 +2851,7 @@
" okanye kwiqokobhe lekhompyutha.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2839,7 +2862,7 @@
" kunomiselo lwe-CD yemveliso okanye i-DVD ekhoyo.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2155
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2863,7 +2886,7 @@
" kuvimba omnye weefayili.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2167
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2881,28 +2904,28 @@
" CD yokuqala ibekwe khona, efana noku/ iinkcukacha1/CD1. </p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2182
#, fuzzy
#| msgid "Select the media type."
msgid "Select the media type"
msgstr "Khetha uhlobo lwezilondolozi."
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2188
msgid "Insert the add-on product CD"
msgstr "Faka i-CD yemveliso efakelwayo"
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2189
msgid "Insert the add-on product DVD"
msgstr "Faka i-DVD yemveliso efakelwayo"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2207
#, fuzzy
msgid "No USB disk was detected."
msgstr "Akukho okuseqokobheni lekhompyutha kufunyenweyo"
#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#: src/modules/SourceDialogs.rb:2415
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2912,12 +2935,12 @@
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2635
msgid "Media Type"
msgstr "Uhlobo Lwezilondolozi"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2659
#, fuzzy
#| msgid "Add-On Products"
msgid "Add On Product"
@@ -2926,7 +2949,7 @@
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2690
#, fuzzy
#| msgid "' is not valid."
msgid "URL scheme '%s' is not valid."
@@ -3139,12 +3162,12 @@
msgstr "Akukho zikhathalogu ze-SLP zifunyenwe kumsebenzi wakho wothungelwano."
#. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
msgid "Partition \"%1\" needs %2 more disk space."
msgstr "Isahlulelo \"%1\" sifuna i- %2 yesithuba esithe kratya esikwidiski."
#. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
#, fuzzy
#| msgid ""
#| "Deselect some packages or delete some data\n"
@@ -3157,7 +3180,7 @@
"okanye iifayili zethutyana phambi kokuhlaziya isixokelelwano."
#. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
#, fuzzy
#| msgid "Please deselect some packages."
msgid "Deselect some packages."
@@ -3211,10 +3234,6 @@
#~ msgstr "Ayikwazi kuNdulula umBekelo weSiseko senkcukacha"
#, fuzzy
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "Ifunda ubumbeko lomsebenzi wothungelwano..."
-
-#, fuzzy
#~ msgid "Initializing Software Manager ... "
#~ msgstr "Kundululwa umbekelo omtsha wesiseko senkcukacha..."
@@ -3605,10 +3624,6 @@
#~ msgid "&Details"
#~ msgstr "&Ubucukubhede"
-#, fuzzy
-#~ msgid "Release &Notes"
-#~ msgstr "Khulula Amanqaku"
-
#~ msgid "Package Installation"
#~ msgstr "Kuhlohlwa Umbekelelo"
Modified: trunk/yast/xh/po/pkg-bindings.xh.po
===================================================================
--- trunk/yast/xh/po/pkg-bindings.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/pkg-bindings.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: pkg-bindings\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -42,13 +42,13 @@
msgstr ""
#. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
#, fuzzy
msgid "The package cannot be selected to install."
msgstr "Akukho mbekelelo okhethelwe ukuhlohla."
#. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
#, fuzzy
msgid "The package is not available."
msgstr "%1 yepakethe ayikho."
Modified: trunk/yast/xh/po/printer.xh.po
===================================================================
--- trunk/yast/xh/po/printer.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/printer.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: printer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-09 11:51\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -203,7 +203,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:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -220,8 +220,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:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -359,7 +359,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
msgid "Description"
msgstr "Inkcazelo"
@@ -476,8 +476,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:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
msgid "Nothing Selected"
msgstr "Akukho Nto Ikhethiweyo"
@@ -2722,60 +2722,60 @@
#. Authors: Johannes Meixner <jsmeix(a)suse.de>
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
#, fuzzy
msgid "Show"
msgstr "Bonisa &ubucukubhede"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
#, fuzzy
msgid "&Local"
msgstr "Okwendawo leyo"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
#, fuzzy
msgid "&Remote"
msgstr "Okumgama"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
msgid "Configuration"
msgstr "Ubumbeko"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
msgid "Name"
msgstr "Igama"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
msgid "Location"
msgstr "Indawo yokuhlala"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
msgid "Default"
msgstr "Into ehlala ikhona"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
msgid "Status"
msgstr "Isimo"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
#, fuzzy
msgid "Re&fresh List"
msgstr "&Yenza Ngokutsha Uludwe"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
#, fuzzy
msgid "Print &Test Page"
msgstr "Shicilela ikhasi lovavanyo"
@@ -2786,7 +2786,7 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
msgid ""
"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
@@ -2799,7 +2799,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -2814,39 +2814,39 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
msgstr ""
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
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:207
+#: src/include/printer/overview.rb:210
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:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
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:253
+#: src/include/printer/overview.rb:256
#, fuzzy
msgid "CUPS Server %1"
msgstr "Iseva ye-CUPS"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
#, fuzzy
#| msgid "The print server is accessible."
msgid "Testing if CUPS server is accessible..."
@@ -2855,39 +2855,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:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
msgid "Select an entry."
msgstr "Khetha ungeniso."
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
#, fuzzy
msgid "Cannot Delete"
msgstr "Iqhosha le-TSIG alikwazi kucimeka."
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr ""
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
#, fuzzy
msgid "Confirm Deletion"
msgstr "Qinisekisa Ukuhlohla"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
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:620
+#: src/include/printer/overview.rb:623
#, fuzzy
msgid "Delete configuration %1"
msgstr "Ingaba ucima ulwakhelo %1 ngoku?"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
#, fuzzy
msgid "Do not delete it"
msgstr "Uyayicima ngenene?"
@@ -2899,36 +2899,36 @@
#. 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:637
+#: src/include/printer/overview.rb:640
#, fuzzy
msgid "Confirm Deletion of a Class"
msgstr "Qinisekisa Ukuhlohla"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
msgid "A deleted class cannot be re-created with this tool."
msgstr ""
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
#, fuzzy
msgid "Rejecting Print Jobs"
msgstr "Kufunyenwe ii-Printer:"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
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:697
+#: src/include/printer/overview.rb:700
#, fuzzy
msgid "Printout Disabled"
msgstr "Kugqityiwe &ukuShicilela"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
msgid "The testpage cannot be printed because printout is disabled."
msgstr ""
@@ -2937,26 +2937,26 @@
#. 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:728
+#: src/include/printer/overview.rb:731
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:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
#, fuzzy
msgid "Delete Pending Print Jobs For %1"
msgstr "Kufunyenwe ii-Printer:"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
msgid "Delete them before printing testpage"
msgstr ""
#. 'No' 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:762
#, fuzzy
msgid "Print testpage after the other jobs"
msgstr "Shicilela into eza kunceda le modyuli"
@@ -2965,7 +2965,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:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
#, fuzzy
msgid "Failed to delete all pending jobs for %1."
msgstr "Kusilele ukuvavanya i- %1."
@@ -2985,26 +2985,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:799
+#: src/include/printer/overview.rb:802
#, fuzzy
#| msgid "&Test Printing"
msgid "Test printout"
msgstr "&Vavanya Ukushicilela"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
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:803
+#: src/include/printer/overview.rb:806
#, fuzzy
#| msgid "Print test page"
msgid "Single test page"
msgstr "Shicilela ikhasi lovavanyo"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
#, fuzzy
#| msgid "Print test page"
msgid "Two test pages"
@@ -3012,7 +3012,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:835
+#: src/include/printer/overview.rb:838
#, fuzzy
msgid "Failed to print testpage for %1."
msgstr "Kusilele ukuhlohla kombekelelo okufunekayo %1."
@@ -3021,19 +3021,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:852
+#: src/include/printer/overview.rb:855
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:856
+#: src/include/printer/overview.rb:859
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:861
+#: src/include/printer/overview.rb:864
#, fuzzy
#| msgid "Repair was successful"
msgid "Testpage printout was successful"
@@ -3041,7 +3041,7 @@
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
#, fuzzy
#| msgid "T&est Printing"
msgid "Testpage printing failed"
@@ -3063,56 +3063,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:897
+#: src/include/printer/overview.rb:900
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:925
+#: src/include/printer/overview.rb:928
#, fuzzy
msgid "Delete all pending jobs"
msgstr "Kufunyenwe ii-Printer:"
#. 'No' 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:931
#, fuzzy
msgid "Do not delete them"
msgstr "Uyayicima ngenene?"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr ""
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
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:1065
+#: src/include/printer/overview.rb:1068
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:1075
+#: src/include/printer/overview.rb:1078
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:1102
+#: src/include/printer/overview.rb:1105
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr ""
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
#, fuzzy
msgid "Cannot Modify"
msgstr "Ayikwazi kugxumekeka i-floppy"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr ""
Modified: trunk/yast/xh/po/rdp.xh.po
===================================================================
--- trunk/yast/xh/po/rdp.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/rdp.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -110,66 +110,66 @@
msgstr "Imimiselo ye-Firewall"
#. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
msgid "Write firewall settings"
msgstr "Bhala imimiselo ye-Firewall"
#. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
#, fuzzy
#| msgid "Configure Later"
msgid "Configure xrdp"
msgstr "Yenza Ubumbeko Kamva"
#. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
#, fuzzy
#| msgid "Restart the service"
msgid "Restart the services"
msgstr "Phinda uqalise inkonzo"
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
#, fuzzy
#| msgid "Stop services"
msgid "Stop the services"
msgstr "Nqumamisa iinkonzo"
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
#, fuzzy
#| msgid "Saving iSCSI Initiator Configuration"
msgid "Saving Remote Administration Configuration"
msgstr "Kugcinwa Ubumbeko Lomqalisi we-iSCSI"
#. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
msgid "Writing firewall settings..."
msgstr "Bhala imimiselo ye-Firewall"
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
#, fuzzy
#| msgid "Configuring runlevel..."
msgid "Configuring xrdp..."
msgstr "Kwenziwa ubumbeko lwenqanaba lokuqhuba"
#. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
#, fuzzy
#| msgid "Restarting service..."
msgid "Restarting the service..."
msgstr "Kuqaliswa inkonzo kwakhona..."
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
#, fuzzy
#| msgid "Stopping services..."
msgid "Stopping the service..."
msgstr "Kunqunyanyiswa iinkonzo..."
#. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
msgid "Remote administration is enabled."
msgstr "Ulawulo olumgama lwenziwe lwasebenza."
#. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
msgid "Remote administration is disabled."
msgstr "Ulawulo olumgama lwenziwe alwasebenza."
Modified: trunk/yast/xh/po/rear.xh.po
===================================================================
--- trunk/yast/xh/po/rear.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/rear.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -283,16 +283,16 @@
#: src/include/rear/ui.rb:698
#, fuzzy
+#| msgid "Reading general settings"
+msgid "Reading rear settings"
+msgstr "Kufundwa imimiselo jikelele"
+
+#: src/include/rear/ui.rb:698
+#, fuzzy
#| msgid "Analyzing your system..."
msgid "Analyzing system"
msgstr "Kuhlalutywa isixokelelwano sakho..."
-#: src/include/rear/ui.rb:698
-#, fuzzy
-#| msgid "Reading general settings"
-msgid "Reading rear settings"
-msgstr "Kufundwa imimiselo jikelele"
-
#: src/include/rear/ui.rb:699
#, fuzzy
#| msgid "Analyzing your system..."
Modified: trunk/yast/xh/po/registration.xh.po
===================================================================
--- trunk/yast/xh/po/registration.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/registration.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -13,31 +13,6 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-#, fuzzy
-msgid "Local Registration Servers"
-msgstr "Ikhowudi Yobhaliso"
-
-#: 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:68
-#, fuzzy
-msgid "No registration server selected."
-msgstr "Ikhowudi Yobhaliso"
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-#, fuzzy
-#| msgid "Novell Customer Center Configuration"
-msgid "SUSE Customer Center (%s)"
-msgstr "Ubumbeko Lweziko Somxumi we-Novell"
-
#. popup message
#. popup message
#. popup message
@@ -55,9 +30,9 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -73,25 +48,25 @@
msgstr ""
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
#, fuzzy
msgid "Registration was successfull."
msgstr "Ukukhanda kube yimpumelelo."
#. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
msgid "SLP discovery failed, no server found"
msgstr ""
#. download and install the specified SSL certificate to the system
#. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
#, fuzzy
#| msgid "Downloading SMT certificate file failed"
msgid "Downloading SSL Certificate"
msgstr "Ukukhuphela ifayili yesatifiketi se-SMT akuphumelelanga"
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
#, fuzzy
msgid "Importing SSL Certificate"
msgstr "&Isatifikethi Seseva"
@@ -99,8 +74,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -273,31 +248,27 @@
msgid "SHA256 Fingerprint: "
msgstr "Ushicilelo lomnwe: %1"
-#. Error popup
-#: 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 ""
-
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
#: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
+msgid "Connection time out."
msgstr ""
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
-msgid "Connection time out."
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:91
#, fuzzy
#| msgid "Destination is invalid."
msgid "Check that this system is known to the registration server."
msgstr "Indawo ekuthunyelwa kuyo into ayisebenzi."
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:97
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -313,35 +284,34 @@
#. 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: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
+#: 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:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
#, fuzzy
-#| msgid "Registration Code"
-msgid "Registration failed."
+msgid "Connection to registration server failed."
msgstr "Ikhowudi Yobhaliso"
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:121
#, fuzzy
msgid "Registration client error."
msgstr "Iinkcukacha Zobhaliso Ezifanele Ukusetyenziswa"
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:123
msgid ""
"Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:165
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:197
+#: src/lib/registration/connect_helpers.rb:198
#, fuzzy
#| msgid "Details..."
msgid "Details: %s"
@@ -350,7 +320,7 @@
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:227
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -360,23 +330,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:240
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:260
+#: src/lib/registration/connect_helpers.rb:261
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:279
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -384,6 +354,26 @@
"protocol is installed at the server."
msgstr ""
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+#, fuzzy
+#| msgid "Invalid time"
+msgid "Invalid URL."
+msgstr "Ixesha elingasebenzisekiyo"
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:296
+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:303
+msgid "Network error, check the network configuration."
+msgstr ""
+
#. progress step title
#: src/lib/registration/finish_dialog.rb:35
#, fuzzy
@@ -392,20 +382,20 @@
msgstr "Ibhala ubumbeko lokhokelo-mgaqo..."
#. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
msgid ""
"The base product was not found,\n"
"check your system."
msgstr ""
#. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
msgid ""
"The installation medium or the installer itself is seriously broken.\n"
"Report a bug at %s."
msgstr ""
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
msgid ""
"Make sure a product is installed and /etc/products.d/baseproduct\n"
"is a symlink pointing to the base product .prod file."
@@ -414,7 +404,7 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:272
msgid "Registering the System..."
msgstr ""
@@ -423,8 +413,8 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating boot options..."
@@ -432,7 +422,7 @@
msgstr "Ihlaziya iindlela zokukhetha ukuqalisa..."
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:166
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Synchronizing Products..."
@@ -444,31 +434,31 @@
#. @return [Array<Registration::Addon>] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:180
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
msgid "Loading Available Extensions and Modules..."
msgstr "Ikhowudi Yobhaliso"
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:195
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
msgstr "Ulwakhelo lokulowuda %1..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:213
#, fuzzy
msgid "Register Extensions and Modules"
msgstr "Ikhowudi Yobhaliso"
#. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:217
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:242
#, fuzzy
msgid ""
"The registration server offers update repositories.\n"
@@ -476,7 +466,7 @@
msgstr "Ikhowudi Yobhaliso"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:246
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
@@ -490,7 +480,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:250
#, fuzzy
#| msgid "Would you like to open this profile in editing mode?"
msgid ""
@@ -507,7 +497,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -518,41 +508,41 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
#, fuzzy
msgid "Unknown product"
msgstr "Ikhowdi Yemposiso Engaziwayo"
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
#, fuzzy
msgid "Saving repository configuration failed."
msgstr "Kuqaliswa Ukuhlohla..."
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:474
#, fuzzy
#| msgid "No product found in the catalog"
msgid ""
@@ -627,7 +617,11 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
#, fuzzy
#| msgid "Details..."
msgid "Details"
@@ -635,30 +629,30 @@
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
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
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
#, fuzzy
#| msgid "is not available"
msgid "%s (not available)"
msgstr "akufumaneki"
#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
msgid "YaST allows to select at most %s extensions or modules."
msgstr ""
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
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_base_dialog.rb:260
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
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 ""
@@ -674,7 +668,7 @@
msgstr ""
#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
msgid "Available Extensions and Modules"
msgstr ""
@@ -739,7 +733,7 @@
msgstr ""
#. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete '%s'?"
@@ -747,32 +741,32 @@
#. dialog definition for adding/editing an addon
#. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
#, fuzzy
#| msgid "Vendor Identifier"
msgid "Extension or Module &Identifier"
msgstr "Isalathisi Somthengisi"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "&Version"
msgstr "&Uhlelo"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
#, fuzzy
#| msgid "Architecture"
msgid "&Architecture"
msgstr "Inzululwazi yokwakha"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
#, fuzzy
#| msgid "Rule Type"
msgid "&Release Type"
msgstr "Uhlobo Lomthetho"
#. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
#, fuzzy
#| msgid "Registration Code"
msgid "Registration &Code"
@@ -807,10 +801,8 @@
msgid "Register the Product"
msgstr "Ikhowudi Yobhaliso"
-#. 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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
#, fuzzy
#| msgid "Email Address"
msgid "&E-mail Address"
@@ -821,39 +813,39 @@
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
#, fuzzy
msgid "Server Settings"
msgstr "Imimiselo Yeseva"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
#, fuzzy
msgid "Find Registration Server Using SLP Discovery"
msgstr "Ikhowudi Yobhaliso"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
msgid "Use Specific Server URL Instead of the Default"
msgstr ""
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
#, fuzzy
msgid "Optional SSL Server Certificate URL"
msgstr "&Isatifikethi Seseva"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
#, fuzzy
msgid "Optional SSL Server Certificate Fingerprint"
msgstr "&Isatifikethi Seseva"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
msgid "none"
msgstr "akukho nanye"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
#, fuzzy
#| msgid "Certificate File to Import"
msgid "SSL Certificate Fingerprint"
@@ -861,25 +853,36 @@
#. the UI defition for the main dialog
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
#, fuzzy
msgid "Register Extensions or Modules..."
msgstr "Ikhowudi Yobhaliso"
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
#, fuzzy
-msgid "&Local Registration Server..."
+#| msgid "Registration Code"
+msgid "Register System via %s"
msgstr "Ikhowudi Yobhaliso"
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
#, fuzzy
+msgid "Register System via local SMT Server"
+msgstr "Ikhowudi Yobhaliso"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#, fuzzy
+msgid "&Local Registration Server URL"
+msgstr "Ikhowudi Yobhaliso"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
+#, fuzzy
msgid "&Skip Registration"
msgstr "Ikhowudi Yobhaliso"
#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
#, fuzzy
msgid "&Register Extensions or Modules Again"
msgstr "Ikhowudi Yobhaliso"
@@ -888,53 +891,36 @@
#. @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/base_system_registration_dialog.rb:342
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr ""
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
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?"
+"Customer Center for online registration."
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
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
#, fuzzy
#| msgid "Novell Customer Center Configuration"
-msgid "Network Configuration..."
+msgid "Net&work Configuration..."
msgstr "Ubumbeko Lweziko Somxumi we-Novell"
#. SSL error message
@@ -962,22 +948,22 @@
#. help text (RichText) for importing a SSL certificate (1/5)
#: 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>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (2/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (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:131
-msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (4/5)
-#: 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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
msgstr ""
#. help text (RichText) for importing a SSL certificate (5/5)
@@ -985,19 +971,6 @@
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:67
-#, fuzzy
-#| msgid "Invalid time"
-msgid "Invalid URL."
-msgstr "Ixesha elingasebenzisekiyo"
-
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-#, fuzzy
-msgid "&Local Registration Server URL"
-msgstr "Ikhowudi Yobhaliso"
-
#. TRANSLATORS: error message, %s are details
#. TRANSLATORS: error message, %s are details
#: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -1032,21 +1005,21 @@
msgstr "Khetha umlayishi womiselo lwenkqubo phambi kokuhlela amacandelo."
#. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
#, fuzzy
#| msgid "Importing repositories..."
msgid "Manage Repositories..."
msgstr "Ingenisa imithombo..."
#. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
#, fuzzy
#| msgid "URL: %1"
msgid "URL: %s"
msgstr "I-URL: %1"
#. TRANSLATORS: summary text, %s is a repository priority (1-99)
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
#, fuzzy
#| msgid "Swap &Priority"
msgid "Priority: %s"
@@ -1117,19 +1090,19 @@
msgstr "Khetha umlayishi womiselo lwenkqubo phambi kokuhlela amacandelo."
#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
msgid "Manually Adjust the Repositories for Migration"
msgstr ""
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
#, fuzzy
#| msgid "P&ossible Solutions"
msgid "Possible Migration Targets"
msgstr "Izisombululo Ezi&nokwenzeka"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
#, fuzzy
#| msgid "Configuration Summary"
msgid "Migration Summary"
@@ -1141,14 +1114,14 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:214
+#: 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:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
#, fuzzy
#| msgid "Package %1 will be installed."
msgid "%s <b>will be installed.</b>"
@@ -1156,25 +1129,25 @@
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
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:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
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:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
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:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1228,19 +1201,85 @@
"You can manually register the system from scratch."
msgstr ""
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service] List of services to show.
+#. @param heading [String] Text to be shown as dialog heading. A default text
+#. will be used if it's not specified.
+#. @param description [String] Text to be shown as description. A default text
+#. will be used if it's not specified.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:64
#, fuzzy
+msgid "Local Registration Servers"
+msgstr "Ikhowudi Yobhaliso"
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:65
+msgid ""
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
+msgstr ""
+
+#: src/lib/registration/ui/regservice_selection_dialog.rb:67
+#, fuzzy
+msgid "No registration server selected"
+msgstr "Ikhowudi Yobhaliso"
+
+#. Default registration server
+#.
+#. return [String] Returns a string representing the default SCC service.
+#: src/lib/registration/ui/regservice_selection_dialog.rb:102
+#, fuzzy
+#| msgid "Novell Customer Center Configuration"
+msgid "SUSE Customer Center (%s)"
+msgstr "Ubumbeko Lweziko Somxumi we-Novell"
+
+#. @return [Array<Yast::SlpServiceClass::Service>]
+#: src/lib/registration/url_helpers.rb:220
+#, fuzzy
#| msgid "Checking..."
msgid "Searching..."
msgstr "Kuyaqwalaselwa..."
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:220
#, fuzzy
msgid "Looking up local registration servers..."
msgstr "li-1 inqaku leenkcukacha zobhaliso"
+#. Constructor
+#.
+#. @param services [Array<SlpServiceClass::Service>] list of services to show
+#. @param heading [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
#, fuzzy
+msgid "Service selection"
+msgstr "Imimiselo Yeseva"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+msgid "No service was selected."
+msgstr "Ikhowudi Yobhaliso"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registration failed."
+#~ msgstr "Ikhowudi Yobhaliso"
+
+#, fuzzy
+#~ msgid "&Local Registration Server..."
+#~ msgstr "Ikhowudi Yobhaliso"
+
+#, fuzzy
#~| msgid "Migration Details"
#~ msgid "Migration Repositories"
#~ msgstr "Iinkcukacha zoFuduko"
Modified: trunk/yast/xh/po/reipl.xh.po
===================================================================
--- trunk/yast/xh/po/reipl.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/reipl.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -24,11 +24,11 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:64
+#: src/clients/reipl_bootloader_finish.rb:66
msgid ""
"\n"
"After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
msgstr ""
#. TRANSLATORS: part of a shutdown message
@@ -36,7 +36,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -45,7 +45,7 @@
"and LUN '%3'.\n"
msgstr ""
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: trunk/yast/xh/po/samba-client.xh.po
===================================================================
--- trunk/yast/xh/po/samba-client.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/samba-client.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: samba-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -933,59 +933,59 @@
msgstr "Kuhlohlwa imibekelelo efunekayo..."
#. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
msgid "PAM Login"
msgstr "Ukungena kwe-PAM"
#. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
msgid "Use Kerberos"
msgstr "Sebenzisa i-Kerberos"
#. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
msgid "Do Not Use Kerberos"
msgstr "Musa Ukusebenzisa i-Kerberos"
#. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
msgid "Default Realm"
msgstr "Ilizwe Lengqikelelo Elihlala Likhona"
#. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
msgid "Default Domain"
msgstr "Ummandla Wolawulo Ohlala Ukhona"
#. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
msgid "KDC Server Address"
msgstr "Idilesi Yeseva ye-KDC"
#. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
msgid "Clock Skew"
msgstr "Ubugoso Bewotshi"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
msgid "<b>KDC Server</b>: %1<br>"
msgstr "<b>Seva ye-KDC</b>: %1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
#, fuzzy
#| msgid "<p><b>Workgroup or Domain</b>: %1</p>"
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<p><b>Iqela lomsebenzi okanye Ummandla wolawulo </b>: %1</p>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
msgid "<b>Default Realm</b>: %1<br>"
msgstr "Ilizwe Lengqikelelo Elihlala Likhona %1<br>"
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
#, fuzzy
#| msgid "Offline Authentication Enabled"
msgid "<b>Kerberos Authentication Enabled</b>: %1"
@@ -993,23 +993,23 @@
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "Ewe"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
msgid "No"
msgstr "Hayi"
#. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
msgid "Configuration Acquired via DNS"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
@@ -1018,7 +1018,7 @@
"Zama kwakhona.\n"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: trunk/yast/xh/po/samba-server.xh.po
===================================================================
--- trunk/yast/xh/po/samba-server.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/samba-server.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -243,11 +243,17 @@
#. TRANSLATORS: a popup message
#: src/include/samba-server/complex.rb:88
+#, fuzzy
+#| msgid ""
+#| "Because users are currently connected to this Samba server,\n"
+#| "the server configuration has been reloaded instead of restarted.\n"
+#| "To confirm that all settings are applied despite possibly disconnecting the users,\n"
+#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgid ""
"Because users are currently connected to this Samba server,\n"
"the server configuration has been reloaded instead of restarted.\n"
"To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
msgstr ""
"Ngenxa yokuba abasebenzisi okwangoku badibene kule seva ye-Samba,\n"
"ubumbeko lweseva luphinde lwalayishwa endaweni yokuphinda liqaliswe.\n"
Modified: trunk/yast/xh/po/security.xh.po
===================================================================
--- trunk/yast/xh/po/security.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/security.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: security\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -116,223 +116,223 @@
#. Authors: Michal Svec <msvec(a)suse.cz>
#.
#. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
msgid "Unknown"
msgstr "Akwaziwa"
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
#, fuzzy
msgid "Use magic SysRq keys"
msgstr "Nika Isakhono &Kumaqhosha &Obugqi EziceloZesixokelelwano"
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
#, fuzzy
msgid "Use secure file permissions"
msgstr "Sebenzisa Iimvume eziFunyenweyo"
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
#, fuzzy
msgid "Remote access to the display manager"
msgstr "Ufikeleleko Olumgama Kumphathi Wokubonisa"
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
msgid "Write back system time to the hardware clock"
msgstr ""
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
msgid "Always generate syslog message for cron scripts"
msgstr ""
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
#, fuzzy
msgid "Run the DHCP daemon in a chroot"
msgstr "Qhuba nge-Daemon ye-NTP kwi-Chroot &Jail"
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
msgid "Run the DHCP daemon as dhcp user"
msgstr ""
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
#, fuzzy
msgid "Remote root login in the display manager"
msgstr "Ufikeleleko Olumgama Kumphathi Wokubonisa"
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
#, fuzzy
msgid "Remote access to the X server"
msgstr "Ufikeleleko Olumgama Kumphathi Wokubonisa"
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
#, fuzzy
msgid "Remote access to the email delivery subsystem"
msgstr "Ufikeleleko Olumgama Kumphathi Wokubonisa"
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
#, fuzzy
msgid "Restart services on update"
msgstr "Inkonzo esuswe isakhono"
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
#, fuzzy
msgid "Stop services on removal"
msgstr "Inkonzo esuswe isakhono"
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
#, fuzzy
msgid "Enable TCP syncookies"
msgstr "Iinkonzo ze-VPN Ezinikwe Isakhono"
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
#, fuzzy
msgid "IPv4 forwarding"
msgstr "Yenza Ukuthumela i-IP kusebenza"
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
#, fuzzy
msgid "IPv6 forwarding"
msgstr "Yenza Ukuthumela i-IP kusebenza"
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
#, fuzzy
#| msgid "Enable the service"
msgid "Enable basic system services"
msgstr "Nika isakhono kwinkonzo"
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
#, fuzzy
#| msgid "Disable the service"
msgid "Disable extra services"
msgstr "Susa isakhono kwinkonzo"
#. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
#, fuzzy
msgid "Configure"
msgstr "&Yenza ubumbeko_"
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
msgid "Enabled"
msgstr "Kunikwe isakhono"
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
msgid "Disabled"
msgstr "Kususwe isakhono"
#. table header
#. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
#, fuzzy
msgid "Security Setting"
msgstr "Imimiselo Yokhuseleko"
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
msgid "Status"
msgstr "Isimo"
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
#, fuzzy
msgid "Security Status"
msgstr "Imimiselo Yokhuseleko"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
msgid "Help"
msgstr "Nceda"
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
msgid " or "
msgstr ""
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
#, fuzzy
msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
msgstr ""
"Ezi nkonzo zifunekayo zilahlekile:\n"
"%1."
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
msgid "<P>All basic services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
#, fuzzy
msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
msgstr ""
"Ezi nkonzo zifunekayo zilahlekile:\n"
"%1."
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
msgid "<P>Only basic system services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
msgid "Description"
msgstr "Inkcazelo"
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
#, fuzzy
msgid "Security Overview"
msgstr "Ulwazi Gabalala Ngamaqhosha Awodwa"
#. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
#, fuzzy
msgid "Change &Status"
msgstr "Tshintsha oku?"
#. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
msgid "&Description"
msgstr "&Inkcazelo"
#. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
#, fuzzy
#| msgid "Analyzing your system..."
msgid "Analyzing system"
msgstr "Kuhlalutywa isixokelelwano sakho..."
#. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr "Imimiselo Yomiselo Lwenkqubo"
#. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
msgid "Boot Permissions"
msgstr "Iimvume Zomiselo Lwenkqubo"
#. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
msgid "Miscellaneous Settings"
msgstr "Imimiselo Yentlaninge"
#. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
msgid "Password Settings"
msgstr "Imimiselo Yegama Lokugqithisa"
#. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
msgid "Checks"
msgstr "Iziganeko zoqwalaselo"
#. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
msgid "Password Age"
msgstr "Ubudala Begama Logqithiselo"
#. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
@@ -341,7 +341,7 @@
"likhulu kunelona likhulu."
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
@@ -350,17 +350,17 @@
"Obona bude bukhulu begama lokugqithisa ngendlela ekhethiweyo yoguqulelo oluntsonkothileyo lolu %1."
#. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr "Imimiselo Yokungena"
#. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
msgid "Login"
msgstr "Ngena"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -369,7 +369,7 @@
"<br>Nceda linda...<br></p>"
#. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -378,7 +378,7 @@
"Lahla ngokhuselo ukusetyenziswa kobumbeko ngokucinezela <b>u-Lahla</b> ngoku.</p>"
#. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -387,7 +387,7 @@
"<br>Nceda linda...<br></p>"
#. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.</p>"
@@ -395,53 +395,9 @@
"<p><b><big>Kulahlwa Ukugcina</big></b><br>\n"
"Lahla inkqubo yokugcina ngokucinezela <b>u-Lahla</b>.</p>"
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>Ukhuseleko Lomiselo Lwenkqubo</big></b></p>\n"
-"<p>Kule ngxoxo, guqula imimiselo eyahlukahlukileyo yomiselo lwenkqubo olunxulumene nokhuseleko.</p>"
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
#: src/include/security/helps.rb:59
msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-"<p><b>Ukutolikwa kwamaqhosha e-Lawula + Okukokunye + Cima</b>:\n"
-"Yenza ubumbeko lokuba ingaba isixokelelwano sifanele ukwenza ntoni njengempendulo\n"
-" eya emntwini okwisixhasi kucinezelwa umdibaniselo we-LAWULA + OKUKOKUNYE + CIMA \n"
-" wamaqhosha. Isixokelelwano sikholisa ukuphinda simisele inkqubo. Maxa wambi yinto enqwenelekayo\n"
-" ukungasihoyi esi siganeko, umzekelo, xa isixokelelwano sisenza inkonzo yesikhululo somsebenzi \n"
-" kunye neyeseva.</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-#, fuzzy
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>\n"
-msgstr ""
-"<p><b>Ukuziphatha Kokuvalwa Ngci kwe-KDM</b>:\n"
-"Misela ukuba ngubani ovunyelwe ukuvala ngci umatshini ovela kwi-KDM.</p>"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-msgid ""
"<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
"<p>Using predefined defaults, change the local security settings, which include\n"
" booting, login, password, user creation, and file permissions. The default\n"
@@ -455,7 +411,7 @@
" </p>"
#. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
#, fuzzy
#| msgid ""
#| "<p><b>Networked Workstation</b>: For a computer connected\n"
@@ -468,14 +424,14 @@
"nakoluphi uhlobo lomsebenzi wothungelwano obandakanya Unxibelelwano Ngekhompyutha.</p>"
#. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
msgid ""
"<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
"that connects to different networks.</p>"
msgstr ""
#. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
@@ -484,13 +440,13 @@
"naluphi uhlobo lwenkonzo.</p>"
#. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
#, fuzzy
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr "<p>Faka <b>Uhlelo</b> lolwakhelo lomfanekiso wakho.</p>"
#. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -501,7 +457,7 @@
" igcinwa ubukhulu becala apha /njl.njl./ngena.iifayili.ezihlalazikhona.</p>"
#. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
msgid ""
"<p><b>Delay after Incorrect Login Attempt:</b>\n"
"It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -513,7 +469,7 @@
" ukuqashisela ngegama lokugqithisa. Lenze ixesha libe ncinci ngokwaneleyo ukuze abasebenzisi kungafuneki balinde xa kufuneka bezame kwakhona ngenxa yegama lokugqithisa elingachwethezwanga ngokungachanekanga. Ixabiso elinengqiqo evakalayo yimizuzwana emithathu (<tt>3</tt>).</p>"
#. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
#, fuzzy
msgid ""
"<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
@@ -527,7 +483,7 @@
" </p>"
#. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
msgid ""
"<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
"to a graphical login screen for this machine over the network. Remote access\n"
@@ -538,7 +494,7 @@
" kumatshini wakho ngokusebenzisa umlawuli womboniso kusenokwenza umngcipheko wokhuseleko.</p>"
#. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
@@ -547,7 +503,7 @@
"ilondolozwa ubukhulu becala apha jl.njl./ngena.iifayili.ezihlalazikhona.</p>"
#. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
msgid ""
"<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
"cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -558,7 +514,7 @@
" Ngokuqwalasela ibhokisi, unyanzelisa ukuqwalasela igama lokugqithisa malunga nale mithetho.</p>"
#. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
#, fuzzy
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
@@ -573,7 +529,7 @@
" licinezela olu qwalaselo.</p>"
#. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -584,12 +540,12 @@
" Ngenisa u-0 xa amagama okugqithisa engafanelanga kulondolozwa.</p>"
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
msgid "<p><b>Password Encryption Method:</b></p>"
msgstr "<p><b>Indlela Yoguqulelo Oluntsonkothileyo Yamagama Okugqithisa:</b></p>"
#. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
#, fuzzy
#| msgid ""
#| "<p><b>des</b>, the Linux default method, works in all network environments,\n"
@@ -605,7 +561,7 @@
" ungqinelwano nezinye izixokelelwano, sebenzisa le ndlela.</p>"
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
msgid ""
"<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
"distributions, but not by other systems or old software.</p>"
@@ -614,12 +570,12 @@
"bangoku, kodwa ingezizo ezinye izixokelelwano okanye okungaphakathi ekhompyutheni okudala.</p>"
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
msgstr ""
#. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
@@ -628,7 +584,7 @@
"nelilelona lininzi elinokusetyenziswa ngalo igama lokugqithisa.</p>"
#. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
msgid ""
"<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
"number of days users are warned before their passwords expire. The longer the\n"
@@ -638,7 +594,7 @@
"bexesha, kuya ngokuba yinto enqabileyo ukuba umntu aqashisele ngamagama okugqithisa.</p>"
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
@@ -647,7 +603,7 @@
"<p>Kule ngxoxo, guqula imimiselo eyahlukahlukileyo esetyenziselwa ukudala abasebenzisi.</p>"
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
@@ -656,14 +612,14 @@
"Misela eyona ID incinci neyona inkulu enokwenzeka yomsebenzisi.</p>"
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
msgstr "<p><b>Iminyino ye-ID Yeqela:</b>Misela eyona ID incinci neyona inkulu enokwenzeka yeqela.</p>"
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
@@ -672,7 +628,7 @@
"<p>Kule ngxoxo, guqula imimiselo eyintlaninge enxulumene nokhuseleko lwendawo leyo.</p>"
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
msgid ""
"<p><b>File Permissions</b>: Settings for the permissions\n"
"of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -704,7 +660,7 @@
" wenze isigqibo sokuba ngabaphi abasebenzisi abakwaziyo ukuqhuba iinkqubo ze-X kunye neenkqubo ze-setuid.</p>\n"
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
msgid ""
"<p><b>User Launching updatedb</b>: The program updatedb runs \n"
"once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -719,7 +675,7 @@
" (iifayili ezimbalwa) okanye <b>ingcambu yamandla</b> (zonke iifayili).</p>"
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
msgid ""
"<p><b>Current Directory in root's Path</b> On a DOS system,\n"
"the system first searches for executable files (programs) in the current\n"
@@ -732,7 +688,7 @@
" sizizingela ngendlela ekhethekileyo ngokudlula kwindlela yothungelwano (isiguquguquki INDLELA YOTHUNGELWANO).</p>"
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
msgid ""
"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
"system first searches for executable files (programs) in the current directory\n"
@@ -745,7 +701,7 @@
" sizizingela ngendlela ekhethekileyo ngokudlula kwindlela yothungelwano (isiguquguquki INDLELA YOTHUNGELWANO).</p>"
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
msgid ""
"<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
"search path, enabling files in the current path to be found and executed.\n"
@@ -761,7 +717,7 @@
" kuthande ukuba lula ukuba umisela esi sikhethwa.</p>"
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
msgid ""
"<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
"path of root, making it the last to be searched.</p>"
@@ -770,7 +726,7 @@
"yozingelo, nto leyo eyenza ukuba kube lelokugqibela elizingelwayo.</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
@@ -779,7 +735,7 @@
"kuvimba weefayili wakwangoku onesimaphambili esingu-\"./\". Umzekelo: \"./yenza ubumbeko\".</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
msgid ""
"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
"will have some control over the system even if it crashes (for example, during kernel\n"
@@ -790,26 +746,26 @@
" kwe-kernel). Ngobucukubhede, jonga apha /usr/src/linux/Ugcinomawebhu/izicelozesixokelelwano.txt</p>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
msgid "<P>To change the current value, click the link associated to the option.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr ""
#. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
msgstr ""
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
msgid ""
"<P>A display manager provides a graphical login screen and can be accessed\n"
"across the network by an X server running on another system if so\n"
@@ -821,7 +777,7 @@
"logins, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
msgid ""
"<P>Upon startup, the system time is being set from the hardware clock of the\n"
"computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -829,23 +785,23 @@
"correct log messages.</P>"
msgstr ""
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
msgstr ""
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
msgstr ""
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
msgstr ""
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
msgstr ""
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
msgid ""
"<P>X Window clients, e.g. programs that open a window on your display, connect\n"
"to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -857,13 +813,13 @@
"Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>"
msgstr ""
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
msgid ""
"<P>The email delivery subsystem is always started. However, it does not expose\n"
"itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"updated, the service is restarted after the files in the package have been\n"
@@ -875,7 +831,7 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"uninstalled, the service is stopped before the files of the package are\n"
@@ -887,23 +843,23 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
msgstr ""
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
#, fuzzy
msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
msgstr ""
@@ -911,18 +867,113 @@
"uya kuba nolawulo oluthile phezu kwesixokelelwano nokuba kwenzeka ubutyobo (umzekelo, ngethuba lokucokiswa\n"
" kwe-kernel). Ngobucukubhede, jonga apha /usr/src/linux/Ugcinomawebhu/izicelozesixokelelwano.txt</p>"
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
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:330
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:352
+#: src/include/security/helps.rb:333
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 ""
+#: src/include/security/helps.rb:341
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>Ukhuseleko Lomiselo Lwenkqubo</big></b></p>\n"
+"<p>Kule ngxoxo, guqula imimiselo eyahlukahlukileyo yomiselo lwenkqubo olunxulumene nokhuseleko.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Ukutolikwa kwamaqhosha e-Lawula + Okukokunye + Cima</b>:\n"
+"Yenza ubumbeko lokuba ingaba isixokelelwano sifanele ukwenza ntoni njengempendulo\n"
+" eya emntwini okwisixhasi kucinezelwa umdibaniselo we-LAWULA + OKUKOKUNYE + CIMA \n"
+" wamaqhosha. Isixokelelwano sikholisa ukuphinda simisele inkqubo. Maxa wambi yinto enqwenelekayo\n"
+" ukungasihoyi esi siganeko, umzekelo, xa isixokelelwano sisenza inkonzo yesikhululo somsebenzi \n"
+" kunye neyeseva.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Ukutolikwa kwamaqhosha e-Lawula + Okukokunye + Cima</b>:\n"
+"Yenza ubumbeko lokuba ingaba isixokelelwano sifanele ukwenza ntoni njengempendulo\n"
+" eya emntwini okwisixhasi kucinezelwa umdibaniselo we-LAWULA + OKUKOKUNYE + CIMA \n"
+" wamaqhosha. Isixokelelwano sikholisa ukuphinda simisele inkqubo. Maxa wambi yinto enqwenelekayo\n"
+" ukungasihoyi esi siganeko, umzekelo, xa isixokelelwano sisenza inkonzo yesikhululo somsebenzi \n"
+" kunye neyeseva.</p>"
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+"<p><b>Ukutolikwa kwamaqhosha e-Lawula + Okukokunye + Cima</b>:\n"
+"Yenza ubumbeko lokuba ingaba isixokelelwano sifanele ukwenza ntoni njengempendulo\n"
+" eya emntwini okwisixhasi kucinezelwa umdibaniselo we-LAWULA + OKUKOKUNYE + CIMA \n"
+" wamaqhosha. Isixokelelwano sikholisa ukuphinda simisele inkqubo. Maxa wambi yinto enqwenelekayo\n"
+" ukungasihoyi esi siganeko, umzekelo, xa isixokelelwano sisenza inkonzo yesikhululo somsebenzi \n"
+" kunye neyeseva.</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+#, fuzzy
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+"<p><b>Ukuziphatha Kokuvalwa Ngci kwe-KDM</b>:\n"
+"Misela ukuba ngubani ovunyelwe ukuvala ngci umatshini ovela kwi-KDM.</p>"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+
#. level name
#: src/include/security/levels.rb:54
msgid "Workstation"
@@ -988,176 +1039,249 @@
"Elona nani lincinci le-ID alinakuba likhulu \n"
"kunelona likhulu."
-#. ComboBox label
-#: src/include/security/widgets.rb:100
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "&Ukutolikwa kwe-Lawula + Okukokunye + Cima"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
+#. 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: include/security/widgets.ycp
+#. * Module: Security configuration
+#. * Summary: Security widgets definitions
+#. * Authors: Michal Svec <msvec(a)suse.cz>
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
msgid "Ignore"
msgstr "Musa ukuhoya"
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
msgid "Reboot"
msgstr "Phinda umisele inkqubo"
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
msgid "Halt"
msgstr "Ziziliza"
+#: src/include/security/widgets.rb:93
+msgid "Only root"
+msgstr "Ingcambu Kuphela"
+
+#: src/include/security/widgets.rb:94
+msgid "All Users"
+msgstr "Bonke Abasebenzisi"
+
+#: src/include/security/widgets.rb:95
+msgid "Nobody"
+msgstr "Akukho mntu"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "&Ukutolikwa kwe-Lawula + Okukokunye + Cima"
+
#. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
msgid "Allow Remote &Graphical Login"
msgstr "Vumela Ukungena Okumgama &Kwegrafu"
#. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
#, fuzzy
#| msgid "Enable &Magic SysRq Keys"
msgid "&Magic SysRq Keys"
msgstr "Nika Isakhono &Kumaqhosha &Obugqi EziceloZesixokelelwano"
#. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
#, fuzzy
#| msgid "Disabled"
msgid "Disable"
msgstr "Kususwe isakhono"
#. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
#, fuzzy
#| msgid "Enable AppArmor Functions"
msgid "Enable All Functions"
msgstr "Yenza Imisebenzi ye-AppArmor isebenze"
#. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
msgid "&Delay after Incorrect Login Attempt"
msgstr "&Ukubanjezelwa emva Kwelinge Lokungena Elingachanekanga"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
msgid "Maxim&um"
msgstr "Elona li&phezulu"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
msgid "M&inimum"
msgstr "Okona ku&ncinci"
#. ComboBox label
-#: src/include/security/widgets.rb:154
+#: src/include/security/widgets.rb:164
#, fuzzy
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "Ukuziphatha &Kokuvala Ngci kwe-KDM:"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-msgid "Only root"
-msgstr "Ingcambu Kuphela"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-msgid "All Users"
-msgstr "Bonke Abasebenzisi"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-msgid "Nobody"
-msgstr "Akukho mntu"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
-#, fuzzy
#| msgid "System Designation"
msgid "System Hybernation"
msgstr "Ukuyilwa kweNkqubo"
#. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
#, fuzzy
#| msgid "Cannot open the virtual machine console."
msgid "User on the active console"
msgstr "Ayikwazi kuvula isixhasi sikamatshini wenyani."
#. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
msgid "Anyone can hibernate"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
#, fuzzy
#| msgid "Authentication Data"
msgid "Authentication always required"
msgstr "Iinkcukacha Zongqinelwano Ngobunyani"
#. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
msgid "P&assword Encryption Method"
msgstr "Indlela Yokwenza Uguqulelo Oluntsonkothileyo Lwegama Lo&kugqithisa"
#. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
msgid "&Check New Passwords"
msgstr "&Qwalasela Amagama Okugqithisa Amatsha"
#. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
msgid "Numb&er of Passwords to Remember"
msgstr "Ina&ni Lamagama Okugqithisa afanele Ukukhunjulwa"
#. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
msgid "&Minimum Acceptable Password Length"
msgstr "Obona Bude &Buncinci Begama Lokugqithisa Obuvumelekileyo"
#. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
msgid "&Days before Password Expires Warning"
msgstr "&Iintsuku phambi Kwesilumkiso Sokudlulelwa Lixesha Legama Lokugqithisa"
#. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
msgid "&File Permissions"
msgstr "Iimvume &Zefayili"
#. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
msgid "Easy"
msgstr "Kulula"
#. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
msgid "Secure"
msgstr "Ukhuseleko"
#. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
msgid "Paranoid"
msgstr "i-Paranoid"
#. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
msgid "&User Launching updatedb"
msgstr "&Umsebenzisi Wazisa Ngokundulula uhlaziyo lwe-db:"
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
msgid "Ma&ximum"
msgstr "Okona ku&khulu"
#. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
msgid "&Minimum"
msgstr "&Okona kuncinci"
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "Ukuziphatha &Kokuvala Ngci kwe-KDM:"
+
#: src/include/security/wizards.rb:53
#, fuzzy
msgid "Predefined Security Configurations"
@@ -1174,66 +1298,66 @@
msgstr "Kuyandululwa..."
#. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
msgid "Saving Security Configuration"
msgstr "Kugcinwa Ubumbeko Lokhuseleko"
#. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
msgid "Write security settings"
msgstr "Bhala imimiselo yokhuseleko"
#. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
msgid "Write inittab settings"
msgstr "Bhala imimiselo yesilungelelanisi se-init"
#. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
msgid "Write PAM settings"
msgstr "Kubhalwa imimiselo ye-PAM"
#. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
#, fuzzy
#| msgid "Save system settings"
msgid "Update system settings"
msgstr "Gcina imimiselo yesixokelelwano"
#. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
msgid "Writing security settings..."
msgstr "Kubhalwa imimiselo yokhuseleko..."
#. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
msgid "Writing inittab settings..."
msgstr "Kubhalwa imimiselo yesilungelelanisi semigca ye-init..."
#. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
msgid "Writing PAM settings..."
msgstr "Kubhalwa imimiselo ye-PAM..."
#. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
#, fuzzy
#| msgid "Saving system settings..."
msgid "Updating system settings..."
msgstr "Kugcinwa imimiselo yesixokelelwano..."
#. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
msgid "Finished"
msgstr "Kugqityiwe"
#. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
msgid "Current Security Level: Custom settings"
msgstr "Inqanaba Lokhuseleko Langoku: Imimiselo elungiselweyo"
#. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
msgid "Current Security Level: %1"
msgstr "Inqanaba Lokhuseleko Langoku: %1"
Modified: trunk/yast/xh/po/services-manager.xh.po
===================================================================
--- trunk/yast/xh/po/services-manager.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/services-manager.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -299,13 +299,13 @@
#. 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
+#: src/modules/services_manager_service.rb:415
#, fuzzy
#| msgid "Could not add interface."
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr "Akubanga nako ukongeza intsebenziswano."
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
#, fuzzy
#| msgid "Could not add interface."
msgid "Could not %{change} %{service}. "
Modified: trunk/yast/xh/po/snapper.xh.po
===================================================================
--- trunk/yast/xh/po/snapper.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/snapper.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -48,14 +48,14 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
msgid "Description"
msgstr "Inkcazelo"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
#, fuzzy
#| msgid "&User Map"
msgid "User data"
@@ -63,45 +63,45 @@
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
#, fuzzy
#| msgid "C&leanup Script"
msgid "Cleanup algorithm"
msgstr "C&oca iSikripti"
#. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
+#: src/include/snapper/dialogs.rb:161
msgid "Modify Snapshot %{num}"
msgstr ""
#. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
+#: src/include/snapper/dialogs.rb:167
msgid "Modify Snapshot %{pre} and %{post}"
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:161
+#: src/include/snapper/dialogs.rb:169
#, fuzzy
#| msgid "(%1)"
msgid "Pre (%{pre})"
msgstr "(%1)"
#. label
-#: src/include/snapper/dialogs.rb:165
+#: src/include/snapper/dialogs.rb:173
#, fuzzy
#| msgid "USB port (%1)"
msgid "Post (%{post})"
msgstr "Isiqhagamshelanisi se-USB (%1)"
#. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:250
#, fuzzy
#| msgid "Create New Partition"
msgid "Create New Snapshot"
msgstr "Dala Isahlulelo Esitsha"
#. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:263
#, fuzzy
#| msgid "Reading list of users..."
msgid "Single snapshot"
@@ -109,250 +109,250 @@
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
msgid "Pre"
msgstr "Phambi"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:282
msgid "Post, paired with:"
msgstr ""
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:358
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete snapshot %{num}?"
msgstr "Uyayicima ngenene i-'%1'?"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
+#: src/include/snapper/dialogs.rb:365
#, fuzzy
#| msgid "Really delete '%1'?"
msgid "Really delete snapshots %{pre} and %{post}?"
msgstr "Uyayicima ngenene i-'%1'?"
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:380
msgid "Snapshots"
msgstr ""
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:409
#, fuzzy
#| msgid "Singapore"
msgid "Single"
msgstr "i-Singapore"
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:434
msgid "Pre & Post"
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:469
#, fuzzy
#| msgid "Reading list of users..."
msgid "Reading list of snapshots..."
msgstr "Ifunda uluhlu lwabasebenzisi…"
#. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:485
#, fuzzy
#| msgid "Cl&ear Current Configuration"
msgid "Current Configuration"
msgstr "Su&sa ubuMbeko Lwangoku"
#. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:496
msgid "ID"
msgstr "i-ID"
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:497
msgid "Type"
msgstr "Uhlobo"
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:498
msgid "Start Date"
msgstr "Qalisa Umhla"
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:499
msgid "End Date"
msgstr "Gqibelisa Umhla"
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:501
#, fuzzy
#| msgid "Us&er Data"
msgid "User Data"
msgstr "Iinkcukacha Zoms&ebenzisi"
#. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:507
#, fuzzy
#| msgid "No Change"
msgid "Show Changes"
msgstr "Akukho Tshintsho"
#. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:510
#, fuzzy
#| msgid "&Modify"
msgid "Modify"
msgstr "&Lungisa"
#. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:553
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:634
+#: src/include/snapper/dialogs.rb:638
#, fuzzy
#| msgid "Selected IDE device"
msgid "Selected Snapshot Overview"
msgstr "Isixhobo se-IDE esikhethiweyo"
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:670
#, fuzzy
#| msgid "Next %1: %2"
msgid "%1: %2"
msgstr "Okulandelayo %1: %2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:689
#, fuzzy
#| msgid "Saving changes to the files..."
msgid "Calculating changed files..."
msgstr "Ukugcina utshintsho kwiifayili..."
#. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:699
#, fuzzy
#| msgid "Accepting failed verifications"
msgid "Calculating file modifications..."
msgstr "Kwamkelwa iziqinisekiso ezisileleyo"
#. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:707
msgid "New file was created."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:711
msgid "File was removed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:716
msgid "File content was not changed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:722
#, fuzzy
#| msgid "File %1 does not exists"
msgid "File does not exist in either snapshot."
msgstr "Ifayili %1 ayikho"
#. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:728
#, fuzzy
#| msgid "File Contents: %1"
msgid "File content was modified."
msgstr "Iziqulatho zeFayili: %1"
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:738
msgid "File mode was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:753
msgid "File user ownership was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:769
msgid "File group ownership was changed from '%1' to '%2'."
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:786
#, fuzzy
#| msgid "Restored Files:"
msgid "R&estore from First"
msgstr "Iifayili Ezibuyiselweyo:"
#. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:788
#, fuzzy
#| msgid "Restore Options"
msgid "Restore"
msgstr "Buyisela Izikhethwa"
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:811
#, fuzzy
#| msgid "Network Device Select"
msgid "Res&tore from Second"
msgstr "Ukukhethwa Kwesixhobo Somsebenzi Wothungelwano"
#. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:848
msgid "Show the difference between snapshot and current system"
msgstr ""
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:860
msgid "Show the difference between current and selected snapshot:"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:907
msgid "Show the difference between first and second snapshot"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:918
msgid "Show the difference between first snapshot and current system"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:929
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:954
+#: src/include/snapper/dialogs.rb:958
msgid "Time of taking the snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:966
msgid "Time of taking the first snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:971
msgid "Time of taking the second snapshot:"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:994
msgid "&Open"
msgstr "&Vula"
#. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1040
#, fuzzy
#| msgid "Network Device Select"
msgid "Restore Selected"
msgstr "Ukukhethwa Kwesixhobo Somsebenzi Wothungelwano"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1125
#, fuzzy
#| msgid "Do you really want to delete this entry?"
msgid ""
@@ -365,7 +365,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:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -375,21 +375,21 @@
msgstr ""
#. popup message
-#: src/include/snapper/dialogs.rb:1187
+#: src/include/snapper/dialogs.rb:1191
#, fuzzy
#| msgid "No package has been selected for installation."
msgid "No file was selected for restoring."
msgstr "Akukho mbekelelo okhethelwe ukuhlohla."
#. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1201
#, fuzzy
#| msgid "Restoring Files"
msgid "Restoring files"
msgstr "Ukubuyisela Iifayili"
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1204
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
Modified: trunk/yast/xh/po/storage.xh.po
===================================================================
--- trunk/yast/xh/po/storage.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/storage.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -107,8 +107,7 @@
msgstr "&Dala Isiqhelo sokuMisela iNkqubo yesaHlulelo"
#. popup text
-#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -200,7 +199,13 @@
msgid "Not enough space available to propose separate /home."
msgstr ""
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
+#, fuzzy
+#| msgid "Set global root filesystem"
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr "Misela isixokelelwano seefayili sengcambu yamandla sehlabathi"
+
+#: src/clients/inst_disk_proposal.rb:304
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -1032,7 +1037,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6272
msgid "Propose Separate &Home Partition"
msgstr "Ndulula isaHlulelo &eSihlukileyo seKhaya"
@@ -1051,7 +1056,7 @@
msgstr "Uhlobo lwesindululo"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
#, fuzzy
msgid ""
"You have not assigned a root partition for\n"
@@ -1065,7 +1070,7 @@
" Yabela ingcambu yendawo yokugxumeka \"/\" kwisahlulelo.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
#, fuzzy
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
@@ -1079,7 +1084,7 @@
" Sebenzisa isixokelelwano sefayili se-Linux, esinjengo ext2 okanye reiserfs, ngezi ndawo zokugxumeka.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
#, fuzzy
msgid ""
"You tried to mount a FAT partition to the\n"
@@ -1093,7 +1098,7 @@
" Sebenzisa isixokelelwano sefayili se-Linux, esinjengo ext2 okanye reiserfs, ngezi ndawo zokugxumeka.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
#, fuzzy
msgid ""
"You have mounted a partition with Btrfs to the\n"
@@ -1108,7 +1113,7 @@
#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1118,7 +1123,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
#, fuzzy
msgid ""
"Warning:\n"
@@ -1139,7 +1144,7 @@
" Tshintsha oku?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
#, fuzzy
msgid ""
"Warning:\n"
@@ -1155,7 +1160,7 @@
" Ingaba uyafuna na ukwenza oku?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1167,7 +1172,7 @@
#. 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:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
#, fuzzy
msgid ""
"Warning: There is no partition mounted as /boot.\n"
@@ -1185,7 +1190,7 @@
" Ingaba ufuna ukutshintsha ukumisela inkqubo kwakho?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
#, fuzzy
msgid ""
"Warning: According to your setup, you intend to\n"
@@ -1206,11 +1211,11 @@
" \n"
" Tshintsha oku?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
"Really use this setup?\n"
msgstr ""
@@ -1370,7 +1375,7 @@
" Ingaba ufuna ukutshintsha ukumisela inkqubo kwakho?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1379,7 +1384,7 @@
"Sishenxise kwi-RAD ngaphambi kokusihlela.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1388,7 +1393,7 @@
"Sishenxise kwiqela ngaphambi kokusihlela.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1397,7 +1402,7 @@
"Shenxise isandi ngaphambi kokusihlela.\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1406,7 +1411,7 @@
"Sishenxisa kwi-RAID ngaphambi kokusihlela.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1414,13 +1419,13 @@
"Isixhobo (%2) sisetyenziswa ngu %1.\n"
"Shenxisa u %1 ngaphambi kokusicima.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
#, fuzzy
msgid "It cannot be deleted while mounted."
msgstr "Isixhobo sacinywa."
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
#, fuzzy
#| msgid ""
#| "The device (%1) cannot be removed\n"
@@ -1435,7 +1440,7 @@
" sobuchule esinenombolo ephezulu esetyenzisiweyo.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
#, fuzzy
#| msgid ""
#| "The selected extended partition contains partitions which are currently mounted:\n"
@@ -1454,7 +1459,7 @@
" Nced khetha u-Hlaba ngaphandle kokuba uyaya kanye into oyenzayo.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1469,7 +1474,7 @@
" ngaphambi kokucima isahlulelo esandisiweyo.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1484,7 +1489,7 @@
" kokucima isahlulelo esandisiweyo.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1505,15 +1510,15 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6400
#, fuzzy
#| msgid "Do not forget what you enter here."
msgid "Do not forget what you enter here!"
msgstr "Ungakulibali okungenise apha."
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
#, fuzzy
msgid "Empty password allowed."
msgstr "Uluhlu lwamagama esikhethwa esingenanto aluvumelekanga."
@@ -1549,7 +1554,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
#, fuzzy
#| msgid "&Enter a password for your file system:"
msgid "&Enter a Password for your File System:"
@@ -1562,7 +1567,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:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
#, fuzzy
#| msgid "Reenter the password for &verification:"
msgid "Reenter the Password for &Verification:"
@@ -1588,7 +1593,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1599,7 +1604,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -2023,7 +2028,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6253
msgid "Enable Snapshots"
msgstr ""
@@ -2042,19 +2047,19 @@
msgid "Empty subvolume name not allowed."
msgstr "Uluhlu lwamagama esikhethwa esingenanto aluvumelekanga."
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
#, fuzzy
#| msgid "Provider name %1 already exists."
msgid "Subvolume name %1 already exists."
msgstr "Igama lomboneleli%1 sele likhona."
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -2097,7 +2102,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
#, fuzzy
msgid ""
"<p>\n"
@@ -2117,7 +2122,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -2136,7 +2141,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2168,7 +2173,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2402,7 +2407,7 @@
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
msgid ""
"\n"
"WARNING:\n"
@@ -2417,12 +2422,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2430,32 +2435,32 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
#, fuzzy
#| msgid "Mount"
msgid "Unmount"
msgstr "Gxumeka"
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
#, fuzzy
#| msgid "It is not possible to delete a NIS user."
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "Yinto enako ukwenzeka ukucima umsebenzisi we-NIS."
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
#, fuzzy
#| msgid "It is not possible to delete a NIS user."
msgid "It is not possible to extend the file system while it is mounted."
msgstr "Yinto enako ukwenzeka ukucima umsebenzisi we-NIS."
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid "It is not possible to resize the file system while it is mounted."
@@ -2749,11 +2754,9 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:40
-#: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61
-#: src/include/partitioning/ep-loop.rb:37
-#: src/include/partitioning/ep-lvm.rb:64
-#: src/include/partitioning/ep-raid.rb:38
+#: src/include/partitioning/ep-btrfs.rb:40 src/include/partitioning/ep-dm.rb:36
+#: src/include/partitioning/ep-hd.rb:61 src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38
msgid "Edit"
msgstr "Hlela"
@@ -2784,9 +2787,8 @@
#. Package: yast2-storage
#. Summary: Expert Partitioner
#. Authors: Arvin Schnell <aschnell(a)suse.de>
-#: src/include/partitioning/ep-btrfs.rb:45
-#: src/include/partitioning/ep-hd.rb:43 src/include/partitioning/ep-hd.rb:64
-#: src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-btrfs.rb:45 src/include/partitioning/ep-hd.rb:43
+#: src/include/partitioning/ep-hd.rb:64 src/include/partitioning/ep-loop.rb:37
#: src/include/partitioning/ep-lvm.rb:44 src/include/partitioning/ep-lvm.rb:66
#: src/include/partitioning/ep-raid.rb:40
#: src/include/partitioning/ep-tmpfs.rb:36
@@ -2809,8 +2811,7 @@
#: src/include/partitioning/ep-btrfs.rb:140
#: src/include/partitioning/ep-btrfs.rb:205
#: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86
-#: src/include/partitioning/ep-loop.rb:54
-#: src/include/partitioning/ep-lvm.rb:86
+#: src/include/partitioning/ep-loop.rb:54 src/include/partitioning/ep-lvm.rb:86
#: src/include/partitioning/ep-raid.rb:59
#, fuzzy
msgid "Edit..."
@@ -2828,8 +2829,7 @@
#. push button text
#: src/include/partitioning/ep-btrfs.rb:145
#: src/include/partitioning/ep-hd.rb:92 src/include/partitioning/ep-loop.rb:56
-#: src/include/partitioning/ep-lvm.rb:90
-#: src/include/partitioning/ep-raid.rb:63
+#: src/include/partitioning/ep-lvm.rb:90 src/include/partitioning/ep-raid.rb:63
#: src/include/partitioning/ep-tmpfs.rb:112
#: src/include/partitioning/ep-tmpfs.rb:170
#, fuzzy
@@ -2902,38 +2902,44 @@
" </p>"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
#, fuzzy
+msgid "EFI Boot Partition"
+msgstr "Isayizi yesahlulelo."
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
+#, fuzzy
#| msgid "O&perating Mode"
msgid "Operating System"
msgstr "Imo Yokwenza Um&sebenzi"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
#, fuzzy
#| msgid "Delta RPM Application Progress"
msgid "Data and ISV Applications"
msgstr "Inkqubela Ngenkqubo ye-Delta RPM"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
msgid "Swap"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
msgid "Raw Volume (unformatted)"
msgstr ""
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
#, fuzzy
#| msgid "Role: %s"
msgid "Role"
msgstr "Indima: %s"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
#, fuzzy
msgid ""
"<p>First, choose whether the partition should be\n"
@@ -2941,7 +2947,7 @@
msgstr "<p>Kuqala, khetha uhlobo lwesahlulelo nalapho esi sahlulelo kufuneka singcwangciswe khona.</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2949,7 +2955,7 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
#, fuzzy
msgid ""
"<p>Then, choose whether the partition should\n"
@@ -2957,55 +2963,55 @@
msgstr "<p>Emva koko, faka indawo yokugxumeka( /, /boot, /usr, /var, etc.)</p>"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
#, fuzzy
msgid "Formatting Options"
msgstr "&Izikhethwa Zobumbeko"
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
#, fuzzy
msgid "Format partition"
msgstr "Isayizi yesahlulelo."
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
#, fuzzy
msgid "Do not format partition"
msgstr "Isayizi yesahlulelo."
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
#, fuzzy
msgid "Do not mount partition"
msgstr "Isahlulelo kwi-Diski"
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
#, fuzzy
msgid "Mounting Options"
msgstr "Izikhethwa Zokugxumeka"
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
#, fuzzy
msgid "Mount partition"
msgstr "isahlulelo"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "Indawo Yokugxumeka"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
#, fuzzy
msgid "Fs&tab Options..."
msgstr "Izikhethwa ze-Fs&tab"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
#, fuzzy
msgid "Crypt files must be encrypted."
msgstr "Akukho sicwangciso sikhethiweyo."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
#, fuzzy
msgid ""
"You chose to create the crypt file, but did not specify\n"
@@ -3019,19 +3025,19 @@
" Kananjalo qwalasele isikhethwa sokucwangcisa.\n"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
#, fuzzy
msgid "Crypt files require a mount point."
msgstr "Bonelela ngendawo yokugxumeka."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
#, fuzzy
msgid "Tmpfs requires a mount point."
msgstr "Bonelela ngendawo yokugxumeka."
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
#, fuzzy
msgid ""
"<p>\n"
@@ -3047,7 +3053,7 @@
" </p>\n"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -3056,23 +3062,23 @@
"</p>\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
#, fuzzy
#| msgid "All changes will be lost!"
msgid "All data stored on the volume will be lost!"
msgstr "Zonke iinguquko ziya kulahleka!"
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
msgid "Password"
msgstr "Igama lokugqithisela"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
msgid "Resize not supported by underlying device."
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -3082,7 +3088,7 @@
"Awunako ukutshintsha ubungakanani besahlulelo esikhethiweyo kuba isixokelelwano sefayili\n"
" kwesi sahlulelo asikuxhasi ukutshintshwa kobungakanani.\n"
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
#, fuzzy
#| msgid "It is not possible to create a partition on %1."
msgid ""
@@ -3091,7 +3097,7 @@
msgstr "Akwenzeki ukudala isahlulelo ku %1."
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
#, fuzzy
#| msgid ""
#| "Partition %1 cannot be resized\n"
@@ -3104,24 +3110,24 @@
"kuba isixokelelwano sefayili sikhangeleka singafani ngokulungeleleneyo.\n"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
#, fuzzy
msgid "Resize Partition %1"
msgstr "Phi&nda Wenze Ubukhulu Besahlulelo"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
#, fuzzy
msgid "Resize Logical Volume %1"
msgstr "Ukutshintsha ubungakanani beSixa esineNgqiqo elindelekileyo"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
#, fuzzy
msgid "Current size: %1"
msgstr "Isimo Sangoku: %1"
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
#, fuzzy
msgid "Currently used: %1"
msgstr "Isimo Sangoku: %1"
@@ -3130,8 +3136,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -3143,7 +3149,7 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
#, fuzzy
@@ -3151,14 +3157,14 @@
msgstr "Isayizi ye-Linux (%1)"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
#, fuzzy
msgid "Minimum Size (%1)"
msgstr "Isayizi ye-Linux (%1)"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
#, fuzzy
@@ -3166,7 +3172,7 @@
msgstr "Ubukhulu &Bolungiselo"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
#, fuzzy
msgid "<p>Choose new size.</p>"
msgstr ""
@@ -3176,7 +3182,7 @@
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
#, fuzzy
@@ -3189,7 +3195,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -3198,13 +3204,13 @@
msgstr ""
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
#, fuzzy
msgid "Output of %1"
msgstr "Isiphumo:"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
#, fuzzy
msgid "Rescanning disks..."
msgstr "Ifunda izahlulo zediski..."
@@ -3424,67 +3430,67 @@
msgstr "i-LDAP URL efakiweyo ayisebenzi."
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
#, fuzzy
msgid "Add Partition on %1"
msgstr "Hlela Isahlulelo %1"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
msgid "Edit Partition %1"
msgstr "Hlela Isahlulelo %1"
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
#, fuzzy
#| msgid "No space is left in the extended partition."
msgid "No space to moved partition %1."
msgstr "Akho sithuba sishiyekileyo kwisahlulelo esandisiweyo."
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
#, fuzzy
#| msgid "Adding partition %1 to swap"
msgid "Move partition %1 forward?"
msgstr "Ukongeza isahlulelo %1 ukutshintshisela"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
msgid "Move partition %1 backward?"
msgstr ""
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
#, fuzzy
msgid "Move partition %1?"
msgstr "isahlulelo"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
#, fuzzy
#| msgid "&Forward"
msgid "Forward"
msgstr "&Thumela phambili"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
#, fuzzy
#| msgid "Background"
msgid "Backward"
msgstr "Okungasemva"
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
#, fuzzy
msgid "Confirm Deleting of All Partitions"
msgstr "Ukugxumeka zonke izahlulelo..."
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
msgid ""
"The disk \"%1\" contains at least one partition.\n"
"If you proceed, the following partitions will be deleted:"
msgstr ""
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
#, fuzzy
msgid "Really delete all partitions on \"%1\"?"
msgstr "Ngenene uyazicima zonke izahlulelo ku %1?"
@@ -3492,59 +3498,64 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
#, fuzzy
msgid "No hard disk selected."
msgstr "Akukho okuseqokobheni lekhompyutha kufunyenweyo"
#. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
msgid "The disk is in use and cannot be modified."
msgstr ""
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
#, fuzzy
msgid "Select new partition table type for %1."
msgstr "Ukugcina itheybhile yesahlulelo sedisk%1..."
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
#, fuzzy
msgid "No disk selected."
msgstr "Akukho okuseqokobheni lekhompyutha kufunyenweyo"
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
#, fuzzy
msgid "Really delete BIOS RAID %1?"
msgstr "Uyayicima ngenene i-`%1`?"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
#, fuzzy
#| msgid "Really delete all partitions on %1?"
msgid "Really delete Partitioned RAID %1?"
msgstr "Ngenene uyazicima zonke izahlulelo ku %1?"
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
#, fuzzy
msgid "There are no partitions to delete on this disk."
msgstr "Akukho zikhethwa zale modyuli"
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
msgid "It is not possible to create a partition on %1."
msgstr "Akwenzeki ukudala isahlulelo ku %1."
@@ -3552,29 +3563,29 @@
#. error popup
#. error popup
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
#, fuzzy
msgid "No partition selected."
msgstr "Akho zahlulelo zifunyenweyo"
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
msgid ""
"The partition %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
#, fuzzy
msgid "An extended partition cannot be edited."
msgstr "Isahlulelo esandisiweyo asinakudalwa."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
#, fuzzy
#| msgid "The /var partition %1 could not be mounted.\n"
msgid ""
@@ -3583,26 +3594,26 @@
msgstr "Isahlulelo/var %1 asinakugxunyekwa.\n"
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
#, fuzzy
msgid "An extended partition cannot be moved."
msgstr "Isahlulelo esandisiweyo asinakudalwa."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
msgid ""
"The partition %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
#, fuzzy
msgid "An extended partition cannot be resized."
msgstr "Isahlulelo esandisiweyo asinakudalwa."
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -3612,49 +3623,49 @@
"partitions will be deleted.</p>\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
#, fuzzy
#| msgid "Really delete the selected option?"
msgid "Really delete these partitions?"
msgstr "Uyasicima ngenene isikhethwa esikhethiweyo?"
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
msgid ""
"There are no partitions on this disk, but a clonable\n"
"disk must have at least one partition.\n"
"Create partitions before cloning the disk.\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
msgid ""
"This disk cannot be cloned. There are no suitable\n"
"disks that could have the same partitioning layout."
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
#, fuzzy
#| msgid "Repair Partition Table of %1"
msgid "Clone partition layout of %1"
msgstr "Khanda iTheybhile yesaHlulelo sika %1 "
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
#, fuzzy
#| msgid "A&vailable are:"
msgid "Available target disks:"
msgstr "O&kukhoyo naku:"
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
msgid "Select a target disk for creating a clone"
msgstr ""
#. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
@@ -3663,7 +3674,7 @@
"Ngenene yenza i-dasdfmt kwidiski%1?\n"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3710,8 +3721,7 @@
msgstr "Shenxisa &Phezulu"
#: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43
-#: src/include/partitioning/ep-lvm.rb:65
-#: src/include/partitioning/ep-raid.rb:39
+#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39
#, fuzzy
msgid "Resize"
msgstr "Nci&phisa"
@@ -3812,8 +3822,7 @@
#. push button text
#. push button text
-#: src/include/partitioning/ep-hd.rb:496
-#: src/include/partitioning/ep-lvm.rb:213
+#: src/include/partitioning/ep-hd.rb:496 src/include/partitioning/ep-lvm.rb:213
#: src/include/partitioning/ep-lvm.rb:337
#: src/include/partitioning/ep-tmpfs.rb:110
#, fuzzy
@@ -3935,54 +3944,54 @@
msgstr "Ipaswedi engalunganga!"
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
#, fuzzy
msgid "Confirm Deleting Partition Used by LVM"
msgstr "Kucinywa isahlulelo %1$s"
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
msgid ""
"The selected partition is used by volume group \"%1\".\n"
"To keep the system in a consistent state, the following volume group\n"
"and its logical volumes will be deleted:\n"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
#, fuzzy
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr "Indawo ekusingiswa kuyo %1 sele ikhona."
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
#, fuzzy
msgid "Confirm Deleting Partition Used by RAID"
msgstr "Kucinywa isahlulelo %1$s"
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
"To keep the system in a consistent state, the following\n"
"RAID device will be deleted:\n"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
#, fuzzy
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "Cima isahlulelo engu %1$s (%2$s)"
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
msgid "Really delete all partitions on %1?"
msgstr "Ngenene uyazicima zonke izahlulelo ku %1?"
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
msgid "Really delete %1?"
msgstr "Uyayicima ngenene i-`%1`?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -3992,7 +4001,7 @@
#. Guarantee some minimal share (1%) of total graph width to the segment.
#. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
#, fuzzy
msgid "Unpartitioned"
msgstr "Izicwangciso Zezahlulelo"
@@ -4001,36 +4010,36 @@
#. or the end of the disk if
#. 1. end +1th cyl is not the next one
#. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
#, fuzzy
msgid "Unallocated"
msgstr "Izicwangciso Zezahlulelo"
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
#, fuzzy
msgid "<p>No changes to partitioning.</p>"
msgstr "<h1>Isilumkiso</h1>"
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "<h1>Isilumkiso</h1>"
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
msgid "<p>No changes to storage settings.</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
#, fuzzy
msgid "<p>Storage settings:</p>"
msgstr "Isixhobo sokugcina"
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
#, fuzzy
msgid "<p>Packages to install:</p>"
msgstr "Isixhobo sokugcina"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
msgid "<p>No packages need to be installed.</p>"
msgstr ""
@@ -4159,13 +4168,13 @@
" ukudala iflegi isebenze."
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
#, fuzzy
msgid "Add Crypt File"
msgstr "&Hlela iFayili eguqulelwe ngokuntsokothileyo"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
#, fuzzy
msgid "Edit Crypt File %1"
msgstr "&Hlela iFayili eguqulelwe ngokuntsokothileyo"
@@ -4512,13 +4521,13 @@
msgstr "Isetyenziswe Ngu"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
#, fuzzy
msgid "Add Logical Volume on %1"
msgstr "Hlela iSixa esineNgqiqo elindelekileyo"
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
#, fuzzy
msgid "Edit Logical Volume %1 on %2"
msgstr "Hlela iSixa esineNgqiqo elindelekileyo"
@@ -4556,9 +4565,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
#, fuzzy
msgid "No logical volume selected."
msgstr "Akukho sicwangciso sikhethiweyo."
@@ -4570,7 +4579,7 @@
msgstr "Akho sithuba sikhoyo kwiqela lesandi elikhoyo ngoku esingu %1."
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
#, fuzzy
#| msgid ""
#| "\n"
@@ -4585,7 +4594,7 @@
" Ayinako ukubuyiselwa endaweni.\n"
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
#, fuzzy
msgid ""
"The volume %1 is in use. It cannot be\n"
@@ -4994,19 +5003,19 @@
" </p>\n"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
#, fuzzy
msgid "Add RAID %1"
msgstr "Faka i-RAI&D"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
#, fuzzy
msgid "Resize RAID %1"
msgstr "She&nxisa i-RAID"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
#, fuzzy
msgid "Edit RAID %1"
msgstr "&Hlela i-RAID"
@@ -5302,7 +5311,7 @@
" </p>\n"
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
msgid "Add tmpfs Mount"
msgstr ""
@@ -6240,12 +6249,12 @@
msgstr ""
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:937
+msgid "Operation not permitted on disk %{device}.\n"
msgstr ""
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:942
#, fuzzy
#| msgid ""
#| "\n"
@@ -6259,11 +6268,44 @@
#| "disk here.\n"
msgid ""
"\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+"\n"
+"Ulwahlulelo kwidiski yakho %1 lusenokuba alufundeki ngesixhobo\n"
+" sokwahlula ukwahlulela okusetyenziswa\n"
+" ukutshintsha isahlulelo.\n"
+" \n"
+"Ungasebenzisa izahlulelo kwidiski %1 njengokuba zinjalo okanye\n"
+" uzicwangcise uzabele iindawo zokugxumeka, kodwa\n"
+" awukwazi ukongeza, ukuhlela, ukutshintsha ubungakanani, okanye ukushenxisa izahlulelo kulo\n"
+" diski apha.\n"
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:954
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The partitioning on your disk %1 is either not readable by\n"
+#| "the partitioning tool parted used to change the\n"
+#| "partition table or is not supported by this tool.\n"
+#| "\n"
+#| "You may use the partitions on disk %1 as they are or\n"
+#| "format them and assign mount points to them, but you\n"
+#| "cannot add, edit, resize, or remove partitions from that\n"
+#| "disk here.\n"
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
"supported by the partitioning tool parted used to change the\n"
"partition table.\n"
"\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
"format them and assign mount points, but you cannot add, edit, \n"
"resize, or remove partitions from that disk here.\n"
msgstr ""
@@ -6277,8 +6319,8 @@
" awukwazi ukongeza, ukuhlela, ukutshintsha ubungakanani, okanye ukushenxisa izahlulelo kulo\n"
" diski apha.\n"
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:966
#, fuzzy
#| msgid ""
#| "\n"
@@ -6292,11 +6334,11 @@
#| "disk here.\n"
msgid ""
"\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
"compatibility the kernel has automatically generated a\n"
"partition spanning almost the entire disk.\n"
"\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
"format it and assign a mount point, but you cannot resize\n"
"or remove the partition from that disk here.\n"
msgstr ""
@@ -6311,7 +6353,7 @@
" diski apha.\n"
#. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:982
#, fuzzy
#| msgid ""
#| "\n"
@@ -6335,7 +6377,7 @@
" diski.\n"
#. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:992
msgid ""
"\n"
"\n"
@@ -6353,7 +6395,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
msgid "Resize Not Possible:"
msgstr "Ukutshintsha ubungakanani Akwenzeki:"
@@ -6366,7 +6408,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:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
#, fuzzy
#| msgid ""
#| "Could not set encryption.\n"
@@ -6385,7 +6427,7 @@
" Ipaswedi yenguqulelo entsokothileyo isenokungachaneki.\n"
#. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
#, fuzzy
msgid ""
"The first and the second version\n"
@@ -6397,7 +6439,7 @@
" Nceda uzame kwakhona."
#. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -6410,29 +6452,29 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "&Enter Encryption Password:"
msgstr "Ngenisa Iqhosha Loguqulelo Oluntsonkothileyo"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
#, fuzzy
#| msgid "Enter Provider Password"
msgid "Provide Password"
msgstr "Ngenisa Igama Lokugqithisa Lomboneleli"
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
#, fuzzy
msgid "Encrypted Volume Activation"
msgstr "Iqela Lesixa"
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6440,14 +6482,14 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
#, fuzzy
#| msgid "Do you want to retry?"
msgid "Do you want to provide encryption passwords?"
msgstr "Ingaba ukuzama kwakhona?"
#. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6455,60 +6497,60 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
#, fuzzy
#| msgid "Enter Encryption Key"
msgid "Enter Encryption Password"
msgstr "Ngenisa Iqhosha Loguqulelo Oluntsonkothileyo"
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for any of the following devices:"
msgstr "I-YaST2 ichonge isixhobo esilandelayo"
#. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for the following device:"
msgstr "I-YaST2 ichonge isixhobo esilandelayo"
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
#, fuzzy
#| msgid "DASD Disks"
msgid "IDE Disk"
msgstr "Iidiski ze-DASD"
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
#, fuzzy
#| msgid "DASD Disks"
msgid "SCSI Disk"
msgstr "Iidiski ze-DASD"
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
msgid "Disk"
msgstr "Idiski"
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
#, fuzzy
msgid "DM RAID"
msgstr "I-R&AID:"
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
#, fuzzy
msgid "MD RAID"
msgstr "I-R&AID:"
@@ -6516,50 +6558,50 @@
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
msgid "Installing required packages failed."
msgstr "Ukuhlohlwa kwemibekelelo efunekayo kusilele."
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
#, fuzzy
#| msgid "Continue resizing the %1?"
msgid "Continue despite the error?"
msgstr "Qhubeka wandise u %1?"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6567,7 +6609,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6575,7 +6617,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6583,20 +6625,20 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
#, fuzzy
#| msgid "Set global root filesystem"
msgid "Nothing assigned as root filesystem!"
msgstr "Misela isixokelelwano seefayili sengcambu yamandla sehlabathi"
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
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:6032
+#: src/modules/Storage.rb:6042
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -7254,64 +7296,49 @@
"You must quit that application before you can continue."
msgstr ""
-#. enable snapshots for root volume if desired
+#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
#, 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 "Ukutshintsha ubungakanani akwenzeki ngenxa yokungafani kwe-fs ngokulungeleleneyo. Zama ukuqwalasela i-fs ngaphantsi kwe-Windows."
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-#, fuzzy
-#| msgid "Create &LVM Based Proposal"
-msgid "Create &LVM-based Proposal"
-msgstr "Dala &isiNdululo esiSekelwe kwi-LVM "
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-#, fuzzy
-msgid "Encr&ypt Volume Group"
-msgstr "Iqela Lesixa"
-
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6239
#, fuzzy
#| msgid "File system options:"
msgid "File System for Root Partition"
msgstr "Izikhethwa zesixokelelwano sefayili:"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6286
#, fuzzy
#| msgid "Propose Separate &Home Partition"
msgid "File System for Home Partition"
msgstr "Ndulula isaHlulelo &eSihlukileyo seKhaya"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6304
msgid "Enlarge &Swap for Suspend"
msgstr ""
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6314
#, fuzzy
#| msgid "Write global settings"
msgid "Proposal Settings"
msgstr "Bhala imimiselo yehlabathi"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
-#, fuzzy
+#: src/modules/StorageProposal.rb:6329
msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
msgstr ""
-"<p>\n"
-"Ukudala i-LVM esekelwe kwisindululo khetha iqhosha elihambelanayo.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6337
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"
@@ -7320,37 +7347,55 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6346
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:6325
+#: src/modules/StorageProposal.rb:6353
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:6350
+#: src/modules/StorageProposal.rb:6378
#, fuzzy
msgid "Enter your password for the proposal encryption."
msgstr "Faka ipaswedi yakho yesixokelelwano sefayli esinoguqulelo oluntsokothileyo."
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6385
msgid "Password:"
msgstr "Igama lokugqithisa:"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6396
#, fuzzy
msgid "Reenter the password for verification:"
msgstr "Faka kwakhona ipaswedi uku&qinisekisa:"
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6594
+#, fuzzy
+msgid "&Partition-based Proposal"
+msgstr "Izicwangciso Zezahlulelo"
+
+#: src/modules/StorageProposal.rb:6596
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "&LVM-based Proposal"
+msgstr "Dala &isiNdululo esiSekelwe kwi-LVM "
+
+#: src/modules/StorageProposal.rb:6598
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "&Encrypted LVM-based Proposal"
+msgstr "Dala &isiNdululo esiSekelwe kwi-LVM "
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -7400,6 +7445,18 @@
msgid "Visible Information on Storage Devices:"
msgstr "Iintsusa Zolwazi Lomsebenzisi"
+#, fuzzy
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr "Iqela Lesixa"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+#~ "LVM-based proposal can be encrypted.</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Ukudala i-LVM esekelwe kwisindululo khetha iqhosha elihambelanayo.</p>"
+
#~ msgid "Changes:"
#~ msgstr "Utshintsho:"
@@ -7617,10 +7674,6 @@
#~ msgstr "Inkqubo yefayili yeNgingqi"
#, fuzzy
-#~ msgid "&Partition Based"
-#~ msgstr "Izicwangciso Zezahlulelo"
-
-#, fuzzy
#~ msgid "&LVM Based"
#~ msgstr "Kusekwelwe emjikweni"
Modified: trunk/yast/xh/po/update.xh.po
===================================================================
--- trunk/yast/xh/po/update.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/update.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -438,7 +438,7 @@
msgstr "Akukho nanye ikhoyo yezi ifayili:%1"
#. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
msgid ""
"The installed product is not compatible with the product\n"
"on the installation media. If you try to update using the\n"
@@ -891,20 +891,20 @@
#. -----------------------------------------------------------------------
#. GLOBAL FUNCTIONS
#. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
#, fuzzy
msgid "Unknown Product"
msgstr "Isixhobo sokusebenza esingaziwa"
#. If the current default desktop is not installed, it's a valid use case
#. and we don't continue further
-#: src/modules/Update.rb:791
+#: src/modules/Update.rb:788
msgid ""
"Cannot select these patterns required for installation:\n"
"%{patterns}"
msgstr ""
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
#, fuzzy
#| msgid "Failed to select %1 packages for installation."
msgid ""
Modified: trunk/yast/xh/po/users.xh.po
===================================================================
--- trunk/yast/xh/po/users.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/users.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -123,652 +123,6 @@
msgid "Do not ask for missing data; return error instead."
msgstr ""
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-msgid "User Authentication Method"
-msgstr "Indlela Yongqinelwano Ngobunyani Bomsebenzisi"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<b>Ungqinelwano Ngobunyani</b><br>\n"
-" Khetha indlela yongqinelwano ngobunyani efanele ukusetyenziswa ngabasebenzisi kwisixokelelwano sakho.\n"
-" </p>"
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: 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>Khetha <b>Indawo leyo</b> yongqinelwano ngobunyani babasebenzisi kuphela ngokusebenzisa iifayili zendawo leyo <i>/njl.njl./igama lokugqithisa</i> ngokunjalo <i>/njl.njl./isithunzi</i>.</p>"
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr "Ukuba unokuhlohliweyo kwethuba elidlulilwyo okanye isixokelelwano esisesinye, yinto enokwenzeka ukudala abasebenzisi ngokuseka kulo mthombo. Ukwenza njalo, khetha oku <b>Funda Iinkcukacha Zomsebenzisi Kokuhlohlwe Kwithuba Langaphambili</b> Esi sikhethwa sisebenzisa uvimba weefayili oselekhona okanye sidale omtsha womsebenzisi ngamnye kwindawo exeliweyo yoko kuhlohlwayo."
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-msgid "&LDAP"
-msgstr "i-&LDAP"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-msgid "N&IS"
-msgstr "i-N&IS+"
-
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "i-&Samba"
-
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-msgid "&Windows Domain"
-msgstr "Ummandla Wolawulo we-&Windows"
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-msgid "L&ocal (/etc/passwd)"
-msgstr "Kwind&awo leyo (/njl.njl/igama lokugqithisa)"
-
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-msgid "eDirectory LDAP"
-msgstr "Uvimba Weefayili we-e we-LDAP"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Ukuba usebenzisa iseva ye-NIS okanye ye-LDAP ukulondoloza iinkcukacha zabasebenzisi okanye xa ufuna\n"
-"ungqinelwano ngobunyani babasebenzisi malunga neseva ye-NT, khetha ixabiso elifanelekileyo. Ngoko ke\n"
-" cinezela <b>Okulandelayo</b> ukuze uqhube ngobumbeko lomxumi wakho.</p>"
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Ukuba usebenzisa iseva ye-NIS okanye ye-LDAP ukulondoloza iinkcukacha zabasebenzisi, khetha\n"
-"ixabiso elifanelekileyo. Ngoko cinezela<b> Okulandelayo </b> ukuqhuba ngobumbeko lomxumi wakho.</p>"
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Ukuba usebenzisa iseva ye-LDAP ukulondoloza iinkcukacha zabasebenzisi okanye xa ufuna\n"
-"ungqinelwano ngobunyani babasebenzisi malunga neseva ye-NT, khetha ixabiso elifanelekileyo. Ngoko ke\n"
-" cinezela <b>Okulandelayo</b> ukuze uqhube ngobumbeko lomxumi wakho.</p>"
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Ukuba usebenzisa iseva ye-LDAP ukulondoloza iinkcukacha zabasebenzisi, khetha\n"
-"ixabiso elifanelekileyo. Ngoko cinezela<b> Okulandelayo </b> ukuqhuba ngobumbeko lomxumi wakho.</p>"
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr "<p>Qwalasela <b>Misela Ungqinelwano Ngobunyani be-Kerberos</b> ukwenza ubumbeko lwe-Kerberos emva kokwenza ubumbeko lomthombo weenkcukacha zabasebenzisi.</p>"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-msgid "&Read User Data from a Previous Installation"
-msgstr "&Funda Iinkcukacha Zabasebenzisi ezisuka Kokuhlohlwe Kwithuba Langaphambili"
-
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-msgid "&Choose"
-msgstr "&Khetha"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-msgid "Authentication Method"
-msgstr "Indlela Yongqinelwano Ngobunyani"
-
-#. check box label
-#: src/clients/inst_auth.rb:303
-msgid "Set Up &Kerberos Authentication"
-msgstr "Misela Ungqinelwano Ngobunyani be&Kerberos"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-msgid "&Select Users to Read"
-msgstr "&Khetha Abasebenzisi Bokufunda"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-msgid "Select or Deselect &All"
-msgstr "Khetha okanye Ungakhethi &Konke"
-
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-msgid "Password for the System Administrator \"root\""
-msgstr "Igama lokugqithisa Lomlawuli Wesixokelelwano \"ingcambu yamandla\""
-
-#. advise user to remember his new password
-#. advise users to remember their new password
-#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
-msgid "Do not forget what you enter here."
-msgstr "Ungakulibali okungenise apha."
-
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-msgid "&Password for root User"
-msgstr "&Igama lokugqithisa ukwenzela Umsebenzisi wengcambu yamandla"
-
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-msgid "Con&firm Password"
-msgstr "Qini&sekisa Igama Lokugqithisa"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-#, fuzzy
-msgid "&Test Keyboard Layout"
-msgstr "&Ukumiswa Kakuhle Kwebhodi Yamaqhosha"
-
-#. push button
-#: src/clients/inst_root.rb:119
-msgid "E&xpert Options..."
-msgstr "Izikhethwa Zo&bungcaphephe..."
-
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ngokungafaniyo nakubasebenzisi besiqhelo besixokelelwano, ababhala iziqendu, dala\n"
-" iigrafu, okanye ukhangele Kunxibelelwano Ngekhompyutha, umsebenzisi, \"ingcambu yamandla\" seyikhona\n"
-" kwisixokelelwano ngasinye kwaye ubizelwa kwinyathelo nanini xa kufuneka kwenziwe umsebenzi wolawulo. Ngena kuphela njengengcambu\n"
-" xa ufuna ukuba ngumlawuli wesixokelelwano.\n"
-" </p>\n"
-
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ngenxa yokuba umsebenzisi wengcambu yamandla exhotyiswe ngeemvume ezoluliweyo, igama lokugqithisa\n"
-" elenzelwe \"ingcambu yamandla\" malikhethwe ngokuqaphela. Ukuhlanganiswa koonobumba namanani\n"
-" kuyacetyiswa. Ukuqinisekisa ukuba igama lokugqithisa belingeniswe ngokuchanekileyo,\n"
-" phinda ulingenise kummandla wesibini. </p>\n"
-
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-#, fuzzy
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Yonke imithetho malunga namagama okugqithisa abasebenzisi isetyenziswa kwigama lokugqithisa \"lengambu yamandla\":\n"
-"Yahlukanisa phakathi koonobumba abakhulu nabancinci. Igama lokugqithisa obona buncinci malibe\n"
-" neempawu ezithatha izithuba ezi-5 kwaye, njengomgqaliselo, lingaqulathi naziphi iimpawu ezithatha izithuba ezinjengezemvakalozwi nezandi ezichaphazela izikhamiso.\n"
-" </p>\n"
-
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ungalilibali eli gama \"lengcambu yamandla\"lokugqithisa.\n"
-" </p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-"<p>Ukuba unenjongo yokusebenzisa eli gama lokugqithisa ukwenzela ukudala izatifikethi, \n"
-"kufuneka ubukhulu becala ibe %1nobude beempawu ezithatha izithuba ezi- obona buncinci.</p>"
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr ""
-
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. 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: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."
-msgstr ""
-"Amagama okugqithisa awangqinelani.\n"
-"Zama kwakhona."
-
-#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"Akukho gama lingenisiweyo.\n"
-"Zama kwakhona."
-
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-#, fuzzy
-#| msgid ""
-#| "If you intend to create certificates,\n"
-#| "the password should have at least %1 characters.\n"
-#| "Really use this shorter password?"
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"Ukuba unenjongo yokudala izatifikethi, igama lokugqithisa malibe ,\n"
-"neempawu ezithatha izithuba ezi- %1 obona buncinci.\n"
-" Ulisebenzisa ngenene eli gama lokugqithisa lifutshanana?"
-
-#. last part of message popup
-#. last part of message popup
-#. 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:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-#, fuzzy
-#| msgid "&Reset Password"
-msgid "Really use this password?"
-msgstr "&Misela ngokutsha Igama Lokugqithisa"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-"Igama lokugqithisa lengcambu yamandla alikwazanga kumiselwa.\n"
-"Usenokungakwazi ukungena.\"\n"
-" Uzama ukulimisela kwakhona?\n"
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-msgid "Initialization of module for configuration of authentication..."
-msgstr "Kundululwa imodyuli ukwenzela ubumbeko longqinelwano ngobunyani..."
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"Umbekelelo %1 awuhlohlwanga.\n"
-"Uyawuhlohla ngoku?\n"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: 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 "i-DES"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55
-#: src/include/users/helps.rb:56
-msgid "MD5"
-msgstr "i-MD5"
-
-#. encryption type
-#. encryption type
-#: 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:95 src/clients/users_proposal.rb:59
-msgid "SHA-512"
-msgstr ""
-
-#. frame label
-#: src/clients/inst_user_first.rb:143
-#, fuzzy
-msgid "Password Encryption Type"
-msgstr "Uguqulelo Oluntsonkothileyo Lwegama Lokugqithisa"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: 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:151 src/include/users/widgets.rb:515
-msgid "&MD5"
-msgstr "i-&MD5"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha256 crypt
-#: 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: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:162
-#, fuzzy
-#| msgid "<p><b>Login Settings</b></p>"
-msgid "<p><b>Authentication</b><br></p>"
-msgstr "<p><b>Imimiselo Yokungena</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-#, fuzzy
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Indlela Yoguqulelo Oluntsonkothileyo Yamagama Okugqithisa"
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: 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:223 src/include/users/dialogs.rb:403
-msgid "User's &Full Name"
-msgstr "Igama Lomsebenzisi &Elipheleleyo"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-msgid "&Username"
-msgstr "&Igama lomsebenzisi"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-#, fuzzy
-msgid "U&se this password for system administrator"
-msgstr "Igama lokugqithisa Lomlawuli Wesixokelelwano \"ingcambu yamandla\""
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-msgid "Receive S&ystem Mail"
-msgstr "Yamkela Imeyile Yes&ixokelelwano"
-
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-#, fuzzy
-msgid "&Automatic Login"
-msgstr "Ukungena &Okuzenzekelayo"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-#, fuzzy
-msgid "Create New User"
-msgstr "Dala Isahlulelo Esitsha"
-
-#. yes-no popup headline
-#. 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:342 src/include/users/dialogs.rb:1112
-msgid "Empty User Login"
-msgstr "Ukungena Komsebenzisi Okulikhamte"
-
-#. yes-no popup contents
-#. yes-no popup contents
-#: 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"
-"Leave it empty?"
-msgstr ""
-"Ukushiya igama lomsebenzisi lilikhamte kunika ingqiqo kuphela kwimo engqonge \n"
-"umsebenzi wothungelwano oneseva enongqinelwano ngobunyani.\n"
-" Ulishiya lilikhamte?"
-
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: 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"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ngenisa <b>Igama Elipheleleyo Lomsebenzisi</b>, <b>Igama lomsebenzisi</b>, kananjalo <b>Igama lokugqithisa</b> ukwenzela\n"
-" ukwabela kwiakhawunti yomsebenzisi.\n"
-" </p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-#, fuzzy
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Xa ungenisa igama lokugqithisa, hlukanisa phakathi koonobumba abakhulu kunye\n"
-" nabancinci. Amagama okugqithisa akufuneki abe nazo naziphi iimpawu ezithatha izithuba zohlobo olulodwa, ezifana,\n"
-" nezemvakalozwi iimpawu ezithatha izithuba. \n"
-" </p>\n"
-
-#. 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:457 src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ngoguqulelo oluntsonkothileyo lwangoku lwegama lokugqithisa (%1), ubude begama lokugqithisa mabube phakathi kwe-\n"
-" %2 ngokunjalo %3 iimpawu ezithatha izithuba.\n"
-" </p>"
-
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-#, fuzzy
-#| msgid ""
-#| "<p>If you intend to use this password for creating certificates,\n"
-#| "it has to be at least %1 characters long.</p>"
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>Ukuba unenjongo yokusebenzisa eli gama lokugqithisa ukwenzela ukudala izatifikethi, \n"
-"kufuneka ubukhulu becala ibe %1nobude beempawu ezithatha izithuba ezi- obona buncinci.</p>"
-
-#. help text for main add user dialog
-#. help text 4/4
-#: 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"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Ukuqinisekisa ukuba igama lokugqithisa belingeniswe ngokuchanekileyo,\n"
-" liphindaphinde ncam kummandla wesibini. Ungalilibali igama lakho lokugqithisa.\n"
-" </p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:476
-#, fuzzy
-msgid ""
-"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Malunga <b>Negama lomsebenzisi</b>, sebenzisa kuphela\n"
-" oonobumba (makungabikho zimpawu ezithatha izithuba ezinjengezemvakalozwi), amanani, ngokunjalo <tt>._-</tt>.\n"
-" Musa ukusebenzisa oonobumba abakhulu kolu ngeniso ngaphandle kokuba uyayazi into oyenzayo.\n"
-" Amagama abasebenzisi anezithintelo ezithande ukuba ngqongqo kunamagama okugqithisa. Unako ukuphinda uchaze\n"
-" izithintelo kule fayili /njl.njl./iinkcazelo.ngokungena. Funda ikhasi layo labantu ngolwazi olufunayo.\n"
-" </p>\n"
-
-#. help text for main add user dialog
-#: 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 ""
-
-#. 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: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"
-msgstr ""
-"<p>\n"
-"Igama lomsebenzisi negama lokugqithisa adalwe apha ayafuneka ngenjongo yokungena ukuze usebenze ngesixokelelwano sakho se-Linux. Xa kunikwe isakhono <b>Ukungena Okuzenzekelayo</b> inkqubo yokungena iyatsitywa. Lo msebenzisi ungena ngokuzenzekela.</p>\n"
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: 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"
-msgstr ""
-"<p>\n"
-"Yenza ukuba imeyile yengcambu yamandla ithunyelwe phambili kulo msebenzisi ngokuqwalasela oku <b>Fumana Imeyile Yesixokelelwano</b>.</p>\n"
-
-#. 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:573
-msgid "Expert Settings"
-msgstr "Imimiselo Yobungcaphephe"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-msgid "The authentication method is local /etc/passwd."
-msgstr ""
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-#, fuzzy
-msgid "The password encryption method is %s."
-msgstr "Indlela Yoguqulelo Oluntsonkothileyo Yamagama Okugqithisa"
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-#, fuzzy
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] "Inkonzo %1 iza kuqaliswa kwakhona"
-msgstr[1] "Inkonzo %1 iza kuqaliswa kwakhona"
-
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-msgid "&Change..."
-msgstr "&Guqula..."
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-msgid "Summary"
-msgstr "Isishwankathelo"
-
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-#, fuzzy
-#| msgid ""
-#| "If you intend to create certificates,\n"
-#| "the password should have at least %1 characters.\n"
-#| "Really use this shorter password?"
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Ukuba unenjongo yokudala izatifikethi, igama lokugqithisa malibe ,\n"
-"neempawu ezithatha izithuba ezi- %1 obona buncinci.\n"
-" Ulisebenzisa ngenene eli gama lokugqithisa lifutshanana?"
-
#. translators: command line help text for Users module
#: src/clients/users.rb:102
msgid "User configuration module"
@@ -890,12 +244,6 @@
msgid "New UID of the user"
msgstr "i-UID entsha yomsebenzisi"
-#. progress step title
-#: src/clients/users_finish.rb:63
-#, fuzzy
-msgid "Writing Users Configuration..."
-msgstr "Ibhala Ubumbeko lwe-NFS..."
-
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -1155,106 +503,6 @@
msgid "Seconds"
msgstr "Imizuzwana"
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "i-LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr "i-NIS"
-
-#. authentication type
-#: src/clients/users_proposal.rb:46
-#, fuzzy
-msgid "Samba (Windows Domain)"
-msgstr "Ummandla Wolawulo we-&Windows"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-#, fuzzy
-msgid "<%1>Root Password<%2> set"
-msgstr "Igama Lokugqithisela Kwingcambu Yamandla"
-
-#: src/clients/users_proposal.rb:74
-#, fuzzy
-msgid "<%1>Root Password<%2> not set"
-msgstr "Igama Lokugqithisela Kwingcambu Yamandla"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-#, fuzzy
-msgid "No <%1>user<%2> configured"
-msgstr "Ayibumbekanga"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "Ungqinelwano ngobunyani"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr "Ungqinelwano ngobunyani"
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-#, fuzzy
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr "%1 amangeniso abumbekileyo"
-
-#. summary line, <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-#, fuzzy
-msgid "<%1>User<%2> %3 will be imported."
-msgstr "%1 amangeniso abumbekileyo"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-#, fuzzy
-msgid "<%1>User<%2> %3 configured"
-msgstr "%1 amangeniso abumbekileyo"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-#, fuzzy
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "%1 amangeniso abumbekileyo"
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-#, fuzzy
-msgid "Password Encryption Method: %1"
-msgstr "Indlela Yokwenza Uguqulelo Oluntsonkothileyo Lwegama Lo&kugqithisa"
-
-#. rich text label
-#: src/clients/users_proposal.rb:170
-#, fuzzy
-msgid "User Settings"
-msgstr "Imimiselo Yesiseko"
-
-#. menu button label
-#: src/clients/users_proposal.rb:173
-msgid "&User"
-msgstr "&Umsebenzisi"
-
-#. menu button label
-#: src/clients/users_proposal.rb:175
-#, fuzzy
-msgid "&Root Password"
-msgstr "Igama Lokugqithisela Kwingcambu Yamandla"
-
#. password entering label
#: src/include/users/cmdline.rb:55
msgid "LDAP Server Password:"
@@ -1416,6 +664,24 @@
"useto olwenziwe lwantsokotha lalo msebenzisi,\n"
" faka ipaswedi yomsebenzisi yangoku."
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:471
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"Amagama okugqithisa awangqinelani.\n"
+"Zama kwakhona."
+
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -1441,6 +707,13 @@
msgstr "Tshintshela uvimba weefayili wasekhaya ku-%1?"
#. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:583
+msgid "User's &Full Name"
+msgstr "Igama Lomsebenzisi &Elipheleleyo"
+
+#. text entry
#: src/include/users/dialogs.rb:411
msgid "&First Name"
msgstr "Igama &Lokuqala"
@@ -1458,11 +731,31 @@
"Malunga nabasebenzisi bamgama, kunokuguqulwa kuphela iziganeko zokuba \n"
"lilungu leqela elifakelweyo."
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:590
+msgid "&Username"
+msgstr "&Igama lomsebenzisi"
+
#. checkbox label
+#: src/include/users/dialogs.rb:446
+msgid "Receive S&ystem Mail"
+msgstr "Yamkela Imeyile Yes&ixokelelwano"
+
+#. checkbox label
#: src/include/users/dialogs.rb:456
msgid "A&utomatic Login"
msgstr "Ukungena &Okuzenzekelayo"
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:614
+#, fuzzy
+msgid "U&se this password for system administrator"
+msgstr "Igama lokugqithisa Lomlawuli Wesixokelelwano \"ingcambu yamandla\""
+
#. check box label
#: src/include/users/dialogs.rb:480
msgid "D&isable User Login"
@@ -1634,6 +927,35 @@
msgid "Plu&g-Ins"
msgstr "Iinkqutyana zee-Plu&g-In"
+#. 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/include/users/dialogs.rb:1112
+msgid "Empty User Login"
+msgstr "Ukungena Komsebenzisi Okulikhamte"
+
+#. yes-no popup contents
+#: 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"
+"Leave it empty?"
+msgstr ""
+"Ukushiya igama lomsebenzisi lilikhamte kunika ingqiqo kuphela kwimo engqonge \n"
+"umsebenzi wothungelwano oneseva enongqinelwano ngobunyani.\n"
+" Ulishiya lilikhamte?"
+
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:483
+#, fuzzy
+#| msgid "&Reset Password"
+msgid "Really use this password?"
+msgstr "&Misela ngokutsha Igama Lokugqithisa"
+
#. popup question
#: src/include/users/dialogs.rb:1308
msgid "Change home directory to %1?"
@@ -1726,6 +1048,20 @@
msgid "Group &Data"
msgstr "&Iinkcukacha Zeqela"
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+msgid "DES"
+msgstr "i-DES"
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+msgid "MD5"
+msgstr "i-MD5"
+
#. help text 1/4
#: src/include/users/helps.rb:62
#, fuzzy
@@ -1741,6 +1077,32 @@
" nezemvakalozwi iimpawu ezithatha izithuba. \n"
" </p>\n"
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ngoguqulelo oluntsonkothileyo lwangoku lwegama lokugqithisa (%1), ubude begama lokugqithisa mabube phakathi kwe-\n"
+" %2 ngokunjalo %3 iimpawu ezithatha izithuba.\n"
+" </p>"
+
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ukuqinisekisa ukuba igama lokugqithisa belingeniswe ngokuchanekileyo,\n"
+" liphindaphinde ncam kummandla wesibini. Ungalilibali igama lakho lokugqithisa.\n"
+" </p>\n"
+
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -1906,6 +1268,19 @@
" <b>Igama lokugqithisa</b> lokunika lo msebenzisi.\n"
" </p>\n"
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngenisa <b>Igama Elipheleleyo Lomsebenzisi</b>, <b>Igama lomsebenzisi</b>, kananjalo <b>Igama lokugqithisa</b> ukwenzela\n"
+" ukwabela kwiakhawunti yomsebenzisi.\n"
+" </p>\n"
+
#. help text 2/7
#: src/include/users/helps.rb:226
msgid ""
@@ -1946,6 +1321,25 @@
" izithintelo kule fayili /njl.njl./iinkcazelo.ngokungena. Funda ikhasi layo labantu ngolwazi olufunayo.\n"
" </p>\n"
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
+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"
+msgstr ""
+"<p>\n"
+"Igama lomsebenzisi negama lokugqithisa adalwe apha ayafuneka ngenjongo yokungena ukuze usebenze ngesixokelelwano sakho se-Linux. Xa kunikwe isakhono <b>Ukungena Okuzenzekelayo</b> inkqubo yokungena iyatsitywa. Lo msebenzisi ungena ngokuzenzekela.</p>\n"
+
+#. help text 5/7 (only during installation)
+#: 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"
+msgstr ""
+"<p>\n"
+"Yenza ukuba imeyile yengcambu yamandla ithunyelwe phambili kulo msebenzisi ngokuqwalasela oku <b>Fumana Imeyile Yesixokelelwano</b>.</p>\n"
+
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2707,7 +2101,8 @@
msgstr "Abasebenzisi &Besixokelelwano"
#. the type of user set
-#: src/include/users/widgets.rb:79
+#. New user is the default option
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
#, fuzzy
msgid "Local Users"
msgstr "&Abasebenzisi bendawo leyo"
@@ -2792,6 +2187,11 @@
msgstr "Amaqela e-Sam&ba"
#. richtext label
+#: src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr "i-NIS"
+
+#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr ""
@@ -2811,6 +2211,11 @@
msgid "&SSSD"
msgstr ""
+#. menubutton label
+#: src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "i-&Samba"
+
#. tab header
#: src/include/users/widgets.rb:168
msgid "&Users"
@@ -2940,6 +2345,11 @@
" iinkqubo zomsebenzi wothungelwano azikuxhasi oku kwaye usenokuba neengxaki nge-NIS.\n"
" </p>"
+#. Help text for password expert dialog 4/5
+#: 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 ""
+
#. Label
#: src/include/users/widgets.rb:499
msgid "Password Encryption"
@@ -2950,6 +2360,26 @@
msgid "Encryption Type"
msgstr "Uhlobo Loguqulelo Oluntsonkothileyo"
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr ""
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr "i-&MD5"
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr ""
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr ""
+
#. help text 1/3
#: src/include/users/widgets.rb:582
msgid ""
@@ -3251,6 +2681,12 @@
#. type of user/group
#. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "i-LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
msgid "System"
msgstr "Isixokelelwano"
@@ -3588,6 +3024,15 @@
msgid "Package %1 is not available for installation."
msgstr "Akufumaneki ukwenzela ukuhlohla"
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"Umbekelelo %1 awuhlohlwanga.\n"
+"Uyawuhlohla ngoku?\n"
+
#. dialog caption
#: src/include/users/wizards.rb:102
msgid "User and Group Administration"
@@ -3605,6 +3050,435 @@
msgid "Initializing..."
msgstr "Kuyandululwa..."
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+#, fuzzy
+#| msgid ""
+#| "If you intend to create certificates,\n"
+#| "the password should have at least %1 characters.\n"
+#| "Really use this shorter password?"
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Ukuba unenjongo yokudala izatifikethi, igama lokugqithisa malibe ,\n"
+"neempawu ezithatha izithuba ezi- %1 obona buncinci.\n"
+" Ulisebenzisa ngenene eli gama lokugqithisa lifutshanana?"
+
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+#, fuzzy
+#| msgid ""
+#| "<p>If you intend to use this password for creating certificates,\n"
+#| "it has to be at least %1 characters long.</p>"
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>Ukuba unenjongo yokusebenzisa eli gama lokugqithisa ukwenzela ukudala izatifikethi, \n"
+"kufuneka ubukhulu becala ibe %1nobude beempawu ezithatha izithuba ezi- obona buncinci.</p>"
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+#, fuzzy
+msgid "Writing Users Configuration..."
+msgstr "Ibhala Ubumbeko lwe-NFS..."
+
+#. Copyright (c) 2016 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 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 SUSE LLC.
+#. To contact SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+#, fuzzy
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Indlela Yoguqulelo Oluntsonkothileyo Yamagama Okugqithisa"
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr ""
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+#, fuzzy
+msgid "Password Encryption Type"
+msgstr "Uguqulelo Oluntsonkothileyo Lwegama Lokugqithisa"
+
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+msgid "Do not forget what you enter here."
+msgstr "Ungakulibali okungenise apha."
+
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+msgid "&Password for root User"
+msgstr "&Igama lokugqithisa ukwenzela Umsebenzisi wengcambu yamandla"
+
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+msgid "Con&firm Password"
+msgstr "Qini&sekisa Igama Lokugqithisa"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+#, fuzzy
+msgid "&Test Keyboard Layout"
+msgstr "&Ukumiswa Kakuhle Kwebhodi Yamaqhosha"
+
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngokungafaniyo nakubasebenzisi besiqhelo besixokelelwano, ababhala iziqendu, dala\n"
+" iigrafu, okanye ukhangele Kunxibelelwano Ngekhompyutha, umsebenzisi, \"ingcambu yamandla\" seyikhona\n"
+" kwisixokelelwano ngasinye kwaye ubizelwa kwinyathelo nanini xa kufuneka kwenziwe umsebenzi wolawulo. Ngena kuphela njengengcambu\n"
+" xa ufuna ukuba ngumlawuli wesixokelelwano.\n"
+" </p>\n"
+
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngenxa yokuba umsebenzisi wengcambu yamandla exhotyiswe ngeemvume ezoluliweyo, igama lokugqithisa\n"
+" elenzelwe \"ingcambu yamandla\" malikhethwe ngokuqaphela. Ukuhlanganiswa koonobumba namanani\n"
+" kuyacetyiswa. Ukuqinisekisa ukuba igama lokugqithisa belingeniswe ngokuchanekileyo,\n"
+" phinda ulingenise kummandla wesibini. </p>\n"
+
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+#, fuzzy
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Yonke imithetho malunga namagama okugqithisa abasebenzisi isetyenziswa kwigama lokugqithisa \"lengambu yamandla\":\n"
+"Yahlukanisa phakathi koonobumba abakhulu nabancinci. Igama lokugqithisa obona buncinci malibe\n"
+" neempawu ezithatha izithuba ezi-5 kwaye, njengomgqaliselo, lingaqulathi naziphi iimpawu ezithatha izithuba ezinjengezemvakalozwi nezandi ezichaphazela izikhamiso.\n"
+" </p>\n"
+
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ungalilibali eli gama \"lengcambu yamandla\"lokugqithisa.\n"
+" </p>"
+
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+msgid "Password for the System Administrator \"root\""
+msgstr "Igama lokugqithisa Lomlawuli Wesixokelelwano \"ingcambu yamandla\""
+
+#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"Akukho gama lingenisiweyo.\n"
+"Zama kwakhona."
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:134
+#, fuzzy
+#| 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>"
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr "<p>Khetha <b>Indawo leyo</b> yongqinelwano ngobunyani babasebenzisi kuphela ngokusebenzisa iifayili zendawo leyo <i>/njl.njl./igama lokugqithisa</i> ngokunjalo <i>/njl.njl./isithunzi</i>.</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+msgid "Create new user"
+msgstr "Dala Isahlulelo Esitsha"
+
+#: src/lib/users/dialogs/inst_user_first.rb:142
+#, fuzzy
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Xa ungenisa igama lokugqithisa, hlukanisa phakathi koonobumba abakhulu kunye\n"
+" nabancinci. Amagama okugqithisa akufuneki abe nazo naziphi iimpawu ezithatha izithuba zohlobo olulodwa, ezifana,\n"
+" nezemvakalozwi iimpawu ezithatha izithuba. \n"
+" </p>\n"
+
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:149
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "With the current password encryption (%1), the password length should be between\n"
+#| " %2 and %3 characters.\n"
+#| "</p>"
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Ngoguqulelo oluntsonkothileyo lwangoku lwegama lokugqithisa (%1), ubude begama lokugqithisa mabube phakathi kwe-\n"
+" %2 ngokunjalo %3 iimpawu ezithatha izithuba.\n"
+" </p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:165
+#, fuzzy
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Malunga <b>Negama lomsebenzisi</b>, sebenzisa kuphela\n"
+" oonobumba (makungabikho zimpawu ezithatha izithuba ezinjengezemvakalozwi), amanani, ngokunjalo <tt>._-</tt>.\n"
+" Musa ukusebenzisa oonobumba abakhulu kolu ngeniso ngaphandle kokuba uyayazi into oyenzayo.\n"
+" Amagama abasebenzisi anezithintelo ezithande ukuba ngqongqo kunamagama okugqithisa. Unako ukuphinda uchaze\n"
+" izithintelo kule fayili /njl.njl./iinkcazelo.ngokungena. Funda ikhasi layo labantu ngolwazi olufunayo.\n"
+" </p>\n"
+
+#: src/lib/users/dialogs/inst_user_first.rb:172
+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 ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "Import User Data from a Previous Installation"
+msgstr "&Funda Iinkcukacha Zabasebenzisi ezisuka Kokuhlohlwe Kwithuba Langaphambili"
+
+#: src/lib/users/dialogs/inst_user_first.rb:184
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:193
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:275
+#, fuzzy
+msgid "Local User"
+msgstr "&Abasebenzisi bendawo leyo"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:330
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:387
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:514
+#, fuzzy
+msgid "&Create New User"
+msgstr "Dala Isahlulelo Esitsha"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:537
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "&Import User Data from a Previous Installation"
+msgstr "&Funda Iinkcukacha Zabasebenzisi ezisuka Kokuhlohlwe Kwithuba Langaphambili"
+
+#: src/lib/users/dialogs/inst_user_first.rb:547
+#, fuzzy
+msgid "Choose Users"
+msgstr "Abasebenzisi &Besixokelelwano"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:563
+msgid "&Skip User Creation"
+msgstr ""
+
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:619
+#, fuzzy
+msgid "&Automatic Login"
+msgstr "Ukungena &Okuzenzekelayo"
+
+#: src/lib/users/dialogs/inst_user_first.rb:626
+#, fuzzy
+#| msgid "No user was specified."
+msgid "No users selected"
+msgstr "Akukho msebenzisi uxeliweyo."
+
+#: src/lib/users/dialogs/inst_user_first.rb:628
+#, fuzzy
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] "Inkonzo %1 iza kuqaliswa kwakhona"
+msgstr[1] "Inkonzo %1 iza kuqaliswa kwakhona"
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+msgid "&Select Users to Read"
+msgstr "&Khetha Abasebenzisi Bokufunda"
+
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+msgid "Select or Deselect &All"
+msgstr "Khetha okanye Ungakhethi &Konke"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+msgid "SHA-256"
+msgstr ""
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+msgid "SHA-512"
+msgstr ""
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "Indlela Yokwenza Uguqulelo Oluntsonkothileyo Lwegama Lo&kugqithisa"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+msgid "Password &Encryption Type"
+msgstr "Uguqulelo Oluntsonkothileyo Lwegama Lokugqithisa"
+
+#. rich text label
+#: src/lib/users/proposal.rb:75
+#, fuzzy
+msgid "User Settings"
+msgstr "Imimiselo Yesiseko"
+
+#. menu button label
+#: src/lib/users/proposal.rb:78
+msgid "&User"
+msgstr "&Umsebenzisi"
+
+#. menu button label
+#: src/lib/users/proposal.rb:80
+#, fuzzy
+msgid "&Root Password"
+msgstr "Igama Lokugqithisela Kwingcambu Yamandla"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+#, fuzzy
+msgid "<%1>Root Password<%2> set"
+msgstr "Igama Lokugqithisela Kwingcambu Yamandla"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+#, fuzzy
+msgid "<%1>Root Password<%2> not set"
+msgstr "Igama Lokugqithisela Kwingcambu Yamandla"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+#, fuzzy
+msgid "No <%1>user<%2> configured"
+msgstr "Ayibumbekanga"
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+#, fuzzy
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] "%1 amangeniso abumbekileyo"
+msgstr[1] "%1 amangeniso abumbekileyo"
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+#, fuzzy
+msgid "<%1>User<%2> %3 configured"
+msgstr "%1 amangeniso abumbekileyo"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+#, fuzzy
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "%1 amangeniso abumbekileyo"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "Indlela Yokwenza Uguqulelo Oluntsonkothileyo Lwegama Lo&kugqithisa"
+
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
msgid "root"
@@ -4079,7 +3953,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:722
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -4097,202 +3971,202 @@
" Oku kungabanga ukuba aba vimba beefayili bangafikeleleki emva kokuba ugxumeke ngokuchanekileyo. Uyaqhuba ngobumbeko lomsebenzisi?"
#. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:970
msgid "Multiple users satisfy the input conditions."
msgstr "Abasebenzisi abaninzi banelisa iimeko zegalelo."
#. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1548
msgid "Initializing User and Group Configuration"
msgstr "Kundululwa Ubumbeko Lwabasebenzisi Nolwamaqela"
#. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1555
msgid "Read the default login settings"
msgstr "Funda imimiselo yokungena ehlala ikhona"
#. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1557
msgid "Read the default system settings"
msgstr "Funda imimiselo yesixokelelwano esihlala khona"
#. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1559
msgid "Read the configuration type"
msgstr "Funda uhlobo lobumbeko"
#. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1561
msgid "Read the user custom settings"
msgstr "Funda imimiselo yokulungiselela umsebenzisi"
#. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1563
msgid "Read users and groups"
msgstr "Funda abasebenzisi namaqela"
#. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1565
msgid "Build the cache structures"
msgstr "Yakha izakhiwo zikavimba wethutyana"
#. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1569
msgid "Reading the default login settings..."
msgstr "Funda imimiselo yokungena ehlala ikhona..."
#. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1571
msgid "Reading the default system settings..."
msgstr "Kufundwa imimiselo yesixokelelwano esihlala khona"
#. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1573
msgid "Reading the configuration type..."
msgstr "Kufundwa uhlobo lobumbeko..."
#. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1575
msgid "Reading custom settings..."
msgstr "Kufundwa imimiselo yokulungiselela..."
#. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1577
msgid "Reading users and groups..."
msgstr "Kufundwa abasebenzisi kunye namaqela..."
#. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1579
msgid "Building the cache structures..."
msgstr "Kwakhiwa izakhiwo zikavimba wethutyana..."
#. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
msgid "Finished"
msgstr "Kugqityiwe"
#. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2137
msgid "User does not exist."
msgstr "Umsebenzisi akakho kwayena."
#. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2389
msgid "Group does not exist."
msgstr "Iqela alikho kwalona."
#. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4258
msgid "Writing User and Group Configuration"
msgstr "Kubhalwa Ubumbeko Lomsebenzisi Nolweqela"
#. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4267
msgid "Write LDAP users and groups"
msgstr "Bhala abasebenzisi namaqela le-LDAP"
#. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4269
msgid "Write groups"
msgstr "Bhala amaqela"
#. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4271
msgid "Check for deleted users"
msgstr "Qwalasela abasebenzisi abacinyiweyo"
#. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4273
msgid "Write users"
msgstr "Bhala abasebenzisi"
#. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4275
msgid "Write passwords"
msgstr "Bhala amagama okugqithisa"
#. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4277
msgid "Write the custom settings"
msgstr "Bhala imimiselo yokulungiselela"
#. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4279
msgid "Write the default login settings"
msgstr "Bhala imimiselo yokungena ehlala ikhona"
#. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4282
msgid "Writing LDAP users and groups..."
msgstr "Kubhalwa abasebenzisi namaqela e-LDAP...."
#. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4284
msgid "Writing groups..."
msgstr "Kubhalwa amaqela..."
#. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4286
msgid "Checking deleted users..."
msgstr "Kuqwalaselwa abasebenzisi abacinyiweyo..."
#. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4288
msgid "Writing users..."
msgstr "Kubhalwa abasebenzisi..."
#. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4290
msgid "Writing passwords..."
msgstr "Kubhalwa amagama okugqithisa..."
#. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4292
msgid "Writing the custom settings..."
msgstr "Kubhalwa imimiselo yokulungiselela..."
#. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4294
msgid "Writing the default login settings..."
msgstr "Kubhalwa imimiselo yokungena ehlala ikhona..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4379
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr "Ifayili %s ayifundwanga ngokuchanekileyo, ngoko ke ayizi kubhalwa."
#. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
msgid "An error occurred while removing users."
msgstr "Kwenzeke imposiso xa kushenxiswa abasebenzisi."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr "Ifayili %s ayifundwanga ngokuchanekileyo, ngoko ke ayizi kubhalwa."
#. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4565
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
msgid "An error occurred while setting forwarding for root's mail."
msgstr "Kwenzeke imposiso xa kumiselwa ukuthumela phambili kwemeyile yengcambu yamandla."
#. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4843
msgid "No UID is available for this type of user."
msgstr "Akukho UID efumanekayo ngolu hlobo lomsebenzisi."
#. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4874
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4302,7 +4176,7 @@
"Khetha inani elipheleleyo elisebenzisekayo phakathi kuka- %i no- %i."
#. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4905
msgid ""
"The user ID entered is already in use.\n"
"Really use it?"
@@ -4311,7 +4185,7 @@
"Ufuna ngenene ukuyisebenzisa?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4918
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4323,7 +4197,7 @@
" Uyayisebenzisa ngenene?"
#. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4933
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4335,7 +4209,7 @@
" Uluguqula ngenene uhlobo lomsebenzisi ukuya 'kwindawo leyo'?"
#. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4947
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4346,14 +4220,14 @@
"kuba i-ID incinci kwi- %i.\n"
" Uluguqula ngenene uhlobo lomsebenzisi ukuya 'kwisixokelelwano'?"
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4981
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
msgstr ""
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4985
#, fuzzy
msgid ""
"There is a conflict between the entered\n"
@@ -4365,7 +4239,7 @@
" Zama okunye."
#. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5015
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
@@ -4374,7 +4248,7 @@
"kuqulatha isiphumlisi sekholoni (:). Zama kwakhona."
#. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5022
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4385,7 +4259,7 @@
" Shenxisa intsalela."
#. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5085
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4396,7 +4270,7 @@
" Uyazama kwakhona."
#. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5108
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4406,7 +4280,7 @@
"Khetha enye indlela yothungelwano ukwenzela uvimba weefayili wasekhaya."
#. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5119
msgid ""
"The home directory is used by another user.\n"
"Try again."
@@ -4415,7 +4289,7 @@
"Zama kwakhona."
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5161
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4426,7 +4300,7 @@
" Uyayisebenzisa ngenene le ndlela yothungelwano?"
#. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5172
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4434,7 +4308,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5179
#, fuzzy, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4446,7 +4320,7 @@
" Uyamsebenzisa lo vimba weefayili?"
#. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5188
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4460,7 +4334,7 @@
" Uyamsebenzisa lo vimba weefayili?"
#. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5216
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
@@ -4469,12 +4343,12 @@
"Usebenzisa le toliki yemiyalelo?"
#. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5236
msgid "No GID is available for this type of group."
msgstr "Akukho GID efumanekayo ngolu hlobo lweqela."
#. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5269
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4484,7 +4358,7 @@
"Khetha inani elipheleleyo elisebenzisekayo phakathi kuka- %i no- %i."
#. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5299
msgid ""
"The group ID entered is already in use.\n"
"Really use it?"
@@ -4493,7 +4367,7 @@
"Ufuna ngenene ukuyisebenzisa?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5311
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4505,7 +4379,7 @@
" Uyayisebenzisa ngenene?"
#. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5326
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4517,7 +4391,7 @@
" Uluguqula ngenene uhlobo lweqela ukuya 'kwindawo leyo'?"
#. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5340
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4529,7 +4403,7 @@
" Uluguqula ngenene uhlobo lweqela ukuya 'kwisixokelelwano'?"
#. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5359
msgid ""
"No group name entered.\n"
"Try again."
@@ -4538,7 +4412,7 @@
"Zama kwakhona."
#. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5376
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4548,7 +4422,7 @@
"Zama kwakhona."
#. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5389
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4561,7 +4435,7 @@
" Zama kwakhona."
#. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5397
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
@@ -4571,14 +4445,14 @@
"leqela negama leqela eselikhona.\n"
" Zama okunye."
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5513
#, fuzzy, perl-format
#| msgid "User does not exist."
msgid "User %s does not exist."
msgstr "Umsebenzisi akakho kwayena."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5567
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4589,7 +4463,7 @@
" njengeqela labo elihlala likhona."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5574
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4600,23 +4474,23 @@
" Shenxisa aba basebenzisi kwiqela lokuqala."
#. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6587
msgid "<h3>Users</h3>"
msgstr "<h3>Abasebenzisi</h3>"
#. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6597
msgid "<h3>Groups</h3>"
msgstr "<h3>Abasebenzisi</h3>"
#. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6608
#, fuzzy
msgid "<h3>Login Settings</h3>"
msgstr "Imimiselo Yokungena"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6610
msgid "User %1 configured for automatic login"
msgstr ""
@@ -4636,22 +4510,22 @@
"lukhoyo kwiseva ye-LDAP. Uyayidala ngoku?"
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
#, fuzzy
msgid "Kerberos Configuration"
msgstr "Ubumbeko Lokuhlohla Ngokuzenzekela"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
msgid "No Kerberos Management for Groups"
msgstr ""
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
msgid "Manage Kerberos Principials"
msgstr ""
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
msgid "Cannot execute kadmin.local."
msgstr ""
@@ -4786,7 +4660,7 @@
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:505
+#: src/modules/UsersSimple.pm:379
#, fuzzy
msgid ""
"The password may only contain the following characters:\n"
@@ -4798,7 +4672,7 @@
" Zama kwakhona."
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4813,7 +4687,7 @@
" </p>"
#. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
msgid ""
"The user's full name cannot contain\n"
"\":\" or \",\" characters.\n"
@@ -4824,7 +4698,7 @@
" Zama kwakhona."
#. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
#, fuzzy
#| msgid ""
#| "You have used the group name as a part of the password.\n"
@@ -4835,7 +4709,7 @@
"Oku akusosenzo silungileyo sokhuseleko. Uyalisebenzisa ngenene eli gama lokugqithisa?"
#. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
#, fuzzy
#| msgid ""
#| "You have used the username as a part of the password.\n"
@@ -4846,7 +4720,7 @@
"Oku akusosenzo silungileyo sokhuseleko. Uyalisebenzisa ngenene eli gama lokugqithisa?"
#. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -4857,7 +4731,7 @@
"Usebenzise oonobumba abakhulu kungeniso lokungena lomsebenzisi.</p>"
#. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -4868,7 +4742,7 @@
"Usebenzise oonobumba abakhulu kungeniso lokungena lomsebenzisi.</p>"
#. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -4879,12 +4753,12 @@
"Utshintshe uguqulelo oluntsonkothileyo oluhlala lukhona ukwenzela amagama okugqithisa omsebenzisi.</p>"
#. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
msgid "You have used only digits for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
#, fuzzy, perl-format
#| msgid ""
#| "The password is too long for the current encryption method.\n"
@@ -4897,7 +4771,7 @@
"Lishunqulele kwiimpawu ezi-%s ezithatha izithuba?"
#. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
#, fuzzy, perl-format
#| msgid ""
#| "The password is too simple:\n"
@@ -4912,7 +4786,7 @@
" Ulisebenzisa ngenene eli gama lokugqithisa?"
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
#, fuzzy, perl-format
#| msgid ""
#| "The password must have at least %1 characters.\n"
@@ -4923,7 +4797,7 @@
"Zama kwakhona.\n"
#. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
msgid ""
"No username entered.\n"
"Try again."
@@ -4932,7 +4806,7 @@
"Zama kwakhona."
#. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
#, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -4942,7 +4816,7 @@
"Zama kwakhona."
#. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
msgid ""
"The username may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4955,7 +4829,7 @@
" Zama kwakhona."
#. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
msgid ""
"There is a conflict between the entered\n"
"username and an existing username.\n"
@@ -4965,16 +4839,14 @@
"kwegama lomsebenzi elingenisiweyo negama lomsebenzisi eselikho.\n"
" Zama okunye."
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
#, fuzzy
msgid "Retrieving %1 extension..."
msgstr "Ifunda %1 iiSethingi"
-#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
#, fuzzy
msgid "Releasing %1 extension..."
msgstr "Ifunda %1 iiSethingi"
@@ -5042,7 +4914,152 @@
msgid "There are multiple users satisfying the input conditions."
msgstr "Baninzi abasebenzisi abanelisa iimeko zokungxalwa njengesiqalo."
+#~ msgid "User Authentication Method"
+#~ msgstr "Indlela Yongqinelwano Ngobunyani Bomsebenzisi"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b>Authentication</b><br>\n"
+#~ "Select the authentication method to use for users on your system.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b>Ungqinelwano Ngobunyani</b><br>\n"
+#~ " Khetha indlela yongqinelwano ngobunyani efanele ukusetyenziswa ngabasebenzisi kwisixokelelwano sakho.\n"
+#~ " </p>"
+
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "Ukuba unokuhlohliweyo kwethuba elidlulilwyo okanye isixokelelwano esisesinye, yinto enokwenzeka ukudala abasebenzisi ngokuseka kulo mthombo. Ukwenza njalo, khetha oku <b>Funda Iinkcukacha Zomsebenzisi Kokuhlohlwe Kwithuba Langaphambili</b> Esi sikhethwa sisebenzisa uvimba weefayili oselekhona okanye sidale omtsha womsebenzisi ngamnye kwindawo exeliweyo yoko kuhlohlwayo."
+
+#~ msgid "&LDAP"
+#~ msgstr "i-&LDAP"
+
+#~ msgid "N&IS"
+#~ msgstr "i-N&IS+"
+
+#~ msgid "&Windows Domain"
+#~ msgstr "Ummandla Wolawulo we-&Windows"
+
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "Kwind&awo leyo (/njl.njl/igama lokugqithisa)"
+
+#~ msgid "eDirectory LDAP"
+#~ msgstr "Uvimba Weefayili we-e we-LDAP"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Ukuba usebenzisa iseva ye-NIS okanye ye-LDAP ukulondoloza iinkcukacha zabasebenzisi okanye xa ufuna\n"
+#~ "ungqinelwano ngobunyani babasebenzisi malunga neseva ye-NT, khetha ixabiso elifanelekileyo. Ngoko ke\n"
+#~ " cinezela <b>Okulandelayo</b> ukuze uqhube ngobumbeko lomxumi wakho.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Ukuba usebenzisa iseva ye-NIS okanye ye-LDAP ukulondoloza iinkcukacha zabasebenzisi, khetha\n"
+#~ "ixabiso elifanelekileyo. Ngoko cinezela<b> Okulandelayo </b> ukuqhuba ngobumbeko lomxumi wakho.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Ukuba usebenzisa iseva ye-LDAP ukulondoloza iinkcukacha zabasebenzisi okanye xa ufuna\n"
+#~ "ungqinelwano ngobunyani babasebenzisi malunga neseva ye-NT, khetha ixabiso elifanelekileyo. Ngoko ke\n"
+#~ " cinezela <b>Okulandelayo</b> ukuze uqhube ngobumbeko lomxumi wakho.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Ukuba usebenzisa iseva ye-LDAP ukulondoloza iinkcukacha zabasebenzisi, khetha\n"
+#~ "ixabiso elifanelekileyo. Ngoko cinezela<b> Okulandelayo </b> ukuqhuba ngobumbeko lomxumi wakho.</p>"
+
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>Qwalasela <b>Misela Ungqinelwano Ngobunyani be-Kerberos</b> ukwenza ubumbeko lwe-Kerberos emva kokwenza ubumbeko lomthombo weenkcukacha zabasebenzisi.</p>"
+
+#~ msgid "&Choose"
+#~ msgstr "&Khetha"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Indlela Yongqinelwano Ngobunyani"
+
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "Misela Ungqinelwano Ngobunyani be&Kerberos"
+
+#~ msgid "E&xpert Options..."
+#~ msgstr "Izikhethwa Zo&bungcaphephe..."
+
+#~ msgid ""
+#~ "<p>If you intend to use this password for creating certificates,\n"
+#~ "it has to be at least %1 characters long.</p>"
+#~ msgstr ""
+#~ "<p>Ukuba unenjongo yokusebenzisa eli gama lokugqithisa ukwenzela ukudala izatifikethi, \n"
+#~ "kufuneka ubukhulu becala ibe %1nobude beempawu ezithatha izithuba ezi- obona buncinci.</p>"
+
#, fuzzy
+#~| msgid ""
+#~| "If you intend to create certificates,\n"
+#~| "the password should have at least %1 characters.\n"
+#~| "Really use this shorter password?"
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "Ukuba unenjongo yokudala izatifikethi, igama lokugqithisa malibe ,\n"
+#~ "neempawu ezithatha izithuba ezi- %1 obona buncinci.\n"
+#~ " Ulisebenzisa ngenene eli gama lokugqithisa lifutshanana?"
+
+#~ msgid ""
+#~ "The root password could not be set.\n"
+#~ "You might not be able to log in.\n"
+#~ "Try setting it again?\n"
+#~ msgstr ""
+#~ "Igama lokugqithisa lengcambu yamandla alikwazanga kumiselwa.\n"
+#~ "Usenokungakwazi ukungena.\"\n"
+#~ " Uzama ukulimisela kwakhona?\n"
+
+#~ msgid "Initialization of module for configuration of authentication..."
+#~ msgstr "Kundululwa imodyuli ukwenzela ubumbeko longqinelwano ngobunyani..."
+
+#, fuzzy
+#~| msgid "<p><b>Login Settings</b></p>"
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>Imimiselo Yokungena</b></p>"
+
+#~ msgid "Expert Settings"
+#~ msgstr "Imimiselo Yobungcaphephe"
+
+#, fuzzy
+#~ msgid "The password encryption method is %s."
+#~ msgstr "Indlela Yoguqulelo Oluntsonkothileyo Yamagama Okugqithisa"
+
+#~ msgid "&Change..."
+#~ msgstr "&Guqula..."
+
+#~ msgid "Summary"
+#~ msgstr "Isishwankathelo"
+
+#, fuzzy
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "Ummandla Wolawulo we-&Windows"
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "Ungqinelwano ngobunyani"
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+#~ msgstr "Ungqinelwano ngobunyani"
+
+#, fuzzy
+#~ msgid "<%1>Users<%2> %3 selected for import"
+#~ msgstr "%1 amangeniso abumbekileyo"
+
+#, fuzzy
#~| msgid "No Password Expiration"
#~ msgid "No Password Entered"
#~ msgstr "Akukho Kugqithelwa Lixesha Kwegama Lokugqithisa"
Modified: trunk/yast/xh/po/vm.xh.po
===================================================================
--- trunk/yast/xh/po/vm.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/vm.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: vm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -27,12 +27,12 @@
msgstr "Ibumba umatshini wokwenene..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr ""
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -42,178 +42,178 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
msgid "Verify Installed Packages"
msgstr "Qinisekisa Imibekelo Ehlohliweyo"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
#, fuzzy
msgid "Network Bridge Configuration"
msgstr "Ubumbeko Lwekhadi Yomsebenzi Wothungelwano"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
msgid "Configuring the VM Server (domain 0)"
msgstr "Ibumba Iseva ye-VM (i-domain 0)"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr "<p><big><b>Ubumbeko lweSeva ye-VM</b></big></p><p>Ubumbeko lweSeva lwe-VM (idomeyini 0) ineenxenye ezimbini.</p>"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
#, fuzzy
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr "<p>Imibekelo efunekayo ihlohlwe kwisixokelelwano kuqala. Emva koko umlayishi wokumisela inkqubo utshintshelwe kwi-GRUB ukuba ayisele isetyenzisiwe necandelo le-Xen lifakwe kwimenyu yomlayishi wokumisela inkqubo ukuba ilahlekile.</p>"
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
#, fuzzy
#| msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>"
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr "<p>I-GRUB iyafuneka kuba ixhasa umgangatho wokumisela inkqubo eninzi efunekayo ukumisela inkqubo ye-Xen ne-Linux kernel.</p>"
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
#, fuzzy
#| msgid "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>"
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr "<p>Xa ukuhlohla kugqitywe ngempumelelo, kuyenzeka ukumisela inkqubo yeSeva ye-VM ukusuka kwimenyu yomlayishi wokumisela inkqubo.</p>"
#. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
msgid "The installation will be aborted."
msgstr "Ukuhlohla kuza kulahlwa."
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Choose Hypervisor(s) to install"
msgstr "I-Hypervisor nezixhobo zihlohliwe."
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
msgid "Server: Minimal system to get a running Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
#, fuzzy
#| msgid "Configuring the virtual machine..."
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "Ibumba umatshini wokwenene..."
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
msgid "KVM Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
#, fuzzy
#| msgid "Broken server"
msgid "KVM server"
msgstr "Iseva eyaphukileyo"
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
msgid "KVM tools"
msgstr ""
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
msgid "libvirt LXC containers"
msgstr ""
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
msgid "libvirt LXC daemon"
msgstr ""
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
msgid "Software to connect to Virtualization server"
msgstr ""
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Virtualization client tools"
msgstr "I-Hypervisor nezixhobo zihlohliwe."
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
msgid "Xen Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
#, fuzzy
#| msgid "Broken server"
msgid "Xen server"
msgstr "Iseva eyaphukileyo"
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
#, fuzzy
#| msgid "Xen Section"
msgid "Xen tools"
msgstr "Icandelo le-Xen"
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
#, fuzzy
#| msgid "The installation will be aborted."
msgid "Package installation failed\n"
msgstr "Ukuhlohla kuza kulahlwa."
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
#, fuzzy
#| msgid "The installation will be aborted."
msgid "Package installation failed for lxc\n"
msgstr "Ukuhlohla kuza kulahlwa."
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
msgid "Package installation failed for sled client pattern\n"
msgstr ""
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
msgid "Package installation failed for sles patterns\n"
msgstr ""
#. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
msgid "Running in text mode. Install graphical components anyway?"
msgstr ""
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
msgid "Checking packages..."
msgstr "Ikhangela imibekelo..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
msgid "Installing packages..."
msgstr "Ihlohla imibekelo..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
msgid "Cannot install required packages."
msgstr "Ayikwazi kuhlohla imibekelo efunekayo."
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
#, fuzzy
#| msgid "Updating configuration files..."
msgid "Updating grub2 configuration files..."
msgstr "Kuhlaziywa iifayili zobumbeko..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
#, fuzzy
msgid "Configuring Default Network Bridge..."
msgstr "Kwenziwa ubumbeko lwemimiselo jikelele..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
#, fuzzy
#| msgid "Network Bridge"
msgid "Network Bridge."
msgstr "Ibrorho yeNethwekhi"
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr ""
@@ -226,11 +226,11 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
#, fuzzy
#| msgid ""
#| "The machine is ready to start the VM Server.\n"
@@ -242,7 +242,7 @@
"\n"
" Misela kwakhona inkqubo kumatshini kwaye ukhethe icandelo le-Xen kwimenyu yomlayishi wokumisela inkqubo ukuze uyiqalise.\n"
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
#, fuzzy
#| msgid ""
#| "The machine is ready to start the VM Server.\n"
@@ -254,19 +254,19 @@
"\n"
" Misela kwakhona inkqubo kumatshini kwaye ukhethe icandelo le-Xen kwimenyu yomlayishi wokumisela inkqubo ukuze uyiqalise.\n"
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Xen Hypervisor and tools are installed."
msgstr "I-Hypervisor nezixhobo zihlohliwe."
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Virtualization client tools are installed."
msgstr "I-Hypervisor nezixhobo zihlohliwe."
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Libvirt LXC components are installed."
Modified: trunk/yast/xh/po/vpn.xh.po
===================================================================
--- trunk/yast/xh/po/vpn.xh.po 2016-09-02 21:45:04 UTC (rev 96725)
+++ trunk/yast/xh/po/vpn.xh.po 2016-09-02 21:45:17 UTC (rev 96726)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -234,14 +234,14 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "The user name is already used."
msgstr "Igama lokrozo elichongiweyo %1 sele lisetyenzisiwe."
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
msgid "Cannot find a matching client connection."
msgstr ""
@@ -344,118 +344,118 @@
msgstr "Ungathanda ukutshintsha i-CD kwaye uzame kwakhona?"
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
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
+#: src/lib/vpn/main_dialog.rb:365
msgid "Name"
msgstr "Igama"
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
msgid "Description"
msgstr "Inkcazelo"
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
msgid "All IPv6 networks (::/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
#, fuzzy
#| msgid "Connection Type"
msgid "Connection name: "
msgstr "Uhlobo lonxulumano"
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
msgid "Type"
msgstr "Uhlobo"
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
#, fuzzy
#| msgid "Name Servers"
msgid "Gateway (Server)"
msgstr "Amagama Eeseva"
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
#, fuzzy
#| msgid "Clients"
msgid "Client"
msgstr "Abaxumi"
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
#, fuzzy
#| msgid "The scheme name"
msgid "The scenario is"
msgstr "Igama lesicwangciso"
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
#, fuzzy
#| msgid "You must select a certificate."
msgid "Secure communication with a certificate"
msgstr "Kufuneka ukhethe isatifikethi."
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
#, fuzzy
#| msgid "&Edit Crypt File"
msgid "Edit Credentials"
msgstr "&Hlela iFayili eguqulelwe ngokuntsokothileyo"
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
#, fuzzy
#| msgid "Set Up &Kerberos Authentication"
msgid "The gateway requires authentication"
msgstr "Misela Ungqinelwano Ngobunyani be&Kerberos"
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
#, fuzzy
#| msgid "Read certificates"
msgid "By a certificate"
msgstr "Funda izatifikethi"
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
msgid "VPN gateway IP"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -562,38 +562,38 @@
msgstr ""
#. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Failed to install IPSec packages."
msgstr "Kusilele ukuhlohla imibekelelo efunekayo."
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
#, fuzzy
#| msgid "Restart NTP daemon"
msgid "Failed to start IPSec daemon."
msgstr "Phinda uqalise i-daemon ye-NTP"
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr ""
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
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
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
#, fuzzy
#| msgid "Failed to restore MBR."
msgid "Failed to restart SuSE firewall."
msgstr "Kusilele ukuphinda kugcinwe i-MBR."
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
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"
@@ -601,35 +601,35 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
#, fuzzy
#| msgid "&Expert Global Settings"
msgid "VPN Global Settings"
msgstr "&Imimiselo Yobungcaphephe Behlabathi"
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
#, fuzzy
#| msgid "Enable VPN Services"
msgid "Enable VPN (IPSec) daemon: %s"
msgstr "Iinkonzo ze-VPN Ezinikwe Isakhono"
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
#, fuzzy
#| msgid "Create Client Connection"
msgid "Gateway and Connections"
msgstr "Dala Umdibaniso Womxumi"
#. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
#, fuzzy
#| msgid "Read current connection setup"
msgid "A client connecting to "
1
0