--- a/messages/install/de_DE/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/de_DE/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -20,31 +20,31 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#: ../src/user_screen.py:300
+#: ../src/user_screen.py:355
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-12 16:54+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 12:39+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
-#: ../src/__init__.py:269
+#: ../src/__init__.py:262
 #, python-format
 msgid "The %s installer must be run as root. Quitting."
 msgstr "Das Installationsprogramm %s muss als Root ausgeführt werden. Das Programm wird beendet."
 
-#: ../src/__init__.py:274
+#: ../src/__init__.py:267
 msgid "Installer Startup Terminated"
 msgstr "Start des Installationsprogramms abgebrochen"
 
-#: ../src/__init__.py:275 ../src/__init__.py:277
+#: ../src/__init__.py:268 ../src/__init__.py:270
 msgid ""
 "Only one instance of this Installer is allowed. Another instance is already "
 "running."
 msgstr "Es ist nur jeweils eine Instanz des Installationsprogramms zulässig. Eine andere Instanz wird bereits ausgeführt."
 
-#: ../src/__init__.py:285
+#: ../src/__init__.py:278
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr "Setzt Protokollspeicherplatz auf FILE (Standard: %default)."
 
-#: ../src/__init__.py:289
+#: ../src/__init__.py:282
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -52,13 +52,13 @@
 "[default: %default]"
 msgstr "Setzt Ausführlichkeit auf LEVEL. Gültige Werte zum Erhöhen der Ausführlichkeit sind 'error', 'warn', 'info', 'debug' oder 'input'\n[Standard: %default]."
 
-#: ../src/__init__.py:296
+#: ../src/__init__.py:289
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr "Aktiviert Debug-Modus. Setzt Protokollebene auf 'input' und ermöglicht, das Programm mit Strg-C abzubrechen.\n"
 
-#: ../src/base_screen.py:69 ../src/welcome_screen.py:62
+#: ../src/base_screen.py:69 ../src/welcome_screen.py:63
 msgid "Welcome"
 msgstr "Willkommen"
 
@@ -70,7 +70,7 @@
 msgid "Time Zone"
 msgstr "Zeitzone"
 
-#: ../src/base_screen.py:72 ../src/user_screen.py:109
+#: ../src/base_screen.py:72 ../src/user_screen.py:158
 #: ../xml/users.xml.glade.h:9
 msgid "Users"
 msgstr "Benutzer"
@@ -87,10 +87,10 @@
 #: ../src/base_screen.py:97 ../src/confirm_screen.py:82
 #: ../src/disk_screen.py:141 ../src/failure_screen.py:62
 #: ../src/fdisk_panel.py:152 ../src/finish_screen.py:65
-#: ../src/help_dialog.py:64 ../src/progress_screen.py:104
+#: ../src/help_dialog.py:64 ../src/progress_screen.py:111
 #: ../src/screen_manager.py:217 ../src/textview_dialog.py:53
-#: ../src/timezone.py:210 ../src/timezone_screen.py:75
-#: ../src/user_screen.py:79 ../src/welcome_screen.py:52
+#: ../src/timezone.py:230 ../src/timezone_screen.py:75
+#: ../src/user_screen.py:86 ../src/welcome_screen.py:53
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -100,43 +100,46 @@
 "changes."
 msgstr "Überprüfen Sie die Einstellungen, bevor Sie die Installation beginnen.\nKlicken Sie auf die Schaltfläche \"Zurück\", falls Änderungen erforderlich sind."
 
-#: ../src/confirm_screen.py:176
+#. There is no definitive way to detect whether "Use the whole
+#. disk" or "Partition the disk" was selected, so we will display
+#. a message about the Solaris2 partition details for each disk.
+#: ../src/confirm_screen.py:187
 #, python-format
-msgid "%.1f GB disk (%s)"
-msgstr "%.1f GB-Festplatte (%s)"
+msgid "%(partsize).1f GB partition on %(disksize).1f GB disk (%(disk)s)"
+msgstr "%(partsize).1f GB-Partition auf %(disksize).1f GB-Festplatte (%(disk)s)"
 
-#: ../src/confirm_screen.py:179
-msgid "This disk will be erased"
-msgstr "Diese Festplatte wird gelöscht"
+#: ../src/confirm_screen.py:191
+msgid "This partition will be erased"
+msgstr "Diese Partition wird gelöscht"
 
-#: ../src/confirm_screen.py:183
+#: ../src/confirm_screen.py:200
 #, python-format
 msgid "The whole installation will take up %.1fGB hard disk space."
 msgstr "Für die gesamte Installation ist bis zu %.1fGB Festplattenspeicher erforderlich."
 
-#: ../src/confirm_screen.py:202
+#: ../src/confirm_screen.py:219
 #, python-format
 msgid "Default Language: %s"
 msgstr "Standardsprache: %s"
 
-#: ../src/confirm_screen.py:207
+#: ../src/confirm_screen.py:224
 msgid "Language Support:"
 msgstr "Sprachunterstützung:"
 
-#: ../src/confirm_screen.py:215 ../src/confirm_screen.py:217
+#: ../src/confirm_screen.py:232 ../src/confirm_screen.py:234
 #, python-format
 msgid "User Account: %s"
 msgstr "Benutzerkonto: %s"
 
-#: ../src/confirm_screen.py:215
+#: ../src/confirm_screen.py:232
 msgid "No user account."
 msgstr "Kein Benutzerkonto."
 
-#: ../src/confirm_screen.py:221
+#: ../src/confirm_screen.py:238
 msgid "Root Password: Same as user account."
 msgstr "Root-Passwort: Identisch mit dem des Benutzerkontos."
 
-#: ../src/confirm_screen.py:224
+#: ../src/confirm_screen.py:241
 #, python-format
 msgid "Host name: %s"
 msgstr "Hostname: %s"
@@ -191,7 +194,7 @@
 
 #: ../src/disk_screen.py:291 ../src/disk_screen.py:363
 #: ../src/disk_screen.py:457 ../src/disk_screen.py:491
-#: ../src/disk_screen.py:521 ../src/disk_screen.py:757
+#: ../src/disk_screen.py:521 ../src/disk_screen.py:762
 msgid "See log file for details."
 msgstr "Nähere Informationen finden Sie in der Protokolldatei."
 
@@ -218,8 +221,8 @@
 msgstr "Diese Festplatte ist zu klein"
 
 #: ../src/disk_screen.py:456 ../src/disk_screen.py:490
-#: ../src/disk_screen.py:520 ../src/disk_screen.py:756
-#: ../src/user_screen.py:299
+#: ../src/disk_screen.py:520 ../src/disk_screen.py:761
+#: ../src/user_screen.py:354
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
@@ -234,24 +237,24 @@
 msgid "Where should Oracle Solaris be installed?"
 msgstr "Wo soll Oracle Solaris installiert werden?"
 
-#: ../src/disk_screen.py:749
+#: ../src/disk_screen.py:754
 msgid "No disks were found."
 msgstr "Keine Festplatten gefunden."
 
 #. If we cannot get the icon info from the theme, then
 #. just fall back to making up a blank image
-#: ../src/disk_screen.py:852
+#: ../src/disk_screen.py:860
 msgid ""
 "Unable to display correct 'disk' graphics, but all other information is "
 "available."
 msgstr "Die korrekten 'Festplatten'-Grafiken können nicht angezeigt werden. Alle anderen Informationen sind verfügbar."
 
-#: ../src/failure_screen.py:70 ../xml/failure.xml.glade.h:4
+#: ../src/failure_screen.py:71 ../xml/failure.xml.glade.h:4
 msgid "Failure"
 msgstr "Fehler"
 
-#: ../src/failure_screen.py:70 ../src/finish_screen.py:80
-#: ../src/progress_screen.py:137 ../src/user_screen.py:109
+#: ../src/failure_screen.py:71 ../src/finish_screen.py:81
+#: ../src/progress_screen.py:144 ../src/user_screen.py:158
 msgid " "
 msgstr " "
 
@@ -282,11 +285,11 @@
 msgstr "<span size=\"smaller\"><span font_desc=\"Bold\">Warnung: </span> Die Daten dieser Partition werden gelöscht.</span>"
 
 #: ../src/fdisk_panel.py:1388 ../src/install_profile.py:124
-#: ../src/user_screen.py:301
+#: ../src/user_screen.py:356
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/finish_screen.py:80
+#: ../src/finish_screen.py:81
 msgid "Finished"
 msgstr "Beendet"
 
@@ -312,7 +315,7 @@
 "No help available"
 msgstr "Interner Fehler\n\nKeine Hilfe verfügbar"
 
-#: ../src/progress_screen.py:137
+#: ../src/progress_screen.py:144
 msgid "Installing"
 msgstr "Installation wird durchgeführt"
 
@@ -336,7 +339,7 @@
 msgid "Error:No log file found"
 msgstr "Fehler: keine Protokolldatei vorhanden"
 
-#: ../src/timezone.py:42
+#: ../src/timezone.py:48
 msgid "- Select -"
 msgstr "- Auswählen -"
 
@@ -350,66 +353,66 @@
 "date and time."
 msgstr "Wählen Sie auf der Karte eine Stadt in Ihrer Nähe aus, oder stellen Sie unten die von Ihnen gewünschte Zeitzone ein. Anschließend stellen Sie das Datum und die Uhrzeit ein."
 
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Time Zone Invalid"
 msgstr "Zeitzone ungültig"
 
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Please select a valid time zone"
 msgstr "Bitte wählen Sie eine gültige Zeitzone aus."
 
 #. update the label message
-#: ../src/user_screen.py:155 ../src/user_screen.py:183
-#: ../src/user_screen.py:201 ../src/user_screen.py:346
+#: ../src/user_screen.py:206 ../src/user_screen.py:234
+#: ../src/user_screen.py:254 ../src/user_screen.py:401
 #: ../xml/users.xml.glade.h:8
 msgid "Re-enter to check for typing errors."
 msgstr "Geben Sie den Namen erneut ein,\num Tippfehler auszuschließen."
 
-#: ../src/user_screen.py:203 ../src/user_screen.py:348
+#: ../src/user_screen.py:256 ../src/user_screen.py:403
 msgid "The two user passwords do not match."
 msgstr "Die beiden Benutzerpasswörter stimmen nicht überein."
 
-#: ../src/user_screen.py:277
+#: ../src/user_screen.py:332
 msgid "<b>Error:</b> A computer name is required."
 msgstr "<b>Fehler:</b> Ein Computername ist erforderlich."
 
-#: ../src/user_screen.py:279
+#: ../src/user_screen.py:334
 msgid "<b>Error:</b> Computer name exceeds maximum length."
 msgstr "<b>Fehler:</b> Der Computername überschreitet die maximale Länge."
 
-#: ../src/user_screen.py:281
+#: ../src/user_screen.py:336
 msgid "<b>Error:</b> Computer name contains invalid characters."
 msgstr "<b>Fehler:</b> Der Computername enthält ungültige Zeichen."
 
-#: ../src/user_screen.py:283
+#: ../src/user_screen.py:338
 msgid "<b>Error:</b> Computer name ends with invalid character."
 msgstr "<b>Fehler:</b> Der Computername endet mit einem ungültigen Zeichen."
 
-#: ../src/user_screen.py:293 ../src/user_screen.py:295
+#: ../src/user_screen.py:348 ../src/user_screen.py:350
 msgid "Invalid User Account"
 msgstr "Benutzerkonto ungültig"
 
-#: ../src/user_screen.py:294
+#: ../src/user_screen.py:349
 msgid "Enter a Log-in name."
 msgstr "Geben Sie einen Anmeldenamen ein."
 
-#: ../src/user_screen.py:296
+#: ../src/user_screen.py:351
 msgid "Enter a user password."
 msgstr "Geben Sie ein Benutzerpasswort ein."
 
-#: ../src/user_screen.py:297
+#: ../src/user_screen.py:352
 msgid "Invalid Computer Name"
 msgstr "Ungültiger Computername"
 
-#: ../src/user_screen.py:298
+#: ../src/user_screen.py:353
 msgid "Enter a computer name."
 msgstr "Geben Sie einen Computernamen ein."
 
-#: ../src/user_screen.py:302
+#: ../src/user_screen.py:357
 msgid "Recheck entries."
 msgstr "Überprüfen Sie die Einträge erneut."
 
-#: ../src/user_screen.py:380
+#: ../src/user_screen.py:435
 msgid "Internal error occurred creating profile"
 msgstr "Interner Fehler bei der Profilerstellung"
 

--- a/messages/install/de_DE/usr/share/locale/__LOCALE__/LC_MESSAGES/sysconfig.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/de_DE/usr/share/locale/__LOCALE__/LC_MESSAGES/sysconfig.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -21,7 +21,7 @@
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-07-29 11:23+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 01:44+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
 #: ../__init__.py:499
 #, python-format
@@ -181,7 +181,7 @@
 "     Terminal too small. Min size is 80x24. Current size is %(x)ix%(y)i."
 msgstr "     Terminal zu klein. Mindestgröße ist 80x24. Aktuelle Größe %(x)ix%(y)i."
 
-#: ../__init__.py:982 ../users.py:76
+#: ../__init__.py:982
 msgid "Continue"
 msgstr "Weiter"
 
@@ -223,7 +223,7 @@
 msgid "Do you really want to quit?"
 msgstr "Möchten Sie wirklich beenden?"
 
-#: ../__init__.py:1040 ../users.py:77
+#: ../__init__.py:1040
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -368,9 +368,9 @@
 
 #: ../nameservice.py:230
 msgid ""
-"Specify the domain where this system resides. Use the domain name's exact "
-"capitalization and punctuation."
-msgstr "Geben Sie die Domain an, unter der sich das System befindet. Beachten Sie bei der Eingabe des Domainnamens die Groß- und Kleinschreibung sowie Zeichensetzung."
+"Specify the domain for the NIS or LDAP name server. Use the domain name's "
+"exact capitalization and punctuation."
+msgstr "Geben Sie die Domain für den NIS- oder LDAP-Namenserver an. Beachten Sie bei der Eingabe des Domainnamens die Groß- und Kleinschreibung sowie Zeichensetzung."
 
 #: ../nameservice.py:233
 msgid "Domain Name:"
@@ -409,137 +409,137 @@
 msgid "Search domain:"
 msgstr "Suchdomain:"
 
-#: ../nameservice.py:422
+#: ../nameservice.py:418
 msgid "LDAP Profile"
 msgstr "LDAP-Profil"
 
-#: ../nameservice.py:427
+#: ../nameservice.py:423
 msgid "Profile name:"
 msgstr "Profilname:"
 
-#: ../nameservice.py:428
+#: ../nameservice.py:424
 msgid "Search base:"
 msgstr "Suchbasis:"
 
-#: ../nameservice.py:436
+#: ../nameservice.py:432
 msgid ""
 "Specify the name of the LDAP profile to be used to configure this system and "
 "the host name or IP address of the server that contains the profile."
 msgstr "Geben Sie den Namen des LDAP-Profils an, das zur Konfiguration dieses Systems verwendet werden soll, und den Hostnamen oder die IP-Adresse des Servers, der das Profil enthält."
 
-#: ../nameservice.py:439
+#: ../nameservice.py:435
 msgid "Profile server host name or IP address:"
 msgstr "Hostname oder IP-Adresse des Profilservers:"
 
-#: ../nameservice.py:442
+#: ../nameservice.py:438
 msgid ""
 "Specify the name of the LDAP profile to be used to configure this system and "
 "the IP address of the server that contains the profile."
 msgstr "Geben Sie den Namen des LDAP-Profils an, das zur Konfiguration dieses Systems verwendet werden soll, und die IP-Adresse des Servers, der das Profil enthält."
 
-#: ../nameservice.py:445
+#: ../nameservice.py:441
 msgid "Profile server IP address:"
 msgstr "IP-Adresse des Profilservers:"
 
-#: ../nameservice.py:446
+#: ../nameservice.py:442
 msgid "  Enter the LDAP search base."
 msgstr "  Geben Sie die LDAP-Suchbasis ein."
 
 #. in case of error, tell user what is being validated
-#: ../nameservice.py:459
+#: ../nameservice.py:455
 msgid "profile name"
 msgstr "Profilname"
 
-#: ../nameservice.py:491 ../nameservice.py:726
+#: ../nameservice.py:487 ../nameservice.py:722
 msgid "The LDAP profile name cannot be blank."
 msgstr "Der LDAP-Profilname darf nicht leer sein."
 
-#: ../nameservice.py:493
+#: ../nameservice.py:489
 msgid "The LDAP server IP address cannot be blank."
 msgstr "Die IP-Adresse des LDAP-Servers darf nicht leer sein."
 
-#: ../nameservice.py:510
+#: ../nameservice.py:506
 msgid "LDAP Proxy"
 msgstr "LDAP-Proxy"
 
-#: ../nameservice.py:515
+#: ../nameservice.py:511
 msgid ""
 "Does the profile specify a proxy credential level and an authentication "
 "method other than None?"
 msgstr "Ist im Profil eine Stufe für Proxy-Berechtigungsnachweise und eine andere Authentifizierungsmethode als Kein angegeben?"
 
-#: ../nameservice.py:524
+#: ../nameservice.py:520
 msgid "No"
 msgstr "Nein"
 
-#: ../nameservice.py:525
+#: ../nameservice.py:521
 msgid "Yes"
 msgstr "Ja"
 
-#: ../nameservice.py:549
+#: ../nameservice.py:545
 msgid "Specify LDAP Profile Proxy Bind Information"
 msgstr "Informationen zu LDAP-Profil-Proxy Bind angeben"
 
-#: ../nameservice.py:555
+#: ../nameservice.py:551
 msgid ""
 "Specify the LDAP proxy bind distinguished name and the LDAP proxy bind "
 "password.  The network administrator can provide this information."
 msgstr "Geben Sie den LDAP Proxy Bind-DN (Distinguished Name) und das LDAP Proxy Bind-Passwort an. Wenden Sie sich bei Bedarf an Ihren Netzwerkadministrator."
 
-#: ../nameservice.py:558
+#: ../nameservice.py:554
 msgid "Proxy bind distinguished name:"
 msgstr "Proxy Bind-DN:"
 
-#: ../nameservice.py:561
+#: ../nameservice.py:557
 msgid "Proxy bind password:"
 msgstr "Proxy Bind-Passwort:"
 
-#: ../nameservice.py:563
+#: ../nameservice.py:559
 msgid "Encrypted proxy bind password:"
 msgstr "Verschlüsseltes Proxy Bind-Passwort:"
 
 #. in case of error, tell user what is being validated
-#: ../nameservice.py:583
+#: ../nameservice.py:579
 msgid "distinguished name"
 msgstr "Distinguished Name"
 
-#: ../nameservice.py:600
+#: ../nameservice.py:596
 msgid "The LDAP proxy server distinguished name cannot be blank."
 msgstr "Der DN des LDAP-Proxy-Servers darf nicht leer sein."
 
-#: ../nameservice.py:610
+#: ../nameservice.py:606
 msgid "NIS Name Server"
 msgstr "NIS-Namenserver"
 
-#: ../nameservice.py:616
+#: ../nameservice.py:612
 msgid "Specify how to find a name server for this system."
 msgstr "Geben Sie an, wie nach einem Namenserver für dieses System gesucht werden soll."
 
-#: ../nameservice.py:618
+#: ../nameservice.py:614
 msgid ""
 "Either let the software search for a name server, or specify a name server "
 "in the following screen.  "
 msgstr "Lassen Sie die Software nach einem Namenserver suchen, oder geben Sie auf dem nächsten Bildschirm einen Nameserver an.  "
 
-#: ../nameservice.py:621
+#: ../nameservice.py:617
 msgid ""
 "The software can find a name server only if that server is on the local "
 "subnet."
 msgstr "Ein Namenserver kann nur dann durch die Software gefunden werden, wenn sich dieser im lokalen Subnetz befindet."
 
-#: ../nameservice.py:631
+#: ../nameservice.py:627
 msgid "Find one"
 msgstr "Namenserver suchen"
 
-#: ../nameservice.py:632
+#: ../nameservice.py:628
 msgid "Specify one"
 msgstr "Namenserver angeben"
 
-#: ../nameservice.py:661
+#: ../nameservice.py:657
 msgid "NIS Name Server Information"
 msgstr "Informationen zu NIS-Namenserver"
 
-#: ../nameservice.py:676
+#: ../nameservice.py:672
 msgid ""
 "Enter the host name or IP address of the name server.  A host name must have "
 "at least 2 characters and can be alphanumeric and can contain hyphens.  IP "
@@ -547,95 +547,95 @@
 "example, 129.200.9.1)."
 msgstr "Geben Sie den Hostnamen oder die IP-Adresse des Namenservers ein.  Ein Hostname muss aus mindestens 2 Zeichen bestehen und darf alphanumerische Zeichen sowie Bindestriche enthalten. IP-Adressen müssen vier durch Punkt voneinander getrennte Zahlengruppen (z.B. 129.200.9.1) enthalten."
 
-#: ../nameservice.py:681
+#: ../nameservice.py:677
 msgid "Server's host name or IP address:"
 msgstr "Hostname oder IP-Adresse des Servers:"
 
-#: ../nameservice.py:684
+#: ../nameservice.py:680
 msgid ""
 "Enter the IP address of the name server.  IP addresses must contain four "
 "sets of numbers separated by periods (for example, 129.200.9.1)."
 msgstr "Geben Sie die IP-Adresse des Namenservers ein. IP-Adressen müssen vier durch Punkt voneinander getrennte Zahlengruppen (z. B. 129.200.9.1) enthalten."
 
-#: ../nameservice.py:687
+#: ../nameservice.py:683
 msgid "Server's IP address:"
 msgstr "IP-Adresse des Servers:"
 
-#: ../nameservice.py:714
+#: ../nameservice.py:710
 msgid "The NIS server IP address cannot be blank."
 msgstr "Die IP-Adresse des NIS-Servers darf nicht leer sein."
 
-#: ../nameservice.py:727
+#: ../nameservice.py:723
 msgid ""
 "Whitespace characters and quotation marks are not allowed in LDAP profile "
 "names."
 msgstr "Leerzeichen und Anführungszeichen dürfen in LDAP-Profilnamen nicht verwendet werden."
 
-#: ../nameservice.py:741
+#: ../nameservice.py:737
 msgid "The LDAP proxy bind distinguished name may not be blank."
 msgstr "Der LDAP Proxy Bind-DN darf nicht leer sein."
 
-#: ../nameservice.py:744
+#: ../nameservice.py:740
 msgid ""
 "The LDAP proxy bind distinguished name may not contain whitespace characters."
 msgstr "Der LDAP Proxy Bind-DN darf keine Leerzeichen enthalten."
 
-#: ../nameservice.py:747
+#: ../nameservice.py:743
 msgid "The LDAP proxy bind distinguished name may not contain quotation marks."
 msgstr "Der LDAP Proxy Bind-DN darf keine Anführungszeichen enthalten."
 
-#: ../nameservice.py:757
+#: ../nameservice.py:753
 msgid "The LDAP proxy bind password may not be blank."
 msgstr "Das LDAP Proxy Bind-Passwort darf nicht leer sein."
 
-#: ../nameservice.py:760
+#: ../nameservice.py:756
 msgid "The LDAP proxy bind password may not contain whitespace characters."
 msgstr "Das LDAP Proxy Bind-Passwort darf keine Leerzeichen enthalten."
 
-#: ../nameservice.py:763
+#: ../nameservice.py:759
 msgid "The LDAP proxy bind password may not contain quotation marks."
 msgstr "Das LDAP Proxy Bind-Passwort darf keine Anführungszeichen enthalten."
 
-#: ../nameservice.py:777 ../nameservice.py:848
+#: ../nameservice.py:773 ../nameservice.py:844
 msgid ""
 "A host name can only contain letters, numbers,  periods, and minus signs (-)."
 msgstr "Ein Hostname darf nur Buchstaben, Zahlen, Punkte und Minuszeichen (-) enthalten."
 
-#: ../nameservice.py:808
+#: ../nameservice.py:804
 msgid "The domain cannot be blank."
 msgstr "Die Domain darf nicht leer sein."
 
-#: ../nameservice.py:812
+#: ../nameservice.py:808
 msgid "Domain labels must have less than 64 characters."
 msgstr "Domainbezeichnungen dürfen nicht mehr als 64 Zeichen enthalten."
 
-#: ../nameservice.py:815
+#: ../nameservice.py:811
 msgid "Domain labels should not start or end with hyphens ('-')."
 msgstr "Domainbezeichnungen dürfen nicht mit Bindestrich ('-') beginnen oder enden."
 
-#: ../nameservice.py:818
+#: ../nameservice.py:814
 msgid "Invalid domain"
 msgstr "Ungültige Domain"
 
-#: ../nameservice.py:868
+#: ../nameservice.py:864
 #, python-format
 msgid "The %s cannot be blank."
 msgstr "%s darf nicht leer sein."
 
-#: ../nameservice.py:871
+#: ../nameservice.py:867
 #, python-format
 msgid "Invalid character for %s."
 msgstr "Ungültiges Zeichen für %s."
 
-#: ../nameservice.py:883
+#: ../nameservice.py:879
 msgid "Domain labels must have less than 64 characters"
 msgstr "Domainbezeichnungen dürfen 64 Zeichen nicht überschreiten."
 
-#: ../nameservice.py:885
+#: ../nameservice.py:881
 msgid "A domain label may not begin with a hyphen."
 msgstr "Eine Domainbezeichnung darf nicht mit einem Bindestrich beginnen."
 
-#: ../nameservice.py:888
+#: ../nameservice.py:884
 msgid "Invalid character for domain name."
 msgstr "Ungültiges Zeichen für Domainname"
 
@@ -807,10 +807,6 @@
 msgstr "Ungültiges Zeichen"
 
 #: ../profile/user_info.py:284
-msgid "User password must be entered."
-msgstr "Ein Benutzerpasswort muss eingegeben werden."
-
-#: ../profile/user_info.py:284
 msgid "Password must be entered."
 msgstr "Ein Passwort muss eingegeben werden."
 
@@ -911,69 +907,81 @@
 msgid "Router: %s"
 msgstr "    Router: %s"
 
-#: ../summary.py:209
+#: ../summary.py:214
+msgid "  Warning: No root password set"
+msgstr "  Warnung: Kein Root-Passwort festgelegt"
+
+#: ../summary.py:216
 #, python-format
-msgid "Domain: %s"
-msgstr "    Domain: %s"
+msgid "  Username: %s"
+msgstr "  Benutzername: %s"
+
+#: ../summary.py:218
+msgid "  No user account"
+msgstr "  Kein Benutzerkonto"
 
-#: ../summary.py:212 ../summary.py:220 ../summary.py:233
+#: ../summary.py:224
+#, python-format
+msgid "Time Zone: %s"
+msgstr "Zeitzone: %s"
+
+#: ../summary.py:238 ../summary.py:246 ../summary.py:260
 #, python-format
 msgid "Name service: %s"
 msgstr "Name Service: %s"
 
-#: ../summary.py:215
+#: ../summary.py:241
 msgid "DNS servers: "
 msgstr "DNS-Server: "
 
-#: ../summary.py:217
+#: ../summary.py:243
 msgid "DNS Domain search list: "
 msgstr "Suchliste der DNS-Domain: "
 
-#: ../summary.py:222
+#: ../summary.py:248 ../summary.py:262
+#, python-format
+msgid "Domain: %s"
+msgstr "    Domain: %s"
+
+#: ../summary.py:249
 msgid "LDAP profile: "
 msgstr "LDAP-Profil: "
 
-#: ../summary.py:223
+#: ../summary.py:250
 msgid "LDAP server's IP: "
 msgstr "IP des LDAP-Servers: "
 
-#: ../summary.py:224
+#: ../summary.py:251
 msgid "LDAP search base: "
 msgstr "LDAP-Suchbasis: "
 
-#: ../summary.py:228
+#: ../summary.py:255
 msgid "LDAP proxy bind distinguished name: "
 msgstr "LDAP Proxy Bind-DN: "
 
-#: ../summary.py:230
+#: ../summary.py:257
 msgid "LDAP proxy bind password: [concealed]"
 msgstr "LDAP Proxy Bind-Passwort: [verborgen]"
 
-#: ../summary.py:236
+#: ../summary.py:264
 msgid "NIS server: broadcast"
 msgstr "NIS-Server: Broadcast"
 
-#: ../summary.py:238
+#: ../summary.py:266
 msgid "NIS server's IP: "
 msgstr "NIS-Server-IP: "
 
-#: ../summary.py:249
-msgid "  Warning: No root password set"
-msgstr "  Warnung: Kein Root-Passwort festgelegt"
-
-#: ../summary.py:251
-#, python-format
-msgid "  Username: %s"
-msgstr "  Benutzername: %s"
+#: ../summary.py:269
+msgid "Note: DNS will be configured to resolve host and IP node names."
+msgstr "Hinweis: DNS wird konfiguriert, um Host- und IP-Knotennamen aufzulösen."
 
-#: ../summary.py:253
-msgid "  No user account"
-msgstr "  Kein Benutzerkonto"
+#: ../summary.py:271
+msgid "This setting can be modified upon rebooting. For example:"
+msgstr "Diese Einstellung kann beim Neustart geändert werden. Beispiel:"
 
-#: ../summary.py:259
-#, python-format
-msgid "Time Zone: %s"
-msgstr "Zeitzone: %s"
+#: ../summary.py:278
+msgid "See nsswitch.conf(4), svccfg(1M) and nscfg(1M)."
+msgstr "Siehe nsswitch.conf(4), svccfg(1M) und nscfg(1M)."
 
 #: ../timezone.py:53
 msgid "UTC/GMT"
@@ -1015,7 +1023,7 @@
 msgid "Regions"
 msgstr "Regionen"
 
-#: ../users.py:57 ../users.py:79
+#: ../users.py:57 ../users.py:68
 msgid "Users"
 msgstr "Benutzer"
 
@@ -1051,42 +1059,19 @@
 msgid "User password:"
 msgstr "Benutzerpasswort:"
 
-#: ../users.py:68
-msgid "No Root Password"
-msgstr "Kein Root-Passwort"
-
-#: ../users.py:69
-msgid ""
-"A root password has not been defined. The system is completely unsecured.\n"
-"\n"
-"Choose Cancel to set a root password."
-msgstr "Es wurde kein Root-Passwort definiert. Das System ist ungesichert.\n\nWählen Sie Abbrechen, um ein Root-Passwort zu definieren."
-
-#: ../users.py:72
-msgid "No User Password"
-msgstr "Kein Benutzerpasswort"
-
-#: ../users.py:73
-msgid ""
-"A user password has not been defined. The user account has administrative "
-"privileges so the system is unsecured.\n"
-"\n"
-"Choose Cancel to set a user password."
-msgstr "Es wurde kein Benutzerpasswort definiert. Das Benutzerkonto hat Administratorrechte. Das System ist daher ungesichert.\n\nWählen Sie Abbrechen, um ein Benutzerpasswort zu definieren."
-
-#: ../users.py:297
+#: ../users.py:311
 msgid "Root passwords don't match"
 msgstr "Root-Passwörter stimmen nicht überein"
 
-#: ../users.py:300
+#: ../users.py:324
 msgid "User passwords don't match"
 msgstr "Benutzerpasswörter stimmen nicht überein"
 
-#: ../users.py:322
+#: ../users.py:329
 msgid "Enter username or clear all user account fields"
 msgstr "Benutzernamen eingeben oder alle Benutzerkontofelder löschen"
 
-#: ../users.py:369
+#: ../users.py:367
 msgid "Passwords don't match"
 msgstr "Passwörter stimmen nicht überein"
 

--- a/messages/install/de_DE/usr/share/locale/__LOCALE__/LC_MESSAGES/textinstall.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/de_DE/usr/share/locale/__LOCALE__/LC_MESSAGES/textinstall.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -20,53 +20,59 @@
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
+#: ../disk_selection.py:96
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-07-29 11:16+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 12:36+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
 #: ../__init__.py:53
 msgid "Oracle Solaris"
 msgstr "Oracle Solaris"
 
-#: ../__init__.py:126
+#. Localized values used by other files
+#: ../__init__.py:57
+msgid "GB"
+msgstr "GB"
+
+#: ../__init__.py:128
 #, python-format
 msgid ""
 "Exiting Text Installer. Log is available at:\n"
 "%s"
 msgstr "Textbasiertes Installationsprogramm wird beendet. Protokoll verfügbar unter:\n%s"
 
-#: ../__init__.py:300
+#: ../__init__.py:303
 msgid ""
 "DONT_TRANSLATE_BUT_REPLACE_msgstr_WITH_True_OR_False: Should wrap text on "
 "whitespace in this language"
 msgstr "True"
 
-#: ../__init__.py:303
+#: ../__init__.py:306
 msgid "Confirm: Quit the Installer?"
 msgstr "Bestätigen: Installationsprogramm beenden?"
 
-#: ../__init__.py:304
+#: ../__init__.py:307
 msgid "Do you want to quit the Installer?"
 msgstr "Soll das Installationsprogramm beendet werden?"
 
-#: ../__init__.py:305 ../disk_selection.py:106
+#: ../__init__.py:308 ../disk_selection.py:108
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../__init__.py:306 ../__init__.py:376
+#: ../__init__.py:309 ../__init__.py:379
 msgid "Quit"
 msgstr "Ende"
 
-#: ../__init__.py:313
+#: ../__init__.py:316
 #, python-format
 msgid "The %(release)s Text Installer must be run with root privileges"
 msgstr "Textbasiertes %(release)s-Installationsprogramm erfordert Root-Berechtigungen"
 
-#: ../__init__.py:318
+#: ../__init__.py:321
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr "Setzt Protokollspeicherplatz auf FILE (Standard: %default)."
 
-#: ../__init__.py:322
+#: ../__init__.py:325
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -74,274 +80,264 @@
 "[default: %default]"
 msgstr "Setzt Ausführlichkeit auf LEVEL. Gültige Werte zum Erhöhen der Ausführlichkeit sind 'error', 'warn', 'info', 'debug' oder 'input'\n[Standard: %default]."
 
-#: ../__init__.py:329
+#: ../__init__.py:332
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr "Aktiviert Debug-Modus. Setzt Protokollebene auf 'input' und ermöglicht, das Programm mit Strg-C abzubrechen.\n"
 
-#: ../__init__.py:333
+#: ../__init__.py:336
 msgid ""
 "Force the installer to run in black and white. This may be useful on some "
 "SPARC machines with unsupported frame buffers\n"
 msgstr "Erzwingt die Ausführung  des Installationsprogramms im Schwarzweißmodus. Dies kann auf einigen SPARC-Rechnern mit Framepuffern sinnvoll sein.\n"
 
-#: ../__init__.py:338
+#: ../__init__.py:341
 msgid ""
 "Runs in 'no installation' mode. When run in 'no installation' mode, no "
 "persistent changes are made to the disks and booted environment\n"
 msgstr "Wird im Modus 'Keine Installation' ausgeführt. In diesem Modus werden keine dauerhaften Änderungen an Festplatten oder der gebooteten Umgebung vorgenommen.\n"
 
-#: ../__init__.py:365
+#: ../__init__.py:368
 #, python-format
 msgid ""
 "     Terminal too small. Min size is 80x24. Current size is %(x)ix%(y)i."
 msgstr "     Terminal zu klein. Mindestgröße ist 80x24. Aktuelle Größe %(x)ix%(y)i."
 
-#: ../__init__.py:371 ../disk_selection.py:107
+#: ../__init__.py:374 ../disk_selection.py:109
 msgid "Continue"
 msgstr "Weiter"
 
-#: ../__init__.py:373
+#: ../__init__.py:376
 msgid "Back"
 msgstr "Zurück"
 
-#: ../__init__.py:375
+#: ../__init__.py:378
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../__init__.py:380
+#: ../__init__.py:383
 msgid "Help Topics"
 msgstr "Hilfethemen"
 
-#: ../__init__.py:381
+#: ../__init__.py:384
 msgid "Help Index"
 msgstr "Hilfeindex"
 
-#: ../__init__.py:382
+#: ../__init__.py:385
 msgid "Select a topic and press Continue."
 msgstr "Wählen Sie ein Thema und klicken Sie auf Weiter."
 
-#: ../__init__.py:417
+#: ../__init__.py:421
 msgid "An unhandled exception occurred."
 msgstr "Eine nicht behandelte Ausnahme ist aufgetreten."
 
-#: ../__init__.py:422
+#: ../__init__.py:426
 msgid "Full traceback data is in the installation log"
 msgstr "Vollständige Traceback-Daten im Installationsprotokoll"
 
-#: ../__init__.py:423
+#: ../__init__.py:427
 msgid "Please file a bug at http://defect.opensolaris.org"
 msgstr "Melden Sie einen Bug unter http://defect.opensolaris.org"
 
-#: ../disk_selection.py:68 ../disk_selection.py:109
+#: ../disk_selection.py:69 ../disk_selection.py:111
 msgid "Disks"
 msgstr "Festplatten"
 
-#: ../disk_selection.py:69
+#: ../disk_selection.py:70
 #, python-format
 msgid "Where should %(release)s be installed?"
 msgstr "Wo soll %(release)s installiert werden?"
 
-#: ../disk_selection.py:70
-#, python-format
-msgid "Recommended size:  %(recommend).1fGB      Minimum size: %(min).1fGB"
-msgstr "Empfohlene Größe:  %(recommend).1fGB      Minimum: %(min).1fGB"
+#: ../disk_selection.py:71
+msgid "Recommended size: "
+msgstr "Empfohlene Größe: "
 
 #: ../disk_selection.py:72
+msgid "    Minimum size: "
+msgstr "    Mindestgröße: "
+
+#: ../disk_selection.py:73
 msgid "Seeking disks on system"
 msgstr "Festplatten auf dem System werden gesucht"
 
-#: ../disk_selection.py:73 ../fdisk_partitions.py:66
+#: ../disk_selection.py:74 ../fdisk_partitions.py:68
 msgid "The following partitions were found on the disk."
 msgstr "Auf der Festplatte wurden folgende Partitionen gefunden."
 
-#: ../disk_selection.py:74 ../fdisk_partitions.py:69
+#: ../disk_selection.py:75 ../fdisk_partitions.py:71
 msgid "The following slices were found on the disk."
 msgstr "Auf der Festplatte wurden folgende Bereiche gefunden."
 
-#: ../disk_selection.py:75 ../fdisk_partitions.py:67
+#: ../disk_selection.py:76 ../fdisk_partitions.py:69
 msgid "A partition table was not found. The following is proposed."
 msgstr "Keine Partitionstabelle gefunden. Folgendes wird vorgeschlagen."
 
-#: ../disk_selection.py:77 ../fdisk_partitions.py:70
+#: ../disk_selection.py:78 ../fdisk_partitions.py:72
 msgid "A VTOC label was not found. The following is proposed."
 msgstr "VTOC-Festplattenkennzeichnung nicht gefunden. Folgendes wird vorgeschlagen."
 
-#: ../disk_selection.py:79
+#: ../disk_selection.py:80
 msgid "A GPT labeled disk was found. The following is proposed."
 msgstr "Festplatte mit GPT-Kennzeichnung gefunden. Folgendes wird vorgeschlagen."
 
-#: ../disk_selection.py:81
-msgid "Too small"
-msgstr "Zu klein"
-
-#: ../disk_selection.py:82
-#, python-format
-msgid "Limited to %.1f TB"
-msgstr "Beschränkt auf %.1f TB"
-
-#: ../disk_selection.py:83
+#: ../disk_selection.py:84
 msgid "GPT labeled disk"
 msgstr "Festplatte mit GPT-Kennzeichnung"
 
-#: ../disk_selection.py:84
+#: ../disk_selection.py:85
 msgid "No disks found. Additional device drivers may be needed."
 msgstr "Keine Festplatten gefunden. Mögl. weitere Gerätetreiber notwendig."
 
-#: ../disk_selection.py:86
+#: ../disk_selection.py:87
 #, python-format
 msgid "%(release)s cannot be installed on any disk"
 msgstr "%(release)s kann auf keiner Festplatte installiert werden"
 
-#: ../disk_selection.py:87
+#: ../disk_selection.py:88
 msgid ""
 "An error occurred while searching for installation targets. Please check the "
 "install log and file a bug at defect.opensolaris.org."
 msgstr "Fehler bei der Suche nach Installationszielen aufgetreten. Überprüfen Sie das Installationsprotokoll und melden Sie unter defect.opensolaris.org einen Bug."
 
-#: ../disk_selection.py:91
+#: ../disk_selection.py:92
 msgid "Type"
 msgstr "Typ"
 
-#: ../disk_selection.py:92 ../disk_window.py:64 ../disk_window.py:67
-#: ../disk_window.py:72 ../disk_window.py:76
+#: ../disk_selection.py:93 ../disk_window.py:65 ../disk_window.py:68
+#: ../disk_window.py:73 ../disk_window.py:77
 msgid "Size(GB)"
 msgstr "Größe(GB)"
 
-#: ../disk_selection.py:93 ../fdisk_partitions.py:55
+#: ../disk_selection.py:94 ../fdisk_partitions.py:56
 #: ../partition_edit_screen.py:89
 msgid "Boot"
 msgstr "Boot"
 
-#: ../disk_selection.py:94
+#: ../disk_selection.py:95
 msgid "Device"
 msgstr "Gerät"
 
-#: ../disk_selection.py:95
-msgid "Manufacturer"
-msgstr "Hersteller"
-
-#: ../disk_selection.py:96
-msgid "Notes"
-msgstr "Hinweise"
-
-#: ../disk_selection.py:99
+#: ../disk_selection.py:101
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../disk_selection.py:100
+#: ../disk_selection.py:102
 #, python-format
 msgid "Only the first %.1fTB can be used."
 msgstr "Nur das erste %.1fTB kann verwendet werden."
 
-#: ../disk_selection.py:101
+#: ../disk_selection.py:103
 msgid ""
 "You have chosen a GPT labeled disk. Installing onto a GPT labeled disk will "
 "cause the loss of all existing data and the disk will be relabeled as SMI."
 msgstr "Sie haben eine Festplatte mit GPT-Kennzeichnung gewählt. Bei Installation auf dieser Festplatte gehen vorhandene Daten verloren. Die Festplatte wird als SMI neu kennzeichnet."
 
-#: ../disk_window.py:63 ../disk_window.py:66
+#: ../disk_window.py:64 ../disk_window.py:67
 msgid "Primary"
 msgstr "Primär"
 
-#: ../disk_window.py:63 ../disk_window.py:66
+#: ../disk_window.py:64 ../disk_window.py:67
 msgid "Logical"
 msgstr "Logisch"
 
-#: ../disk_window.py:68 ../disk_window.py:77
+#: ../disk_window.py:69 ../disk_window.py:78
 msgid " Avail"
 msgstr " Verf."
 
-#: ../disk_window.py:70 ../disk_window.py:74
+#: ../disk_window.py:71 ../disk_window.py:75
 msgid "Slice"
 msgstr "Bereich"
 
-#: ../disk_window.py:341
+#: ../disk_window.py:342
 #, python-format
 msgid "%d more partitions"
 msgstr "%d weitere Partitionen"
 
-#: ../disk_window.py:343
+#: ../disk_window.py:344
 #, python-format
 msgid "%d more slices"
 msgstr "%d weitere Bereiche"
 
-#: ../disk_window.py:775 ../disk_window.py:785
-msgid "Only the digits 0-9 and \".\" are valid."
-msgstr "Nur Zahlen 0-9 und \".\" sind gültig."
+#: ../disk_window.py:777 ../disk_window.py:787
+#, python-format
+msgid "Only the digits 0-9 and %s are valid."
+msgstr "Nur die Ziffern 0-9 und %s sind gültig."
 
-#: ../disk_window.py:778
-msgid "A number can only have one \".\""
-msgstr "Zahl darf nur einen \".\" haben"
+#: ../disk_window.py:780
+#, python-format
+msgid "A number can only have one %s"
+msgstr "Eine Zahl darf nur über ein %s verfügen"
 
-#: ../disk_window.py:787
+#: ../disk_window.py:789
 msgid "Size can be specified to only one decimal place."
 msgstr "Größe kann nur bis auf eine Dezimalstelle angegeben werden."
 
-#: ../disk_window.py:803
+#: ../disk_window.py:807
 #, python-format
-msgid ""
-"The new size (%(size).1f) is greater than the available space (%(avail).1f)"
-msgstr "Neue Größe (%(size).1f) ist größer als der verf. Platz (%(avail).1f)"
+msgid "The new size %(size)s is greater than the available space %(avail)s"
+msgstr "Neue Größe %(size)s übersteigt den verfügbaren Platz %(avail)s"
 
-#: ../fdisk_partitions.py:56
-#, python-format
-msgid "Fdisk Partitions: %(size).1fGB %(type)s %(bootable)s"
-msgstr "Fdisk-Partitionen: %(size).1fGB %(type)s %(bootable)s"
+#: ../fdisk_partitions.py:57
+msgid "Fdisk Partitions: "
+msgstr "Fdisk-Partitionen: "
 
-#: ../fdisk_partitions.py:57 ../fdisk_partitions.py:84
+#: ../fdisk_partitions.py:58 ../fdisk_partitions.py:86
 msgid "Solaris Partition Slices"
 msgstr "Solaris-Partitionsbereiche"
 
-#: ../fdisk_partitions.py:58
+#: ../fdisk_partitions.py:59
+msgid "Solaris Slices: "
+msgstr "Solaris-Bereiche: "
+
+#: ../fdisk_partitions.py:60 ../partition_edit_screen.py:84
 #, python-format
-msgid "Solaris Slices: %(size).1fGB %(type)s %(bootable)s"
-msgstr "Solaris-Bereiche: %(size).1fGB %(type)s %(bootable)s"
+msgid " %(type)s %(bootable)s"
+msgstr " %(type)s %(bootable)s"
 
-#: ../fdisk_partitions.py:59
+#: ../fdisk_partitions.py:61
 #, python-format
 msgid ""
 "%(release)s can be installed on the whole disk or a partition on the disk."
 msgstr "%(release)s kann auf gesamter Festplatte oder einer Partition installiert werden."
 
-#: ../fdisk_partitions.py:61
+#: ../fdisk_partitions.py:63
 #, python-format
 msgid ""
 "%(release)s can be installed in the whole fdisk partition or within a slice "
 "in the partition"
 msgstr "%(release)s kann auf gesamter Fdisk-Partition oder in einem Bereich installiert werden"
 
-#: ../fdisk_partitions.py:64
+#: ../fdisk_partitions.py:66
 #, python-format
 msgid "%(release)s can be installed on the whole disk or a slice on the disk."
 msgstr "%(release)s kann auf gesamter Festplatte oder in einem Bereich installiert werden."
 
-#: ../fdisk_partitions.py:72
+#: ../fdisk_partitions.py:74
 msgid "Use the whole disk"
 msgstr "Gesamte Festplatte verwenden"
 
-#: ../fdisk_partitions.py:73
+#: ../fdisk_partitions.py:75
 msgid "Use the whole partition"
 msgstr "Gesamte Partition verwenden"
 
-#: ../fdisk_partitions.py:74
+#: ../fdisk_partitions.py:76
 msgid "Use a slice in the partition"
 msgstr "Bereich in der Partition verwenden"
 
-#: ../fdisk_partitions.py:75
+#: ../fdisk_partitions.py:77
 msgid "Use a partition of the disk"
 msgstr "Eine Festplattenpartition verwenden"
 
-#: ../fdisk_partitions.py:76
+#: ../fdisk_partitions.py:78
 msgid "Use a slice on the disk"
 msgstr "Einen Festplattenbereich verwenden"
 
-#: ../fdisk_partitions.py:79
+#: ../fdisk_partitions.py:81
 msgid "Solaris Slices"
 msgstr "Solaris-Bereiche"
 
-#: ../fdisk_partitions.py:82
+#: ../fdisk_partitions.py:84
 msgid "Fdisk Partitions"
 msgstr "Fdisk-Partitionen"
 
@@ -405,7 +401,7 @@
 "\t%s"
 msgstr "Protokolldatei konnte nicht gelesen werden:\n\t%s"
 
-#: ../partition_edit_screen.py:59
+#: ../partition_edit_screen.py:60
 msgid ""
 "Oracle Solaris will be installed into the Solaris partition. A partition's "
 "type can be changed using the F5 key.\n"
@@ -418,7 +414,7 @@
 "\"Extended\" partition its logical partitions are listed on the right."
 msgstr "Oracle Solaris wird auf der Solaris-Partition installiert. Der Partitions- typ kann mit F5-Taste geändert werden.\n\nDie Partitionsgröße kann bis auf die Verf.-Größe erweitert werden. Erweitern Sie die Verf.-Größe, indem Sie eine benachbarte Partition löschen. Drücken Sie F5, um sie als \"nicht verwendet\" zu kennzeichnen und so zu löschen.\nDie vier primären Partitionsslots sind links aufgeführt. Wenn eine Partition \"Erweitert\" ist, werden die logischen Partitionen rechts aufgeführt."
 
-#: ../partition_edit_screen.py:71
+#: ../partition_edit_screen.py:72
 #, python-format
 msgid ""
 "%(release)s will be installed in the \"%(pool)s\" slice. Use the F5 key to "
@@ -431,19 +427,17 @@
 "Slices are listed in disk layout order."
 msgstr "%(release)s wird im Bereich \"%(pool)s\" installiert. Drücken Sie F5, um einen Bereich in \"%(pool)s\" zu ändern.\n\nDie Bereichsgröße kann bis auf die Verf.-Größe erweitert werden. Diese Größe kann durch Löschen eines benachbarten Bereichs erweitert werden. Drücken Sie F5, um \"nicht verwendet\" zu wählen und ihn so zu löschen.\n\nBereiche werden in Festplattenlayout-Reihenfolge aufgeführt."
 
-#: ../partition_edit_screen.py:80
-#, python-format
-msgid "Select Partition: %(size).1fGB %(type)s %(bootable)s"
-msgstr "Partition wählen: %(size).1fGB %(type)s %(bootable)s"
+#: ../partition_edit_screen.py:81
+msgid "Select Partition: "
+msgstr "Partition auswählen: "
 
 #: ../partition_edit_screen.py:82
 msgid "Select Slice in Fdisk Partition"
 msgstr "Bereich in Fdisk-Partition wählen"
 
 #: ../partition_edit_screen.py:83
-#, python-format
-msgid "Select Slice: %(size).1fGB %(type)s%(bootable)s"
-msgstr "Bereich auswählen: %(size).1fGB %(type)s%(bootable)s"
+msgid "Select Slice: "
+msgstr "Bereich auswählen: "
 
 #: ../partition_edit_screen.py:85
 msgid "indicates the slice's current content will be destroyed"
@@ -469,163 +463,115 @@
 msgid "Change Type"
 msgstr "Typ ä."
 
-#: ../summary.py:61 ../summary.py:66
+#: ../summary.py:63 ../summary.py:68
 msgid "Installation Summary"
 msgstr "Installationszusammenfassung"
 
-#: ../summary.py:62
+#: ../summary.py:64
 msgid ""
 "Review the settings below before installing. Go back (F3) to make changes."
 msgstr "Prüfen Sie die Einstll. vor der Installation. Zurück zum Ändern mit F3."
 
-#: ../summary.py:72
+#: ../summary.py:74
 msgid "Install"
 msgstr "Install."
 
-#: ../summary.py:111
+#: ../summary.py:113
 #, python-format
 msgid "Software: %s"
 msgstr "Software: %s"
 
-#: ../summary.py:117
+#: ../summary.py:119
 msgid "Language: *The following can be changed when logging in."
 msgstr "Sprache: *Folgende Änderungen beim Anmelden möglich."
 
-#: ../summary.py:121
+#: ../summary.py:123
 #, python-format
 msgid "  Default language: %s"
 msgstr "  Standardsprache: %s"
 
-#: ../summary.py:124
+#: ../summary.py:126
 msgid "Keyboard layout: *The following can be changed when logging in."
 msgstr "Tastaturlayout: *Folgende Änderungen beim Anmelden möglich."
 
-#: ../summary.py:126
+#: ../summary.py:128
 #, python-format
 msgid "  Default keyboard layout: %s"
 msgstr "  Standardtastaturlayout: %s"
 
-#: ../summary.py:129
+#: ../summary.py:131
 #, python-format
 msgid "Terminal type: %s"
 msgstr "Terminaltyp: %s"
 
-#: ../summary.py:132
+#: ../summary.py:134
 msgid "Users:"
 msgstr "Benutzer:"
 
-#: ../summary.py:135
+#: ../summary.py:137
 msgid "Network:"
 msgstr "Netzwerk:"
 
-#: ../summary.py:147
+#: ../summary.py:149
 #, python-format
 msgid "  Computer name: %s"
 msgstr "  Computername: %s"
 
-#: ../summary.py:152
+#: ../summary.py:154
 msgid "  Network Configuration: Automatic"
 msgstr "  Netzwerkkonfiguration: Automatisch"
 
-#: ../summary.py:154
+#: ../summary.py:156
 msgid "  Network Configuration: None"
 msgstr "  Netzwerkkonfiguration: Keine"
 
-#: ../summary.py:156
+#: ../summary.py:158
 #, python-format
 msgid "  Manual Configuration: %s"
 msgstr "  Manuelle Konfiguration: %s"
 
-#: ../summary.py:158
+#: ../summary.py:160
 #, python-format
 msgid "    IP Address: %s"
 msgstr "    IP-Adresse: %s"
 
-#: ../summary.py:159
+#: ../summary.py:161
 #, python-format
 msgid "    Netmask: %s"
 msgstr "    Netzmaske: %s"
 
-#: ../summary.py:161
+#: ../summary.py:163
 #, python-format
 msgid "    Router: %s"
 msgstr "    Router: %s"
 
-#: ../summary.py:172
-#, python-format
-msgid "Domain: %s"
-msgstr "    Domain: %s"
-
-#: ../summary.py:175 ../summary.py:185 ../summary.py:198
-#, python-format
-msgid "Name service: %s"
-msgstr "Name Service: %s"
-
-#: ../summary.py:179
-msgid "DNS servers: "
-msgstr "DNS-Server: "
-
-#: ../summary.py:181
-msgid "DNS Domain search list: "
-msgstr "Suchliste der DNS-Domain: "
-
-#: ../summary.py:187
-msgid "LDAP profile: "
-msgstr "LDAP-Profil: "
-
-#: ../summary.py:188
-msgid "LDAP server's IP: "
-msgstr "LDAP-Server-IP: "
-
-#: ../summary.py:189
-msgid "LDAP search base: "
-msgstr "LDAP-Suchbasis: "
-
-#: ../summary.py:193
-msgid "LDAP proxy bind distinguished name: "
-msgstr "LDAP Proxy Bind-DN: "
-
-#: ../summary.py:195
-msgid "LDAP proxy bind password: [concealed]"
-msgstr "LDAP Proxy Bind-Passwort: [verborgen]"
-
-#: ../summary.py:201
-msgid "NIS server: broadcast"
-msgstr "NIS-Server: Broadcast"
-
-#: ../summary.py:203
-msgid "NIS server's IP: "
-msgstr "NIS-Server-IP: "
-
-#: ../summary.py:214
+#: ../summary.py:180
 msgid "  Warning: No root password set"
 msgstr "  Warnung: Kein Root-Passwort angegeben"
 
-#: ../summary.py:216
+#: ../summary.py:182
 #, python-format
 msgid "  Username: %s"
 msgstr "  Benutzername: %s"
 
-#: ../summary.py:218
+#: ../summary.py:184
 msgid "  No user account"
 msgstr "  Kein Benutzerkonto"
 
-#: ../summary.py:228
-#, python-format
-msgid "Disk: %(disk-size).1fGB %(disk-type)s"
-msgstr "Festplatte: %(disk-size).1fGB %(disk-type)s"
+#: ../summary.py:198
+msgid "Disk: "
+msgstr "Festplatte: "
 
-#: ../summary.py:238
+#: ../summary.py:209
+msgid "Partition: "
+msgstr "Partition: "
+
+#: ../summary.py:216
 #, python-format
-msgid "Partition: %(part-size).1fGB %(part-type)s"
-msgstr "Partition: %(part-size).1fGB %(part-type)s"
+msgid "Slice %s: "
+msgstr "Bereich %s: "
 
-#: ../summary.py:246
-#, python-format
-msgid "Slice %(slice-num)s: %(slice-size).1fGB %(pool)s"
-msgstr "Bereich %(slice-num)s: %(slice-size).1fGB %(pool)s"
-
-#: ../summary.py:257
+#: ../summary.py:230
 #, python-format
 msgid "Time Zone: %s"
 msgstr "Zeitzone: %s"

--- a/messages/install/en_US/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/en_US/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -20,12 +20,12 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#: ../src/user_screen.py:300
+#: ../src/user_screen.py:355
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-12 16:54+0900\n"
+"POT-Creation-Date: 2011-08-26 12:39+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -33,27 +33,27 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/__init__.py:269
+#: ../src/__init__.py:262
 #, python-format
 msgid "The %s installer must be run as root. Quitting."
 msgstr ""
 
-#: ../src/__init__.py:274
+#: ../src/__init__.py:267
 msgid "Installer Startup Terminated"
 msgstr ""
 
-#: ../src/__init__.py:275 ../src/__init__.py:277
+#: ../src/__init__.py:268 ../src/__init__.py:270
 msgid ""
 "Only one instance of this Installer is allowed. Another instance is already "
 "running."
 msgstr ""
 
-#: ../src/__init__.py:285
+#: ../src/__init__.py:278
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr ""
 
-#: ../src/__init__.py:289
+#: ../src/__init__.py:282
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -61,13 +61,13 @@
 "[default: %default]"
 msgstr ""
 
-#: ../src/__init__.py:296
+#: ../src/__init__.py:289
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr ""
 
-#: ../src/base_screen.py:69 ../src/welcome_screen.py:62
+#: ../src/base_screen.py:69 ../src/welcome_screen.py:63
 msgid "Welcome"
 msgstr ""
 
@@ -79,7 +79,7 @@
 msgid "Time Zone"
 msgstr ""
 
-#: ../src/base_screen.py:72 ../src/user_screen.py:109
+#: ../src/base_screen.py:72 ../src/user_screen.py:158
 #: ../xml/users.xml.glade.h:9
 msgid "Users"
 msgstr ""
@@ -96,10 +96,10 @@
 #: ../src/base_screen.py:97 ../src/confirm_screen.py:82
 #: ../src/disk_screen.py:141 ../src/failure_screen.py:62
 #: ../src/fdisk_panel.py:152 ../src/finish_screen.py:65
-#: ../src/help_dialog.py:64 ../src/progress_screen.py:104
+#: ../src/help_dialog.py:64 ../src/progress_screen.py:111
 #: ../src/screen_manager.py:217 ../src/textview_dialog.py:53
-#: ../src/timezone.py:210 ../src/timezone_screen.py:75
-#: ../src/user_screen.py:79 ../src/welcome_screen.py:52
+#: ../src/timezone.py:230 ../src/timezone_screen.py:75
+#: ../src/user_screen.py:86 ../src/welcome_screen.py:53
 msgid "Internal error"
 msgstr ""
 
@@ -109,43 +109,46 @@
 "changes."
 msgstr ""
 
-#: ../src/confirm_screen.py:176
+#. There is no definitive way to detect whether "Use the whole
+#. disk" or "Partition the disk" was selected, so we will display
+#. a message about the Solaris2 partition details for each disk.
+#: ../src/confirm_screen.py:187
 #, python-format
-msgid "%.1f GB disk (%s)"
+msgid "%(partsize).1f GB partition on %(disksize).1f GB disk (%(disk)s)"
 msgstr ""
 
-#: ../src/confirm_screen.py:179
-msgid "This disk will be erased"
+#: ../src/confirm_screen.py:191
+msgid "This partition will be erased"
 msgstr ""
 
-#: ../src/confirm_screen.py:183
+#: ../src/confirm_screen.py:200
 #, python-format
 msgid "The whole installation will take up %.1fGB hard disk space."
 msgstr ""
 
-#: ../src/confirm_screen.py:202
+#: ../src/confirm_screen.py:219
 #, python-format
 msgid "Default Language: %s"
 msgstr ""
 
-#: ../src/confirm_screen.py:207
+#: ../src/confirm_screen.py:224
 msgid "Language Support:"
 msgstr ""
 
-#: ../src/confirm_screen.py:215 ../src/confirm_screen.py:217
+#: ../src/confirm_screen.py:232 ../src/confirm_screen.py:234
 #, python-format
 msgid "User Account: %s"
 msgstr ""
 
-#: ../src/confirm_screen.py:215
+#: ../src/confirm_screen.py:232
 msgid "No user account."
 msgstr ""
 
-#: ../src/confirm_screen.py:221
+#: ../src/confirm_screen.py:238
 msgid "Root Password: Same as user account."
 msgstr ""
 
-#: ../src/confirm_screen.py:224
+#: ../src/confirm_screen.py:241
 #, python-format
 msgid "Host name: %s"
 msgstr ""
@@ -200,7 +203,7 @@
 
 #: ../src/disk_screen.py:291 ../src/disk_screen.py:363
 #: ../src/disk_screen.py:457 ../src/disk_screen.py:491
-#: ../src/disk_screen.py:521 ../src/disk_screen.py:757
+#: ../src/disk_screen.py:521 ../src/disk_screen.py:762
 msgid "See log file for details."
 msgstr ""
 
@@ -227,8 +230,8 @@
 msgstr ""
 
 #: ../src/disk_screen.py:456 ../src/disk_screen.py:490
-#: ../src/disk_screen.py:520 ../src/disk_screen.py:756
-#: ../src/user_screen.py:299
+#: ../src/disk_screen.py:520 ../src/disk_screen.py:761
+#: ../src/user_screen.py:354
 msgid "Internal Error"
 msgstr ""
 
@@ -243,24 +246,24 @@
 msgid "Where should Oracle Solaris be installed?"
 msgstr ""
 
-#: ../src/disk_screen.py:749
+#: ../src/disk_screen.py:754
 msgid "No disks were found."
 msgstr ""
 
 #. If we cannot get the icon info from the theme, then
 #. just fall back to making up a blank image
-#: ../src/disk_screen.py:852
+#: ../src/disk_screen.py:860
 msgid ""
 "Unable to display correct 'disk' graphics, but all other information is "
 "available."
 msgstr ""
 
-#: ../src/failure_screen.py:70 ../xml/failure.xml.glade.h:4
+#: ../src/failure_screen.py:71 ../xml/failure.xml.glade.h:4
 msgid "Failure"
 msgstr ""
 
-#: ../src/failure_screen.py:70 ../src/finish_screen.py:80
-#: ../src/progress_screen.py:137 ../src/user_screen.py:109
+#: ../src/failure_screen.py:71 ../src/finish_screen.py:81
+#: ../src/progress_screen.py:144 ../src/user_screen.py:158
 msgid " "
 msgstr ""
 
@@ -291,11 +294,11 @@
 msgstr ""
 
 #: ../src/fdisk_panel.py:1388 ../src/install_profile.py:124
-#: ../src/user_screen.py:301
+#: ../src/user_screen.py:356
 msgid "Unknown"
 msgstr ""
 
-#: ../src/finish_screen.py:80
+#: ../src/finish_screen.py:81
 msgid "Finished"
 msgstr ""
 
@@ -321,7 +324,7 @@
 "No help available"
 msgstr ""
 
-#: ../src/progress_screen.py:137
+#: ../src/progress_screen.py:144
 msgid "Installing"
 msgstr ""
 
@@ -345,7 +348,7 @@
 msgid "Error:No log file found"
 msgstr ""
 
-#: ../src/timezone.py:42
+#: ../src/timezone.py:48
 msgid "- Select -"
 msgstr ""
 
@@ -359,66 +362,66 @@
 "date and time."
 msgstr ""
 
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Time Zone Invalid"
 msgstr ""
 
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Please select a valid time zone"
 msgstr ""
 
 #. update the label message
-#: ../src/user_screen.py:155 ../src/user_screen.py:183
-#: ../src/user_screen.py:201 ../src/user_screen.py:346
+#: ../src/user_screen.py:206 ../src/user_screen.py:234
+#: ../src/user_screen.py:254 ../src/user_screen.py:401
 #: ../xml/users.xml.glade.h:8
 msgid "Re-enter to check for typing errors."
 msgstr ""
 
-#: ../src/user_screen.py:203 ../src/user_screen.py:348
+#: ../src/user_screen.py:256 ../src/user_screen.py:403
 msgid "The two user passwords do not match."
 msgstr ""
 
-#: ../src/user_screen.py:277
+#: ../src/user_screen.py:332
 msgid "<b>Error:</b> A computer name is required."
 msgstr ""
 
-#: ../src/user_screen.py:279
+#: ../src/user_screen.py:334
 msgid "<b>Error:</b> Computer name exceeds maximum length."
 msgstr ""
 
-#: ../src/user_screen.py:281
+#: ../src/user_screen.py:336
 msgid "<b>Error:</b> Computer name contains invalid characters."
 msgstr ""
 
-#: ../src/user_screen.py:283
+#: ../src/user_screen.py:338
 msgid "<b>Error:</b> Computer name ends with invalid character."
 msgstr ""
 
-#: ../src/user_screen.py:293 ../src/user_screen.py:295
+#: ../src/user_screen.py:348 ../src/user_screen.py:350
 msgid "Invalid User Account"
 msgstr ""
 
-#: ../src/user_screen.py:294
+#: ../src/user_screen.py:349
 msgid "Enter a Log-in name."
 msgstr ""
 
-#: ../src/user_screen.py:296
+#: ../src/user_screen.py:351
 msgid "Enter a user password."
 msgstr ""
 
-#: ../src/user_screen.py:297
+#: ../src/user_screen.py:352
 msgid "Invalid Computer Name"
 msgstr ""
 
-#: ../src/user_screen.py:298
+#: ../src/user_screen.py:353
 msgid "Enter a computer name."
 msgstr ""
 
-#: ../src/user_screen.py:302
+#: ../src/user_screen.py:357
 msgid "Recheck entries."
 msgstr ""
 
-#: ../src/user_screen.py:380
+#: ../src/user_screen.py:435
 msgid "Internal error occurred creating profile"
 msgstr ""
 

--- a/messages/install/en_US/usr/share/locale/__LOCALE__/LC_MESSAGES/sysconfig.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/en_US/usr/share/locale/__LOCALE__/LC_MESSAGES/sysconfig.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -24,7 +24,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-29 11:23+0900\n"
+"POT-Creation-Date: 2011-08-26 01:44+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -190,7 +190,7 @@
 "     Terminal too small. Min size is 80x24. Current size is %(x)ix%(y)i."
 msgstr ""
 
-#: ../__init__.py:982 ../users.py:76
+#: ../__init__.py:982
 msgid "Continue"
 msgstr ""
 
@@ -232,7 +232,7 @@
 msgid "Do you really want to quit?"
 msgstr ""
 
-#: ../__init__.py:1040 ../users.py:77
+#: ../__init__.py:1040
 msgid "Cancel"
 msgstr ""
 
@@ -377,8 +377,8 @@
 
 #: ../nameservice.py:230
 msgid ""
-"Specify the domain where this system resides. Use the domain name's exact "
-"capitalization and punctuation."
+"Specify the domain for the NIS or LDAP name server. Use the domain name's "
+"exact capitalization and punctuation."
 msgstr ""
 
 #: ../nameservice.py:233
@@ -418,137 +418,137 @@
 msgid "Search domain:"
 msgstr ""
 
-#: ../nameservice.py:422
+#: ../nameservice.py:418
 msgid "LDAP Profile"
 msgstr ""
 
-#: ../nameservice.py:427
+#: ../nameservice.py:423
 msgid "Profile name:"
 msgstr ""
 
-#: ../nameservice.py:428
+#: ../nameservice.py:424
 msgid "Search base:"
 msgstr ""
 
-#: ../nameservice.py:436
+#: ../nameservice.py:432
 msgid ""
 "Specify the name of the LDAP profile to be used to configure this system and "
 "the host name or IP address of the server that contains the profile."
 msgstr ""
 
-#: ../nameservice.py:439
+#: ../nameservice.py:435
 msgid "Profile server host name or IP address:"
 msgstr ""
 
-#: ../nameservice.py:442
+#: ../nameservice.py:438
 msgid ""
 "Specify the name of the LDAP profile to be used to configure this system and "
 "the IP address of the server that contains the profile."
 msgstr ""
 
-#: ../nameservice.py:445
+#: ../nameservice.py:441
 msgid "Profile server IP address:"
 msgstr ""
 
-#: ../nameservice.py:446
+#: ../nameservice.py:442
 msgid "  Enter the LDAP search base."
 msgstr ""
 
 #. in case of error, tell user what is being validated
-#: ../nameservice.py:459
+#: ../nameservice.py:455
 msgid "profile name"
 msgstr ""
 
-#: ../nameservice.py:491 ../nameservice.py:726
+#: ../nameservice.py:487 ../nameservice.py:722
 msgid "The LDAP profile name cannot be blank."
 msgstr ""
 
-#: ../nameservice.py:493
+#: ../nameservice.py:489
 msgid "The LDAP server IP address cannot be blank."
 msgstr ""
 
-#: ../nameservice.py:510
+#: ../nameservice.py:506
 msgid "LDAP Proxy"
 msgstr ""
 
-#: ../nameservice.py:515
+#: ../nameservice.py:511
 msgid ""
 "Does the profile specify a proxy credential level and an authentication "
 "method other than None?"
 msgstr ""
 
-#: ../nameservice.py:524
+#: ../nameservice.py:520
 msgid "No"
 msgstr ""
 
-#: ../nameservice.py:525
+#: ../nameservice.py:521
 msgid "Yes"
 msgstr ""
 
-#: ../nameservice.py:549
+#: ../nameservice.py:545
 msgid "Specify LDAP Profile Proxy Bind Information"
 msgstr ""
 
-#: ../nameservice.py:555
+#: ../nameservice.py:551
 msgid ""
 "Specify the LDAP proxy bind distinguished name and the LDAP proxy bind "
 "password.  The network administrator can provide this information."
 msgstr ""
 
-#: ../nameservice.py:558
+#: ../nameservice.py:554
 msgid "Proxy bind distinguished name:"
 msgstr ""
 
-#: ../nameservice.py:561
+#: ../nameservice.py:557
 msgid "Proxy bind password:"
 msgstr ""
 
-#: ../nameservice.py:563
+#: ../nameservice.py:559
 msgid "Encrypted proxy bind password:"
 msgstr ""
 
 #. in case of error, tell user what is being validated
-#: ../nameservice.py:583
+#: ../nameservice.py:579
 msgid "distinguished name"
 msgstr ""
 
-#: ../nameservice.py:600
+#: ../nameservice.py:596
 msgid "The LDAP proxy server distinguished name cannot be blank."
 msgstr ""
 
-#: ../nameservice.py:610
+#: ../nameservice.py:606
 msgid "NIS Name Server"
 msgstr ""
 
-#: ../nameservice.py:616
+#: ../nameservice.py:612
 msgid "Specify how to find a name server for this system."
 msgstr ""
 
-#: ../nameservice.py:618
+#: ../nameservice.py:614
 msgid ""
 "Either let the software search for a name server, or specify a name server "
 "in the following screen.  "
 msgstr ""
 
-#: ../nameservice.py:621
+#: ../nameservice.py:617
 msgid ""
 "The software can find a name server only if that server is on the local "
 "subnet."
 msgstr ""
 
-#: ../nameservice.py:631
+#: ../nameservice.py:627
 msgid "Find one"
 msgstr ""
 
-#: ../nameservice.py:632
+#: ../nameservice.py:628
 msgid "Specify one"
 msgstr ""
 
-#: ../nameservice.py:661
+#: ../nameservice.py:657
 msgid "NIS Name Server Information"
 msgstr ""
 
-#: ../nameservice.py:676
+#: ../nameservice.py:672
 msgid ""
 "Enter the host name or IP address of the name server.  A host name must have "
 "at least 2 characters and can be alphanumeric and can contain hyphens.  IP "
@@ -556,95 +556,95 @@
 "example, 129.200.9.1)."
 msgstr ""
 
-#: ../nameservice.py:681
+#: ../nameservice.py:677
 msgid "Server's host name or IP address:"
 msgstr ""
 
-#: ../nameservice.py:684
+#: ../nameservice.py:680
 msgid ""
 "Enter the IP address of the name server.  IP addresses must contain four "
 "sets of numbers separated by periods (for example, 129.200.9.1)."
 msgstr ""
 
-#: ../nameservice.py:687
+#: ../nameservice.py:683
 msgid "Server's IP address:"
 msgstr ""
 
-#: ../nameservice.py:714
+#: ../nameservice.py:710
 msgid "The NIS server IP address cannot be blank."
 msgstr ""
 
-#: ../nameservice.py:727
+#: ../nameservice.py:723
 msgid ""
 "Whitespace characters and quotation marks are not allowed in LDAP profile "
 "names."
 msgstr ""
 
-#: ../nameservice.py:741
+#: ../nameservice.py:737
 msgid "The LDAP proxy bind distinguished name may not be blank."
 msgstr ""
 
-#: ../nameservice.py:744
+#: ../nameservice.py:740
 msgid ""
 "The LDAP proxy bind distinguished name may not contain whitespace characters."
 msgstr ""
 
-#: ../nameservice.py:747
+#: ../nameservice.py:743
 msgid "The LDAP proxy bind distinguished name may not contain quotation marks."
 msgstr ""
 
-#: ../nameservice.py:757
+#: ../nameservice.py:753
 msgid "The LDAP proxy bind password may not be blank."
 msgstr ""
 
-#: ../nameservice.py:760
+#: ../nameservice.py:756
 msgid "The LDAP proxy bind password may not contain whitespace characters."
 msgstr ""
 
-#: ../nameservice.py:763
+#: ../nameservice.py:759
 msgid "The LDAP proxy bind password may not contain quotation marks."
 msgstr ""
 
-#: ../nameservice.py:777 ../nameservice.py:848
+#: ../nameservice.py:773 ../nameservice.py:844
 msgid ""
 "A host name can only contain letters, numbers,  periods, and minus signs (-)."
 msgstr ""
 
-#: ../nameservice.py:808
+#: ../nameservice.py:804
 msgid "The domain cannot be blank."
 msgstr ""
 
-#: ../nameservice.py:812
+#: ../nameservice.py:808
 msgid "Domain labels must have less than 64 characters."
 msgstr ""
 
-#: ../nameservice.py:815
+#: ../nameservice.py:811
 msgid "Domain labels should not start or end with hyphens ('-')."
 msgstr ""
 
-#: ../nameservice.py:818
+#: ../nameservice.py:814
 msgid "Invalid domain"
 msgstr ""
 
-#: ../nameservice.py:868
+#: ../nameservice.py:864
 #, python-format
 msgid "The %s cannot be blank."
 msgstr ""
 
-#: ../nameservice.py:871
+#: ../nameservice.py:867
 #, python-format
 msgid "Invalid character for %s."
 msgstr ""
 
-#: ../nameservice.py:883
+#: ../nameservice.py:879
 msgid "Domain labels must have less than 64 characters"
 msgstr ""
 
-#: ../nameservice.py:885
+#: ../nameservice.py:881
 msgid "A domain label may not begin with a hyphen."
 msgstr ""
 
-#: ../nameservice.py:888
+#: ../nameservice.py:884
 msgid "Invalid character for domain name."
 msgstr ""
 
@@ -816,10 +816,6 @@
 msgstr ""
 
 #: ../profile/user_info.py:284
-msgid "User password must be entered."
-msgstr ""
-
-#: ../profile/user_info.py:284
 msgid "Password must be entered."
 msgstr ""
 
@@ -920,68 +916,80 @@
 msgid "Router: %s"
 msgstr ""
 
-#: ../summary.py:209
+#: ../summary.py:214
+msgid "  Warning: No root password set"
+msgstr ""
+
+#: ../summary.py:216
 #, python-format
-msgid "Domain: %s"
+msgid "  Username: %s"
 msgstr ""
 
-#: ../summary.py:212 ../summary.py:220 ../summary.py:233
+#: ../summary.py:218
+msgid "  No user account"
+msgstr ""
+
+#: ../summary.py:224
+#, python-format
+msgid "Time Zone: %s"
+msgstr ""
+
+#: ../summary.py:238 ../summary.py:246 ../summary.py:260
 #, python-format
 msgid "Name service: %s"
 msgstr ""
 
-#: ../summary.py:215
+#: ../summary.py:241
 msgid "DNS servers: "
 msgstr ""
 
-#: ../summary.py:217
+#: ../summary.py:243
 msgid "DNS Domain search list: "
 msgstr ""
 
-#: ../summary.py:222
+#: ../summary.py:248 ../summary.py:262
+#, python-format
+msgid "Domain: %s"
+msgstr ""
+
+#: ../summary.py:249
 msgid "LDAP profile: "
 msgstr ""
 
-#: ../summary.py:223
+#: ../summary.py:250
 msgid "LDAP server's IP: "
 msgstr ""
 
-#: ../summary.py:224
+#: ../summary.py:251
 msgid "LDAP search base: "
 msgstr ""
 
-#: ../summary.py:228
+#: ../summary.py:255
 msgid "LDAP proxy bind distinguished name: "
 msgstr ""
 
-#: ../summary.py:230
+#: ../summary.py:257
 msgid "LDAP proxy bind password: [concealed]"
 msgstr ""
 
-#: ../summary.py:236
+#: ../summary.py:264
 msgid "NIS server: broadcast"
 msgstr ""
 
-#: ../summary.py:238
+#: ../summary.py:266
 msgid "NIS server's IP: "
 msgstr ""
 
-#: ../summary.py:249
-msgid "  Warning: No root password set"
+#: ../summary.py:269
+msgid "Note: DNS will be configured to resolve host and IP node names."
 msgstr ""
 
-#: ../summary.py:251
-#, python-format
-msgid "  Username: %s"
+#: ../summary.py:271
+msgid "This setting can be modified upon rebooting. For example:"
 msgstr ""
 
-#: ../summary.py:253
-msgid "  No user account"
-msgstr ""
-
-#: ../summary.py:259
-#, python-format
-msgid "Time Zone: %s"
+#: ../summary.py:278
+msgid "See nsswitch.conf(4), svccfg(1M) and nscfg(1M)."
 msgstr ""
 
 #: ../timezone.py:53
@@ -1024,7 +1032,7 @@
 msgid "Regions"
 msgstr ""
 
-#: ../users.py:57 ../users.py:79
+#: ../users.py:57 ../users.py:68
 msgid "Users"
 msgstr ""
 
@@ -1060,42 +1068,19 @@
 msgid "User password:"
 msgstr ""
 
-#: ../users.py:68
-msgid "No Root Password"
-msgstr ""
-
-#: ../users.py:69
-msgid ""
-"A root password has not been defined. The system is completely unsecured.\n"
-"\n"
-"Choose Cancel to set a root password."
-msgstr ""
-
-#: ../users.py:72
-msgid "No User Password"
-msgstr ""
-
-#: ../users.py:73
-msgid ""
-"A user password has not been defined. The user account has administrative "
-"privileges so the system is unsecured.\n"
-"\n"
-"Choose Cancel to set a user password."
-msgstr ""
-
-#: ../users.py:297
+#: ../users.py:311
 msgid "Root passwords don't match"
 msgstr ""
 
-#: ../users.py:300
+#: ../users.py:324
 msgid "User passwords don't match"
 msgstr ""
 
-#: ../users.py:322
+#: ../users.py:329
 msgid "Enter username or clear all user account fields"
 msgstr ""
 
-#: ../users.py:369
+#: ../users.py:367
 msgid "Passwords don't match"
 msgstr ""
 

--- a/messages/install/en_US/usr/share/locale/__LOCALE__/LC_MESSAGES/textinstall.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/en_US/usr/share/locale/__LOCALE__/LC_MESSAGES/textinstall.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -20,11 +20,12 @@
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
+#: ../disk_selection.py:96
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-29 11:16+0900\n"
+"POT-Creation-Date: 2011-08-26 12:36+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -36,46 +37,51 @@
 msgid "Oracle Solaris"
 msgstr ""
 
-#: ../__init__.py:126
+#. Localized values used by other files
+#: ../__init__.py:57
+msgid "GB"
+msgstr ""
+
+#: ../__init__.py:128
 #, python-format
 msgid ""
 "Exiting Text Installer. Log is available at:\n"
 "%s"
 msgstr ""
 
-#: ../__init__.py:300
+#: ../__init__.py:303
 msgid ""
 "DONT_TRANSLATE_BUT_REPLACE_msgstr_WITH_True_OR_False: Should wrap text on "
 "whitespace in this language"
 msgstr ""
 
-#: ../__init__.py:303
+#: ../__init__.py:306
 msgid "Confirm: Quit the Installer?"
 msgstr ""
 
-#: ../__init__.py:304
+#: ../__init__.py:307
 msgid "Do you want to quit the Installer?"
 msgstr ""
 
-#: ../__init__.py:305 ../disk_selection.py:106
+#: ../__init__.py:308 ../disk_selection.py:108
 msgid "Cancel"
 msgstr ""
 
-#: ../__init__.py:306 ../__init__.py:376
+#: ../__init__.py:309 ../__init__.py:379
 msgid "Quit"
 msgstr ""
 
-#: ../__init__.py:313
+#: ../__init__.py:316
 #, python-format
 msgid "The %(release)s Text Installer must be run with root privileges"
 msgstr ""
 
-#: ../__init__.py:318
+#: ../__init__.py:321
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr ""
 
-#: ../__init__.py:322
+#: ../__init__.py:325
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -83,274 +89,264 @@
 "[default: %default]"
 msgstr ""
 
-#: ../__init__.py:329
+#: ../__init__.py:332
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr ""
 
-#: ../__init__.py:333
+#: ../__init__.py:336
 msgid ""
 "Force the installer to run in black and white. This may be useful on some "
 "SPARC machines with unsupported frame buffers\n"
 msgstr ""
 
-#: ../__init__.py:338
+#: ../__init__.py:341
 msgid ""
 "Runs in 'no installation' mode. When run in 'no installation' mode, no "
 "persistent changes are made to the disks and booted environment\n"
 msgstr ""
 
-#: ../__init__.py:365
+#: ../__init__.py:368
 #, python-format
 msgid ""
 "     Terminal too small. Min size is 80x24. Current size is %(x)ix%(y)i."
 msgstr ""
 
-#: ../__init__.py:371 ../disk_selection.py:107
+#: ../__init__.py:374 ../disk_selection.py:109
 msgid "Continue"
 msgstr ""
 
-#: ../__init__.py:373
+#: ../__init__.py:376
 msgid "Back"
 msgstr ""
 
-#: ../__init__.py:375
+#: ../__init__.py:378
 msgid "Help"
 msgstr ""
 
-#: ../__init__.py:380
+#: ../__init__.py:383
 msgid "Help Topics"
 msgstr ""
 
-#: ../__init__.py:381
+#: ../__init__.py:384
 msgid "Help Index"
 msgstr ""
 
-#: ../__init__.py:382
+#: ../__init__.py:385
 msgid "Select a topic and press Continue."
 msgstr ""
 
-#: ../__init__.py:417
+#: ../__init__.py:421
 msgid "An unhandled exception occurred."
 msgstr ""
 
-#: ../__init__.py:422
+#: ../__init__.py:426
 msgid "Full traceback data is in the installation log"
 msgstr ""
 
-#: ../__init__.py:423
+#: ../__init__.py:427
 msgid "Please file a bug at http://defect.opensolaris.org"
 msgstr ""
 
-#: ../disk_selection.py:68 ../disk_selection.py:109
+#: ../disk_selection.py:69 ../disk_selection.py:111
 msgid "Disks"
 msgstr ""
 
-#: ../disk_selection.py:69
-#, python-format
-msgid "Where should %(release)s be installed?"
-msgstr ""
-
 #: ../disk_selection.py:70
 #, python-format
-msgid "Recommended size:  %(recommend).1fGB      Minimum size: %(min).1fGB"
+msgid "Where should %(release)s be installed?"
+msgstr ""
+
+#: ../disk_selection.py:71
+msgid "Recommended size: "
 msgstr ""
 
 #: ../disk_selection.py:72
+msgid "    Minimum size: "
+msgstr ""
+
+#: ../disk_selection.py:73
 msgid "Seeking disks on system"
 msgstr ""
 
-#: ../disk_selection.py:73 ../fdisk_partitions.py:66
+#: ../disk_selection.py:74 ../fdisk_partitions.py:68
 msgid "The following partitions were found on the disk."
 msgstr ""
 
-#: ../disk_selection.py:74 ../fdisk_partitions.py:69
+#: ../disk_selection.py:75 ../fdisk_partitions.py:71
 msgid "The following slices were found on the disk."
 msgstr ""
 
-#: ../disk_selection.py:75 ../fdisk_partitions.py:67
+#: ../disk_selection.py:76 ../fdisk_partitions.py:69
 msgid "A partition table was not found. The following is proposed."
 msgstr ""
 
-#: ../disk_selection.py:77 ../fdisk_partitions.py:70
+#: ../disk_selection.py:78 ../fdisk_partitions.py:72
 msgid "A VTOC label was not found. The following is proposed."
 msgstr ""
 
-#: ../disk_selection.py:79
+#: ../disk_selection.py:80
 msgid "A GPT labeled disk was found. The following is proposed."
 msgstr ""
 
-#: ../disk_selection.py:81
-msgid "Too small"
-msgstr ""
-
-#: ../disk_selection.py:82
-#, python-format
-msgid "Limited to %.1f TB"
-msgstr ""
-
-#: ../disk_selection.py:83
+#: ../disk_selection.py:84
 msgid "GPT labeled disk"
 msgstr ""
 
-#: ../disk_selection.py:84
+#: ../disk_selection.py:85
 msgid "No disks found. Additional device drivers may be needed."
 msgstr ""
 
-#: ../disk_selection.py:86
+#: ../disk_selection.py:87
 #, python-format
 msgid "%(release)s cannot be installed on any disk"
 msgstr ""
 
-#: ../disk_selection.py:87
+#: ../disk_selection.py:88
 msgid ""
 "An error occurred while searching for installation targets. Please check the "
 "install log and file a bug at defect.opensolaris.org."
 msgstr ""
 
-#: ../disk_selection.py:91
+#: ../disk_selection.py:92
 msgid "Type"
 msgstr ""
 
-#: ../disk_selection.py:92 ../disk_window.py:64 ../disk_window.py:67
-#: ../disk_window.py:72 ../disk_window.py:76
+#: ../disk_selection.py:93 ../disk_window.py:65 ../disk_window.py:68
+#: ../disk_window.py:73 ../disk_window.py:77
 msgid "Size(GB)"
 msgstr ""
 
-#: ../disk_selection.py:93 ../fdisk_partitions.py:55
+#: ../disk_selection.py:94 ../fdisk_partitions.py:56
 #: ../partition_edit_screen.py:89
 msgid "Boot"
 msgstr ""
 
-#: ../disk_selection.py:94
+#: ../disk_selection.py:95
 msgid "Device"
 msgstr ""
 
-#: ../disk_selection.py:95
-msgid "Manufacturer"
-msgstr ""
-
-#: ../disk_selection.py:96
-msgid "Notes"
-msgstr ""
-
-#: ../disk_selection.py:99
+#: ../disk_selection.py:101
 msgid "Warning"
 msgstr ""
 
-#: ../disk_selection.py:100
+#: ../disk_selection.py:102
 #, python-format
 msgid "Only the first %.1fTB can be used."
 msgstr ""
 
-#: ../disk_selection.py:101
+#: ../disk_selection.py:103
 msgid ""
 "You have chosen a GPT labeled disk. Installing onto a GPT labeled disk will "
 "cause the loss of all existing data and the disk will be relabeled as SMI."
 msgstr ""
 
-#: ../disk_window.py:63 ../disk_window.py:66
+#: ../disk_window.py:64 ../disk_window.py:67
 msgid "Primary"
 msgstr ""
 
-#: ../disk_window.py:63 ../disk_window.py:66
+#: ../disk_window.py:64 ../disk_window.py:67
 msgid "Logical"
 msgstr ""
 
-#: ../disk_window.py:68 ../disk_window.py:77
+#: ../disk_window.py:69 ../disk_window.py:78
 msgid " Avail"
 msgstr ""
 
-#: ../disk_window.py:70 ../disk_window.py:74
+#: ../disk_window.py:71 ../disk_window.py:75
 msgid "Slice"
 msgstr ""
 
-#: ../disk_window.py:341
+#: ../disk_window.py:342
 #, python-format
 msgid "%d more partitions"
 msgstr ""
 
-#: ../disk_window.py:343
+#: ../disk_window.py:344
 #, python-format
 msgid "%d more slices"
 msgstr ""
 
-#: ../disk_window.py:775 ../disk_window.py:785
-msgid "Only the digits 0-9 and \".\" are valid."
+#: ../disk_window.py:777 ../disk_window.py:787
+#, python-format
+msgid "Only the digits 0-9 and %s are valid."
 msgstr ""
 
-#: ../disk_window.py:778
-msgid "A number can only have one \".\""
+#: ../disk_window.py:780
+#, python-format
+msgid "A number can only have one %s"
 msgstr ""
 
-#: ../disk_window.py:787
+#: ../disk_window.py:789
 msgid "Size can be specified to only one decimal place."
 msgstr ""
 
-#: ../disk_window.py:803
+#: ../disk_window.py:807
 #, python-format
-msgid ""
-"The new size (%(size).1f) is greater than the available space (%(avail).1f)"
+msgid "The new size %(size)s is greater than the available space %(avail)s"
 msgstr ""
 
-#: ../fdisk_partitions.py:56
-#, python-format
-msgid "Fdisk Partitions: %(size).1fGB %(type)s %(bootable)s"
+#: ../fdisk_partitions.py:57
+msgid "Fdisk Partitions: "
 msgstr ""
 
-#: ../fdisk_partitions.py:57 ../fdisk_partitions.py:84
+#: ../fdisk_partitions.py:58 ../fdisk_partitions.py:86
 msgid "Solaris Partition Slices"
 msgstr ""
 
-#: ../fdisk_partitions.py:58
-#, python-format
-msgid "Solaris Slices: %(size).1fGB %(type)s %(bootable)s"
+#: ../fdisk_partitions.py:59
+msgid "Solaris Slices: "
 msgstr ""
 
-#: ../fdisk_partitions.py:59
+#: ../fdisk_partitions.py:60 ../partition_edit_screen.py:84
+#, python-format
+msgid " %(type)s %(bootable)s"
+msgstr ""
+
+#: ../fdisk_partitions.py:61
 #, python-format
 msgid ""
 "%(release)s can be installed on the whole disk or a partition on the disk."
 msgstr ""
 
-#: ../fdisk_partitions.py:61
+#: ../fdisk_partitions.py:63
 #, python-format
 msgid ""
 "%(release)s can be installed in the whole fdisk partition or within a slice "
 "in the partition"
 msgstr ""
 
-#: ../fdisk_partitions.py:64
+#: ../fdisk_partitions.py:66
 #, python-format
 msgid "%(release)s can be installed on the whole disk or a slice on the disk."
 msgstr ""
 
-#: ../fdisk_partitions.py:72
+#: ../fdisk_partitions.py:74
 msgid "Use the whole disk"
 msgstr ""
 
-#: ../fdisk_partitions.py:73
-msgid "Use the whole partition"
-msgstr ""
-
-#: ../fdisk_partitions.py:74
-msgid "Use a slice in the partition"
-msgstr ""
-
 #: ../fdisk_partitions.py:75
-msgid "Use a partition of the disk"
+msgid "Use the whole partition"
 msgstr ""
 
 #: ../fdisk_partitions.py:76
+msgid "Use a slice in the partition"
+msgstr ""
+
+#: ../fdisk_partitions.py:77
+msgid "Use a partition of the disk"
+msgstr ""
+
+#: ../fdisk_partitions.py:78
 msgid "Use a slice on the disk"
 msgstr ""
 
-#: ../fdisk_partitions.py:79
+#: ../fdisk_partitions.py:81
 msgid "Solaris Slices"
 msgstr ""
 
-#: ../fdisk_partitions.py:82
+#: ../fdisk_partitions.py:84
 msgid "Fdisk Partitions"
 msgstr ""
 
@@ -414,7 +410,7 @@
 "\t%s"
 msgstr ""
 
-#: ../partition_edit_screen.py:59
+#: ../partition_edit_screen.py:60
 msgid ""
 "Oracle Solaris will be installed into the Solaris partition. A partition's "
 "type can be changed using the F5 key.\n"
@@ -427,7 +423,7 @@
 "\"Extended\" partition its logical partitions are listed on the right."
 msgstr ""
 
-#: ../partition_edit_screen.py:71
+#: ../partition_edit_screen.py:72
 #, python-format
 msgid ""
 "%(release)s will be installed in the \"%(pool)s\" slice. Use the F5 key to "
@@ -440,9 +436,8 @@
 "Slices are listed in disk layout order."
 msgstr ""
 
-#: ../partition_edit_screen.py:80
-#, python-format
-msgid "Select Partition: %(size).1fGB %(type)s %(bootable)s"
+#: ../partition_edit_screen.py:81
+msgid "Select Partition: "
 msgstr ""
 
 #: ../partition_edit_screen.py:82
@@ -450,8 +445,7 @@
 msgstr ""
 
 #: ../partition_edit_screen.py:83
-#, python-format
-msgid "Select Slice: %(size).1fGB %(type)s%(bootable)s"
+msgid "Select Slice: "
 msgstr ""
 
 #: ../partition_edit_screen.py:85
@@ -478,163 +472,115 @@
 msgid "Change Type"
 msgstr ""
 
-#: ../summary.py:61 ../summary.py:66
+#: ../summary.py:63 ../summary.py:68
 msgid "Installation Summary"
 msgstr ""
 
-#: ../summary.py:62
+#: ../summary.py:64
 msgid ""
 "Review the settings below before installing. Go back (F3) to make changes."
 msgstr ""
 
-#: ../summary.py:72
+#: ../summary.py:74
 msgid "Install"
 msgstr ""
 
-#: ../summary.py:111
+#: ../summary.py:113
 #, python-format
 msgid "Software: %s"
 msgstr ""
 
-#: ../summary.py:117
+#: ../summary.py:119
 msgid "Language: *The following can be changed when logging in."
 msgstr ""
 
-#: ../summary.py:121
+#: ../summary.py:123
 #, python-format
 msgid "  Default language: %s"
 msgstr ""
 
-#: ../summary.py:124
+#: ../summary.py:126
 msgid "Keyboard layout: *The following can be changed when logging in."
 msgstr ""
 
-#: ../summary.py:126
+#: ../summary.py:128
 #, python-format
 msgid "  Default keyboard layout: %s"
 msgstr ""
 
-#: ../summary.py:129
+#: ../summary.py:131
 #, python-format
 msgid "Terminal type: %s"
 msgstr ""
 
-#: ../summary.py:132
+#: ../summary.py:134
 msgid "Users:"
 msgstr ""
 
-#: ../summary.py:135
+#: ../summary.py:137
 msgid "Network:"
 msgstr ""
 
-#: ../summary.py:147
+#: ../summary.py:149
 #, python-format
 msgid "  Computer name: %s"
 msgstr ""
 
-#: ../summary.py:152
+#: ../summary.py:154
 msgid "  Network Configuration: Automatic"
 msgstr ""
 
-#: ../summary.py:154
+#: ../summary.py:156
 msgid "  Network Configuration: None"
 msgstr ""
 
-#: ../summary.py:156
+#: ../summary.py:158
 #, python-format
 msgid "  Manual Configuration: %s"
 msgstr ""
 
-#: ../summary.py:158
+#: ../summary.py:160
 #, python-format
 msgid "    IP Address: %s"
 msgstr ""
 
-#: ../summary.py:159
-#, python-format
-msgid "    Netmask: %s"
-msgstr ""
-
 #: ../summary.py:161
 #, python-format
+msgid "    Netmask: %s"
+msgstr ""
+
+#: ../summary.py:163
+#, python-format
 msgid "    Router: %s"
 msgstr ""
 
-#: ../summary.py:172
-#, python-format
-msgid "Domain: %s"
-msgstr ""
-
-#: ../summary.py:175 ../summary.py:185 ../summary.py:198
-#, python-format
-msgid "Name service: %s"
+#: ../summary.py:180
+msgid "  Warning: No root password set"
 msgstr ""
 
-#: ../summary.py:179
-msgid "DNS servers: "
-msgstr ""
-
-#: ../summary.py:181
-msgid "DNS Domain search list: "
-msgstr ""
-
-#: ../summary.py:187
-msgid "LDAP profile: "
+#: ../summary.py:182
+#, python-format
+msgid "  Username: %s"
 msgstr ""
 
-#: ../summary.py:188
-msgid "LDAP server's IP: "
-msgstr ""
-
-#: ../summary.py:189
-msgid "LDAP search base: "
-msgstr ""
-
-#: ../summary.py:193
-msgid "LDAP proxy bind distinguished name: "
+#: ../summary.py:184
+msgid "  No user account"
 msgstr ""
 
-#: ../summary.py:195
-msgid "LDAP proxy bind password: [concealed]"
+#: ../summary.py:198
+msgid "Disk: "
 msgstr ""
 
-#: ../summary.py:201
-msgid "NIS server: broadcast"
-msgstr ""
-
-#: ../summary.py:203
-msgid "NIS server's IP: "
-msgstr ""
-
-#: ../summary.py:214
-msgid "  Warning: No root password set"
+#: ../summary.py:209
+msgid "Partition: "
 msgstr ""
 
 #: ../summary.py:216
 #, python-format
-msgid "  Username: %s"
-msgstr ""
-
-#: ../summary.py:218
-msgid "  No user account"
-msgstr ""
-
-#: ../summary.py:228
-#, python-format
-msgid "Disk: %(disk-size).1fGB %(disk-type)s"
+msgid "Slice %s: "
 msgstr ""
 
-#: ../summary.py:238
-#, python-format
-msgid "Partition: %(part-size).1fGB %(part-type)s"
-msgstr ""
-
-#: ../summary.py:246
-#, python-format
-msgid "Slice %(slice-num)s: %(slice-size).1fGB %(pool)s"
-msgstr ""
-
-#: ../summary.py:257
+#: ../summary.py:230
 #, python-format
 msgid "Time Zone: %s"
 msgstr ""

--- a/messages/install/es_ES/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/es_ES/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -20,31 +20,31 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#: ../src/user_screen.py:300
+#: ../src/user_screen.py:355
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-12 16:54+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 12:39+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
-#: ../src/__init__.py:269
+#: ../src/__init__.py:262
 #, python-format
 msgid "The %s installer must be run as root. Quitting."
 msgstr "El instalador %s se debe ejecutar como usuario root. Saliendo."
 
-#: ../src/__init__.py:274
+#: ../src/__init__.py:267
 msgid "Installer Startup Terminated"
 msgstr "Inicialización del instalador terminada"
 
-#: ../src/__init__.py:275 ../src/__init__.py:277
+#: ../src/__init__.py:268 ../src/__init__.py:270
 msgid ""
 "Only one instance of this Installer is allowed. Another instance is already "
 "running."
 msgstr "Sólo se permite una instancia de este instalador. Ya se está ejecutando otra instancia."
 
-#: ../src/__init__.py:285
+#: ../src/__init__.py:278
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr "Configure la ubicación del registro en ARCHIVO (valor predeterminado: %default)"
 
-#: ../src/__init__.py:289
+#: ../src/__init__.py:282
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -52,13 +52,13 @@
 "[default: %default]"
 msgstr "Configure el detalle del registro en NIVEL. A fin de aumentar el detalle, los valores válidos son 'error' 'warn' 'info' 'debug' o 'input'\n [default: %default]"
 
-#: ../src/__init__.py:296
+#: ../src/__init__.py:289
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr "Habilite el modo de depuración. Permite configurar el nivel de inicio de sesión en 'input' y habilitar CTRL-C para cerrar el programa\n"
 
-#: ../src/base_screen.py:69 ../src/welcome_screen.py:62
+#: ../src/base_screen.py:69 ../src/welcome_screen.py:63
 msgid "Welcome"
 msgstr "Bienvenido"
 
@@ -70,7 +70,7 @@
 msgid "Time Zone"
 msgstr "Zona horaria"
 
-#: ../src/base_screen.py:72 ../src/user_screen.py:109
+#: ../src/base_screen.py:72 ../src/user_screen.py:158
 #: ../xml/users.xml.glade.h:9
 msgid "Users"
 msgstr "Usuarios"
@@ -87,10 +87,10 @@
 #: ../src/base_screen.py:97 ../src/confirm_screen.py:82
 #: ../src/disk_screen.py:141 ../src/failure_screen.py:62
 #: ../src/fdisk_panel.py:152 ../src/finish_screen.py:65
-#: ../src/help_dialog.py:64 ../src/progress_screen.py:104
+#: ../src/help_dialog.py:64 ../src/progress_screen.py:111
 #: ../src/screen_manager.py:217 ../src/textview_dialog.py:53
-#: ../src/timezone.py:210 ../src/timezone_screen.py:75
-#: ../src/user_screen.py:79 ../src/welcome_screen.py:52
+#: ../src/timezone.py:230 ../src/timezone_screen.py:75
+#: ../src/user_screen.py:86 ../src/welcome_screen.py:53
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -100,43 +100,46 @@
 "changes."
 msgstr "Revise la siguiente configuración antes de llevar a cabo la instalación. Haga clic en el botón Atrás para realizar cambios."
 
-#: ../src/confirm_screen.py:176
+#. There is no definitive way to detect whether "Use the whole
+#. disk" or "Partition the disk" was selected, so we will display
+#. a message about the Solaris2 partition details for each disk.
+#: ../src/confirm_screen.py:187
 #, python-format
-msgid "%.1f GB disk (%s)"
-msgstr "Disco de %.1f GB (%s)"
+msgid "%(partsize).1f GB partition on %(disksize).1f GB disk (%(disk)s)"
+msgstr "Partición de %(partsize).1f GB en el disco de %(disksize).1f GB (%(disk)s)"
 
-#: ../src/confirm_screen.py:179
-msgid "This disk will be erased"
-msgstr "Se borrará este disco"
+#: ../src/confirm_screen.py:191
+msgid "This partition will be erased"
+msgstr "Se borrará esta partición"
 
-#: ../src/confirm_screen.py:183
+#: ../src/confirm_screen.py:200
 #, python-format
 msgid "The whole installation will take up %.1fGB hard disk space."
 msgstr "La instalación completa ocupará %.1fGB de espacio en el disco duro."
 
-#: ../src/confirm_screen.py:202
+#: ../src/confirm_screen.py:219
 #, python-format
 msgid "Default Language: %s"
 msgstr "Idioma predeterminado: %s"
 
-#: ../src/confirm_screen.py:207
+#: ../src/confirm_screen.py:224
 msgid "Language Support:"
 msgstr "Idiomas admitidos:"
 
-#: ../src/confirm_screen.py:215 ../src/confirm_screen.py:217
+#: ../src/confirm_screen.py:232 ../src/confirm_screen.py:234
 #, python-format
 msgid "User Account: %s"
 msgstr "Cuenta de usuario: %s"
 
-#: ../src/confirm_screen.py:215
+#: ../src/confirm_screen.py:232
 msgid "No user account."
 msgstr "No hay cuentas de usuario."
 
-#: ../src/confirm_screen.py:221
+#: ../src/confirm_screen.py:238
 msgid "Root Password: Same as user account."
 msgstr "Contraseña raíz: la misma que la de la cuenta de usuario."
 
-#: ../src/confirm_screen.py:224
+#: ../src/confirm_screen.py:241
 #, python-format
 msgid "Host name: %s"
 msgstr "Nombre de host: %s"
@@ -191,7 +194,7 @@
 
 #: ../src/disk_screen.py:291 ../src/disk_screen.py:363
 #: ../src/disk_screen.py:457 ../src/disk_screen.py:491
-#: ../src/disk_screen.py:521 ../src/disk_screen.py:757
+#: ../src/disk_screen.py:521 ../src/disk_screen.py:762
 msgid "See log file for details."
 msgstr "Consulte el archivo de registro para obtener más información."
 
@@ -218,8 +221,8 @@
 msgstr "Este disco es demasiado pequeño"
 
 #: ../src/disk_screen.py:456 ../src/disk_screen.py:490
-#: ../src/disk_screen.py:520 ../src/disk_screen.py:756
-#: ../src/user_screen.py:299
+#: ../src/disk_screen.py:520 ../src/disk_screen.py:761
+#: ../src/user_screen.py:354
 msgid "Internal Error"
 msgstr "Error interno"
 
@@ -234,24 +237,24 @@
 msgid "Where should Oracle Solaris be installed?"
 msgstr "¿Dónde debe instalarse Oracle Solaris?"
 
-#: ../src/disk_screen.py:749
+#: ../src/disk_screen.py:754
 msgid "No disks were found."
 msgstr "No se encontró ningún disco."
 
 #. If we cannot get the icon info from the theme, then
 #. just fall back to making up a blank image
-#: ../src/disk_screen.py:852
+#: ../src/disk_screen.py:860
 msgid ""
 "Unable to display correct 'disk' graphics, but all other information is "
 "available."
 msgstr "No se pueden mostrar los gráficos 'disk' correctos, pero el resto de la información está disponible."
 
-#: ../src/failure_screen.py:70 ../xml/failure.xml.glade.h:4
+#: ../src/failure_screen.py:71 ../xml/failure.xml.glade.h:4
 msgid "Failure"
 msgstr "Fallo"
 
-#: ../src/failure_screen.py:70 ../src/finish_screen.py:80
-#: ../src/progress_screen.py:137 ../src/user_screen.py:109
+#: ../src/failure_screen.py:71 ../src/finish_screen.py:81
+#: ../src/progress_screen.py:144 ../src/user_screen.py:158
 msgid " "
 msgstr " "
 
@@ -282,11 +285,11 @@
 msgstr "<span size=\"smaller\"><span font_desc=\"Bold\">Advertencia: </span> Se borrarán los datos de esta partición.</span>"
 
 #: ../src/fdisk_panel.py:1388 ../src/install_profile.py:124
-#: ../src/user_screen.py:301
+#: ../src/user_screen.py:356
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/finish_screen.py:80
+#: ../src/finish_screen.py:81
 msgid "Finished"
 msgstr "Terminado"
 
@@ -312,7 +315,7 @@
 "No help available"
 msgstr "Error interno\n\No hay ayuda disponible"
 
-#: ../src/progress_screen.py:137
+#: ../src/progress_screen.py:144
 msgid "Installing"
 msgstr "Instalación"
 
@@ -336,7 +339,7 @@
 msgid "Error:No log file found"
 msgstr "Error: no se encontró ningún archivo de registro"
 
-#: ../src/timezone.py:42
+#: ../src/timezone.py:48
 msgid "- Select -"
 msgstr "- Seleccionar -"
 
@@ -350,66 +353,66 @@
 "date and time."
 msgstr "Seleccione en el mapa una ciudad cercana a la suya o defina su zona horaria a continuación y configure la fecha y la hora."
 
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Time Zone Invalid"
 msgstr "Zona horaria no válida"
 
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
 msgid "Please select a valid time zone"
 msgstr "Seleccione una zona horaria válida"
 
 #. update the label message
-#: ../src/user_screen.py:155 ../src/user_screen.py:183
-#: ../src/user_screen.py:201 ../src/user_screen.py:346
+#: ../src/user_screen.py:206 ../src/user_screen.py:234
+#: ../src/user_screen.py:254 ../src/user_screen.py:401
 #: ../xml/users.xml.glade.h:8
 msgid "Re-enter to check for typing errors."
 msgstr "Vuelva a especificarlo para evitar errores de escritura."
 
-#: ../src/user_screen.py:203 ../src/user_screen.py:348
+#: ../src/user_screen.py:256 ../src/user_screen.py:403
 msgid "The two user passwords do not match."
 msgstr "Las dos contraseñas del usuario no coinciden."
 
-#: ../src/user_screen.py:277
+#: ../src/user_screen.py:332
 msgid "<b>Error:</b> A computer name is required."
 msgstr "<b>Error:</b> se requiere un nombre de equipo."
 
-#: ../src/user_screen.py:279
+#: ../src/user_screen.py:334
 msgid "<b>Error:</b> Computer name exceeds maximum length."
 msgstr "<b>Error:</b> el nombre de equipo sobrepasa la longitud máxima."
 
-#: ../src/user_screen.py:281
+#: ../src/user_screen.py:336
 msgid "<b>Error:</b> Computer name contains invalid characters."
 msgstr "<b>Error:</b> el nombre de equipo contiene caracteres no válidos."
 
-#: ../src/user_screen.py:283
+#: ../src/user_screen.py:338
 msgid "<b>Error:</b> Computer name ends with invalid character."
 msgstr "<b>Error:</b> el nombre de equipo finaliza con un carácter no válido."
 
-#: ../src/user_screen.py:293 ../src/user_screen.py:295
+#: ../src/user_screen.py:348 ../src/user_screen.py:350
 msgid "Invalid User Account"
 msgstr "Cuenta de usuario no válida"
 
-#: ../src/user_screen.py:294
+#: ../src/user_screen.py:349
 msgid "Enter a Log-in name."
 msgstr "Introduzca un nombre de inicio de sesión."
 
-#: ../src/user_screen.py:296
+#: ../src/user_screen.py:351
 msgid "Enter a user password."
 msgstr "Introduzca una contraseña de usuario."
 
-#: ../src/user_screen.py:297
+#: ../src/user_screen.py:352
 msgid "Invalid Computer Name"
 msgstr "Nombre del equipo no válido"
 
-#: ../src/user_screen.py:298
+#: ../src/user_screen.py:353
 msgid "Enter a computer name."
 msgstr "Introduzca un nombre de equipo."
 
-#: ../src/user_screen.py:302
+#: ../src/user_screen.py:357
 msgid "Recheck entries."
 msgstr "Vuelva a comprobar las entradas."
 
-#: ../src/user_screen.py:380
+#: ../src/user_screen.py:435
 msgid "Internal error occurred creating profile"
 msgstr "Se produjo un error interno al crear el perfil"
 

--- a/messages/install/es_ES/usr/share/locale/__LOCALE__/LC_MESSAGES/sysconfig.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/es_ES/usr/share/locale/__LOCALE__/LC_MESSAGES/sysconfig.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -21,7 +21,7 @@
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-07-29 11:23+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 01:44+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
 #: ../__init__.py:499
 #, python-format
@@ -181,7 +181,7 @@
 "     Terminal too small. Min size is 80x24. Current size is %(x)ix%(y)i."
 msgstr "     El terminal es demasiado pequeño. El tamaño mínimo es 80x24. El tamaño actual es %(x)ix%(y)i."
 
-#: ../__init__.py:982 ../users.py:76
+#: ../__init__.py:982
 msgid "Continue"
 msgstr "Continuar"
 
@@ -223,7 +223,7 @@
 msgid "Do you really want to quit?"
 msgstr "¿Realmente desea salir?"
 
-#: ../__init__.py:1040 ../users.py:77
+#: ../__init__.py:1040
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -368,9 +368,9 @@
 
 #: ../nameservice.py:230
 msgid ""
-"Specify the domain where this system resides. Use the domain name's exact "
-"capitalization and punctuation."
-msgstr "Especifique el dominio donde reside este sistema. Utilice las mismas mayúsculas y la misma puntuación que el nombre de dominio."
+"Specify the domain for the NIS or LDAP name server. Use the domain name's "
+"exact capitalization and punctuation."
+msgstr "Especifique el dominio del servidor de nombres LDAP o NIS. Utilice las mismas mayúsculas y la misma puntuación que el nombre de dominio."
 
 #: ../nameservice.py:233
 msgid "Domain Name:"
@@ -409,137 +409,137 @@
 msgid "Search domain:"
 msgstr "Buscar dominio:"
 
-#: ../nameservice.py:422
+#: ../nameservice.py:418
 msgid "LDAP Profile"
 msgstr "Perfil LDAP"
 
-#: ../nameservice.py:427
+#: ../nameservice.py:423
 msgid "Profile name:"
 msgstr "Nombre de perfil:"
 
-#: ../nameservice.py:428
+#: ../nameservice.py:424
 msgid "Search base:"
 msgstr "Base de búsqueda:"
 
-#: ../nameservice.py:436
+#: ../nameservice.py:432
 msgid ""
 "Specify the name of the LDAP profile to be used to configure this system and "
 "the host name or IP address of the server that contains the profile."
 msgstr "Especifique el nombre del perfil LDAP que se utilizará para configurar este sistema y el nombre de host o la dirección IP del servidor que contiene el perfil."
 
-#: ../nameservice.py:439
+#: ../nameservice.py:435
 msgid "Profile server host name or IP address:"
 msgstr "Nombre de host o dirección IP del servidor del perfil:"
 
-#: ../nameservice.py:442
+#: ../nameservice.py:438
 msgid ""
 "Specify the name of the LDAP profile to be used to configure this system and "
 "the IP address of the server that contains the profile."
 msgstr "Especifique el nombre del perfil LDAP que se utilizará para configurar este sistema y la dirección IP del servidor que contiene el perfil."
 
-#: ../nameservice.py:445
+#: ../nameservice.py:441
 msgid "Profile server IP address:"
 msgstr "Dirección IP del servidor del perfil:"
 
-#: ../nameservice.py:446
+#: ../nameservice.py:442
 msgid "  Enter the LDAP search base."
 msgstr "  Introduzca la base de búsqueda de LDAP."
 
 #. in case of error, tell user what is being validated
-#: ../nameservice.py:459
+#: ../nameservice.py:455
 msgid "profile name"
 msgstr "nombre de perfil"
 
-#: ../nameservice.py:491 ../nameservice.py:726
+#: ../nameservice.py:487 ../nameservice.py:722
 msgid "The LDAP profile name cannot be blank."
 msgstr "El nombre de perfil LDAP no puede dejarse en blanco."
 
-#: ../nameservice.py:493
+#: ../nameservice.py:489
 msgid "The LDAP server IP address cannot be blank."
 msgstr "La dirección IP del servidor LDAP no puede dejarse en blanco."
 
-#: ../nameservice.py:510
+#: ../nameservice.py:506
 msgid "LDAP Proxy"
 msgstr "Proxy LDAP"
 
-#: ../nameservice.py:515
+#: ../nameservice.py:511
 msgid ""
 "Does the profile specify a proxy credential level and an authentication "
 "method other than None?"
 msgstr "¿El perfil especifica un nivel de credencial de proxy y un método de autenticación que no sea Ninguno?"
 
-#: ../nameservice.py:524
+#: ../nameservice.py:520
 msgid "No"
 msgstr "No"
 
-#: ../nameservice.py:525
+#: ../nameservice.py:521
 msgid "Yes"
 msgstr "Sí"
 
-#: ../nameservice.py:549
+#: ../nameservice.py:545
 msgid "Specify LDAP Profile Proxy Bind Information"
 msgstr "Especifique información de vínculo de proxy de perfil LDAP"
 
-#: ../nameservice.py:555
+#: ../nameservice.py:551
 msgid ""
 "Specify the LDAP proxy bind distinguished name and the LDAP proxy bind "
 "password.  The network administrator can provide this information."
 msgstr "Especifique el nombre distintivo de vínculo de proxy LDAP y la contraseña de vínculo de proxy LDAP.  El administrador de la red puede proporcionar esta información."
 
-#: ../nameservice.py:558
+#: ../nameservice.py:554
 msgid "Proxy bind distinguished name:"
 msgstr "Nombre distintivo de vínculo de proxy:"
 
-#: ../nameservice.py:561
+#: ../nameservice.py:557
 msgid "Proxy bind password:"
 msgstr "Contraseña de vínculo de proxy:"
 
-#: ../nameservice.py:563
+#: ../nameservice.py:559
 msgid "Encrypted proxy bind password:"
 msgstr "Contraseña de vínculo de proxy cifrada:"
 
 #. in case of error, tell user what is being validated
-#: ../nameservice.py:583
+#: ../nameservice.py:579
 msgid "distinguished name"
 msgstr "nombre distintivo"
 
-#: ../nameservice.py:600
+#: ../nameservice.py:596
 msgid "The LDAP proxy server distinguished name cannot be blank."
 msgstr "El nombre distintivo de servidor de proxy LDAP no puede dejarse en blanco."
 
-#: ../nameservice.py:610
+#: ../nameservice.py:606
 msgid "NIS Name Server"
 msgstr "Servidor de nombres NIS"
 
-#: ../nameservice.py:616
+#: ../nameservice.py:612
 msgid "Specify how to find a name server for this system."
 msgstr "Especifique cómo encontrar un servidor de nombres para este sistema."
 
-#: ../nameservice.py:618
+#: ../nameservice.py:614
 msgid ""
 "Either let the software search for a name server, or specify a name server "
 "in the following screen.  "
 msgstr "Deje que el software busque un servidor de nombres o especifíquelo en la siguiente pantalla.  "
 
-#: ../nameservice.py:621
+#: ../nameservice.py:617
 msgid ""
 "The software can find a name server only if that server is on the local "
 "subnet."
 msgstr "El software puede encontrar un servidor de nombres sólo si ese servidor se encuentra en la subred local."
 
-#: ../nameservice.py:631
+#: ../nameservice.py:627
 msgid "Find one"
 msgstr "Encuentre uno"
 
-#: ../nameservice.py:632
+#: ../nameservice.py:628
 msgid "Specify one"
 msgstr "Especifique uno"
 
-#: ../nameservice.py:661
+#: ../nameservice.py:657
 msgid "NIS Name Server Information"
 msgstr "Información de servidor de nombres NIS"
 
-#: ../nameservice.py:676
+#: ../nameservice.py:672
 msgid ""
 "Enter the host name or IP address of the name server.  A host name must have "
 "at least 2 characters and can be alphanumeric and can contain hyphens.  IP "
@@ -547,95 +547,95 @@
 "example, 129.200.9.1)."
 msgstr "Introduzca el nombre de host o la dirección IP del servidor de nombres.  El nombre de host debe tener al menos 2 caracteres, y puede ser alfanumérico e incluir guiones.  Las direcciones IP deben contener cuatro conjuntos de números separados por puntos (por ejemplo, 129.200.9.1)."
 
-#: ../nameservice.py:681
+#: ../nameservice.py:677
 msgid "Server's host name or IP address:"
 msgstr "Nombre de host o dirección IP del servidor:"
 
-#: ../nameservice.py:684
+#: ../nameservice.py:680
 msgid ""
 "Enter the IP address of the name server.  IP addresses must contain four "
 "sets of numbers separated by periods (for example, 129.200.9.1)."
 msgstr "Introduzca la dirección IP del servidor de nombres.  Las direcciones IP deben contener cuatro conjuntos de números separados por puntos (por ejemplo, 129.200.9.1)."
 
-#: ../nameservice.py:687
+#: ../nameservice.py:683
 msgid "Server's IP address:"
 msgstr "Dirección IP del servidor:"
 
-#: ../nameservice.py:714
+#: ../nameservice.py:710
 msgid "The NIS server IP address cannot be blank."
 msgstr "La dirección IP del servidor NIS no puede dejarse en blanco."
 
-#: ../nameservice.py:727
+#: ../nameservice.py:723
 msgid ""
 "Whitespace characters and quotation marks are not allowed in LDAP profile "
 "names."
 msgstr "No se permiten espacios en blanco ni comillas en los nombres de perfiles LDAP."
 
-#: ../nameservice.py:741
+#: ../nameservice.py:737
 msgid "The LDAP proxy bind distinguished name may not be blank."
 msgstr "El nombre distintivo de vínculo de proxy LDAP no puede dejarse en blanco."
 
-#: ../nameservice.py:744
+#: ../nameservice.py:740
 msgid ""
 "The LDAP proxy bind distinguished name may not contain whitespace characters."
 msgstr "El nombre distintivo de vínculo de proxy LDAP no puede contener espacios en blanco."
 
-#: ../nameservice.py:747
+#: ../nameservice.py:743
 msgid "The LDAP proxy bind distinguished name may not contain quotation marks."
 msgstr "El nombre distintivo de vínculo de proxy LDAP no puede contener comillas."
 
-#: ../nameservice.py:757
+#: ../nameservice.py:753
 msgid "The LDAP proxy bind password may not be blank."
 msgstr "La contraseña de vínculo de proxy LDAP no puede dejarse en blanco."
 
-#: ../nameservice.py:760
+#: ../nameservice.py:756
 msgid "The LDAP proxy bind password may not contain whitespace characters."
 msgstr "La contraseña de vínculo de proxy LDAP no puede contener espacios en blanco."
 
-#: ../nameservice.py:763
+#: ../nameservice.py:759
 msgid "The LDAP proxy bind password may not contain quotation marks."
 msgstr "La contraseña de vínculo de proxy LDAP no puede contener comillas."
 
-#: ../nameservice.py:777 ../nameservice.py:848
+#: ../nameservice.py:773 ../nameservice.py:844
 msgid ""
 "A host name can only contain letters, numbers,  periods, and minus signs (-)."
 msgstr "El nombre de host sólo puede contener letras, números, puntos y signos menos (-)."
 
-#: ../nameservice.py:808
+#: ../nameservice.py:804
 msgid "The domain cannot be blank."
 msgstr "El dominio no puede dejarse en blanco."
 
-#: ../nameservice.py:812
+#: ../nameservice.py:808
 msgid "Domain labels must have less than 64 characters."
 msgstr "Las etiquetas de dominio deben tener menos de 64 caracteres."
 
-#: ../nameservice.py:815
+#: ../nameservice.py:811
 msgid "Domain labels should not start or end with hyphens ('-')."
 msgstr "Las etiquetas de dominio no deben comenzar ni finalizar con guiones ('-')."
 
-#: ../nameservice.py:818
+#: ../nameservice.py:814
 msgid "Invalid domain"
 msgstr "Dominio no válido"
 
-#: ../nameservice.py:868
+#: ../nameservice.py:864
 #, python-format
 msgid "The %s cannot be blank."
 msgstr "%s no puede dejarse en blanco."
 
-#: ../nameservice.py:871
+#: ../nameservice.py:867
 #, python-format
 msgid "Invalid character for %s."
 msgstr "Carácter no válido para %s."
 
-#: ../nameservice.py:883
+#: ../nameservice.py:879
 msgid "Domain labels must have less than 64 characters"
 msgstr "Las etiquetas de dominio deben tener menos de 64 caracteres"
 
-#: ../nameservice.py:885
+#: ../nameservice.py:881
 msgid "A domain label may not begin with a hyphen."
 msgstr "Una etiqueta de dominio no puede comenzar con un guión."
 
-#: ../nameservice.py:888
+#: ../nameservice.py:884
 msgid "Invalid character for domain name."
 msgstr "Carácter no válido para un nombre de dominio."
 
@@ -807,10 +807,6 @@
 msgstr "Carácter no válido"
 
 #: ../profile/user_info.py:284
-msgid "User password must be entered."
-msgstr "Se debe introducir la contraseña del usuario."
-
-#: ../profile/user_info.py:284
 msgid "Password must be entered."
 msgstr "Se debe introducir la contraseña."
 
@@ -911,69 +907,81 @@
 msgid "Router: %s"
 msgstr "    Enrutador: %s"
 
-#: ../summary.py:209
+#: ../summary.py:214
+msgid "  Warning: No root password set"
+msgstr "  Advertencia: no se configuró una contraseña de usuario root"
+
+#: ../summary.py:216
 #, python-format
-msgid "Domain: %s"
-msgstr "    Dominio: %s"
+msgid "  Username: %s"
+msgstr "  Nombre de usuario: %s"
+
+#: ../summary.py:218
+msgid "  No user account"
+msgstr "  No hay cuentas de usuario"
 
-#: ../summary.py:212 ../summary.py:220 ../summary.py:233
+#: ../summary.py:224
+#, python-format
+msgid "Time Zone: %s"
+msgstr "Zona horaria: %s"
+
+#: ../summary.py:238 ../summary.py:246 ../summary.py:260
 #, python-format
 msgid "Name service: %s"
 msgstr "Servicio de nombres: %s"
 
-#: ../summary.py:215
+#: ../summary.py:241
 msgid "DNS servers: "
 msgstr "Servidores DNS: "
 
-#: ../summary.py:217
+#: ../summary.py:243
 msgid "DNS Domain search list: "
 msgstr "Lista de búsqueda de dominio de DNS: "
 
-#: ../summary.py:222
+#: ../summary.py:248 ../summary.py:262
+#, python-format
+msgid "Domain: %s"
+msgstr "    Dominio: %s"
+
+#: ../summary.py:249
 msgid "LDAP profile: "
 msgstr "Perfil LDAP: "
 
-#: ../summary.py:223
+#: ../summary.py:250
 msgid "LDAP server's IP: "
 msgstr "IP del servidor LDAP: "
 
-#: ../summary.py:224
+#: ../summary.py:251
 msgid "LDAP search base: "
 msgstr "Base de búsqueda de LDAP: "
 
-#: ../summary.py:228
+#: ../summary.py:255
 msgid "LDAP proxy bind distinguished name: "
 msgstr "Nombre distintivo de vínculo de proxy LDAP: "
 
-#: ../summary.py:230
+#: ../summary.py:257
 msgid "LDAP proxy bind password: [concealed]"
 msgstr "Contraseña de vínculo de proxy LDAP: [concealed]"
 
-#: ../summary.py:236
+#: ../summary.py:264
 msgid "NIS server: broadcast"
 msgstr "Servidor NIS: emisión"
 
-#: ../summary.py:238
+#: ../summary.py:266
 msgid "NIS server's IP: "
 msgstr "IP del servidor NIS: "
 
-#: ../summary.py:249
-msgid "  Warning: No root password set"
-msgstr "  Advertencia: no se configuró una contraseña de usuario root"
-
-#: ../summary.py:251
-#, python-format
-msgid "  Username: %s"
-msgstr "  Nombre de usuario: %s"
+#: ../summary.py:269
+msgid "Note: DNS will be configured to resolve host and IP node names."
+msgstr "Nota: DNS se configurará para resolver los nombres de nodo IP y host."
 
-#: ../summary.py:253
-msgid "  No user account"
-msgstr "  No hay cuentas de usuario"
+#: ../summary.py:271
+msgid "This setting can be modified upon rebooting. For example:"
+msgstr "Esta configuración se puede modificar durante el reinicio. Por ejemplo:"
 
-#: ../summary.py:259
-#, python-format
-msgid "Time Zone: %s"
-msgstr "Zona horaria: %s"
+#: ../summary.py:278
+msgid "See nsswitch.conf(4), svccfg(1M) and nscfg(1M)."
+msgstr "Consulte nsswitch.conf(4), svccfg(1M) y nscfg(1M)."
 
 #: ../timezone.py:53
 msgid "UTC/GMT"
@@ -1015,7 +1023,7 @@
 msgid "Regions"
 msgstr "Regiones"
 
-#: ../users.py:57 ../users.py:79
+#: ../users.py:57 ../users.py:68
 msgid "Users"
 msgstr "Usuarios"
 
@@ -1051,42 +1059,19 @@
 msgid "User password:"
 msgstr "Contraseña de usuario:"
 
-#: ../users.py:68
-msgid "No Root Password"
-msgstr "No existe contraseña de usuario root"
-
-#: ../users.py:69
-msgid ""
-"A root password has not been defined. The system is completely unsecured.\n"
-"\n"
-"Choose Cancel to set a root password."
-msgstr "No se definió una contraseña de usuario root. El sistema está completamente desprotegido.\n \n Elija Cancelar para configurar una contraseña de usuario root."
-
-#: ../users.py:72
-msgid "No User Password"
-msgstr "No existe contraseña de usuario"
-
-#: ../users.py:73
-msgid ""
-"A user password has not been defined. The user account has administrative "
-"privileges so the system is unsecured.\n"
-"\n"
-"Choose Cancel to set a user password."
-msgstr "No se definió una contraseña de usuario. La cuenta del usuario tiene privilegios administrativos; por lo tanto, el sistema está desprotegido.\n \n Elija Cancelar para configurar una contraseña de usuario."
-
-#: ../users.py:297
+#: ../users.py:311
 msgid "Root passwords don't match"
 msgstr "Las contraseñas de usuario root no coinciden"
 
-#: ../users.py:300
+#: ../users.py:324
 msgid "User passwords don't match"
 msgstr "Las contraseñas de usuario no coinciden"
 
-#: ../users.py:322
+#: ../users.py:329
 msgid "Enter username or clear all user account fields"
 msgstr "Introduzca el nombre de usuario o borre todos los campos de la cuenta de usuario"
 
-#: ../users.py:369
+#: ../users.py:367
 msgid "Passwords don't match"
 msgstr "Las contraseñas no coinciden"
 

--- a/messages/install/es_ES/usr/share/locale/__LOCALE__/LC_MESSAGES/textinstall.pot	Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/es_ES/usr/share/locale/__LOCALE__/LC_MESSAGES/textinstall.pot	Wed Aug 31 20:17:18 2011 +0900
@@ -20,53 +20,59 @@
 #
 # Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
+#: ../disk_selection.py:96
 msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-07-29 11:16+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 12:36+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
 
 #: ../__init__.py:53
 msgid "Oracle Solaris"
 msgstr "Oracle Solaris"
 
-#: ../__init__.py:126
+#. Localized values used by other files
+#: ../__init__.py:57
+msgid "GB"
+msgstr "GB"
+
+#: ../__init__.py:128
 #, python-format
 msgid ""
 "Exiting Text Installer. Log is available at:\n"
 "%s"
 msgstr "Saliendo del instalador de texto. El registro está disponible en:\n %s"
 
-#: ../__init__.py:300
+#: ../__init__.py:303
 msgid ""
 "DONT_TRANSLATE_BUT_REPLACE_msgstr_WITH_True_OR_False: Should wrap text on "
 "whitespace in this language"
 msgstr "True  "
 
-#: ../__init__.py:303
+#: ../__init__.py:306
 msgid "Confirm: Quit the Installer?"
 msgstr "Confirmar: ¿Desea salir del instalador?"
 
-#: ../__init__.py:304
+#: ../__init__.py:307
 msgid "Do you want to quit the Installer?"
 msgstr "¿Desea salir del instalador?"
 
-#: ../__init__.py:305 ../disk_selection.py:106
+#: ../__init__.py:308 ../disk_selection.py:108
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../__init__.py:306 ../__init__.py:376
+#: ../__init__.py:309 ../__init__.py:379
 msgid "Quit"
 msgstr "Salir"
 
-#: ../__init__.py:313
+#: ../__init__.py:316
 #, python-format
 msgid "The %(release)s Text Installer must be run with root privileges"
 msgstr "El instalador de texto %(release)s se debe ejecutar con privilegios de usuario root"
 
-#: ../__init__.py:318
+#: ../__init__.py:321
 #, python-format
 msgid "Set log location to FILE (default: %default)"
 msgstr "Configure la ubicación del registro en ARCHIVO (valor predeterminado: %default)"
 
-#: ../__init__.py:322
+#: ../__init__.py:325
 #, python-format
 msgid ""
 "Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -74,274 +80,264 @@
 "[default: %default]"
 msgstr "Configure el detalle del registro en NIVEL. A fin de aumentar el detalle, los valores válidos son 'error' 'warn' 'info' 'debug' o 'input'\n [default: %default]"
 
-#: ../__init__.py:329
+#: ../__init__.py:332
 msgid ""
 "Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
 "killing the program\n"
 msgstr "Habilite el modo de depuración. Permite configurar el nivel de inicio de sesión en 'input' y habilitar CTRL-C para cerrar el programa\n"
 
-#: ../__init__.py:333
+#: ../__init__.py:336
 msgid ""
 "Force the installer to run in black and white. This may be useful on some "
 "SPARC machines with unsupported frame buffers\n"
 msgstr "Fuerce el instalador para que se ejecute en blanco y negro. Esto puede ser útil en algunas máquinas SPARC con memorias intermedias de trama no admitidas\n"
 
-#: ../__init__.py:338
+#: ../__init__.py:341
 msgid ""
 "Runs in 'no installation' mode. When run in 'no installation' mode, no "
 "persistent changes are made to the disks and booted environment\n"
 msgstr "Se ejecuta en modo 'no installation'. Cuando se ejecuta en modo 'no installation', no se realizan cambios permanentes en los discos ni el entorno iniciado\n"
 
-#: ../__init__.py:365
+#: ../__init__.py:368
 #, python-format
 msgid ""
 "     Terminal too small. Min size is 80x24. Current size is %(x)ix%(y)i."
 msgstr "     El terminal es demasiado pequeño. El tamaño mínimo es 80x24. El tamaño actual es %(x)ix%(y)i."
 
-#: ../__init__.py:371 ../disk_selection.py:107
+#: ../__init__.py:374 ../disk_selection.py:109
 msgid "Continue"
 msgstr "Cont"
 
-#: ../__init__.py:373
+#: ../__init__.py:376
 msgid "Back"
 msgstr "Atrás"
 
-#: ../__init__.py:375
+#: ../__init__.py:378
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../__init__.py:380
+#: ../__init__.py:383
 msgid "Help Topics"
 msgstr "Temas de ayuda"
 
-#: ../__init__.py:381
+#: ../__init__.py:384
 msgid "Help Index"
 msgstr "Índice de ayuda"
 
-#: ../__init__.py:382
+#: ../__init__.py:385
 msgid "Select a topic and press Continue."
 msgstr "Seleccione un tema y presione Continuar."
 
-#: ../__init__.py:417
+#: ../__init__.py:421
 msgid "An unhandled exception occurred."
 msgstr "Se produjo una excepción no tratada."
 
-#: ../__init__.py:422
+#: ../__init__.py:426
 msgid "Full traceback data is in the installation log"
 msgstr "Todos los datos de rastreo están en el registro de instalación"
 
-#: ../__init__.py:423
+#: ../__init__.py:427
 msgid "Please file a bug at http://defect.opensolaris.org"
 msgstr "Informe el error en http://defect.opensolaris.org"
 
-#: ../disk_selection.py:68 ../disk_selection.py:109
+#: ../disk_selection.py:69 ../disk_selection.py:111
 msgid "Disks"
 msgstr "Discos"
 
-#: ../disk_selection.py:69
+#: ../disk_selection.py:70
 #, python-format
 msgid "Where should %(release)s be installed?"
 msgstr "¿Dónde se debe instalar %(release)s?"
 
-#: ../disk_selection.py:70
-#, python-format
-msgid "Recommended size:  %(recommend).1fGB      Minimum size: %(min).1fGB"
-msgstr "Tamaño recomendado:  %(recommend).1fGB      Tamaño mínimo: %(min).1fGB"
+#: ../disk_selection.py:71
+msgid "Recommended size: "
+msgstr "Tamaño recomendado: "
 
 #: ../disk_selection.py:72
+msgid "    Minimum size: "
+msgstr "    Tamaño mínimo: "
+
+#: ../disk_selection.py:73
 msgid "Seeking disks on system"
 msgstr "Buscando discos en el sistema"
 
-#: ../disk_selection.py:73 ../fdisk_partitions.py:66
+#: ../disk_selection.py:74 ../fdisk_partitions.py:68
 msgid "The following partitions were found on the disk."
 msgstr "Se encontraron las siguientes particiones en el disco."
 
-#: ../disk_selection.py:74 ../fdisk_partitions.py:69
+#: ../disk_selection.py:75 ../fdisk_partitions.py:71
 msgid "The following slices were found on the disk."
 msgstr "Se encontraron los siguientes segmentos en el disco."
 
-#: ../disk_selection.py:75 ../fdisk_partitions.py:67
+#: ../disk_selection.py:76 ../fdisk_partitions.py:69
 msgid "A partition table was not found. The following is proposed."
 msgstr "No se encontró una tabla de particiones. Se propone lo siguiente."
 
-#: ../disk_selection.py:77 ../fdisk_partitions.py:70
+#: ../disk_selection.py:78 ../fdisk_partitions.py:72
 msgid "A VTOC label was not found. The following is proposed."
 msgstr "No se encontró la etiqueta VTOC. Se propone lo siguiente."
 
-#: ../disk_selection.py:79
+#: ../disk_selection.py:80
 msgid "A GPT labeled disk was found. The following is proposed."
 msgstr "Se encontró un disco con etiqueta GPT. Se propone lo siguiente."
 
-#: ../disk_selection.py:81
-msgid "Too small"
-msgstr "Demasiado pequeño"
-
-#: ../disk_selection.py:82
-#, python-format
-msgid "Limited to %.1f TB"
-msgstr "Limitado a %.1f TB"
-
-#: ../disk_selection.py:83
+#: ../disk_selection.py:84
 msgid "GPT labeled disk"
 msgstr "Disco con etiqueta GPT"
 
-#: ../disk_selection.py:84
+#: ../disk_selection.py:85
 msgid "No disks found. Additional device drivers may be needed."
 msgstr "No se encontraron discos. Es posible que se necesiten controladores de dispositivos adicionales."
 
-#: ../disk_selection.py:86
+#: ../disk_selection.py:87
 #, python-format
 msgid "%(release)s cannot be installed on any disk"
 msgstr "%(release)s no se puede instalar en ningún disco"
 
-#: ../disk_selection.py:87
+#: ../disk_selection.py:88
 msgid ""
 "An error occurred while searching for installation targets. Please check the "
 "install log and file a bug at defect.opensolaris.org."
 msgstr "Se produjo un error al buscar objetivos de instalación. Revise el registro de instalación e informe el error en defect.opensolaris.org."
 
-#: ../disk_selection.py:91
+#: ../disk_selection.py:92
 msgid "Type"
 msgstr "Tipo"
 
-#: ../disk_selection.py:92 ../disk_window.py:64 ../disk_window.py:67
-#: ../disk_window.py:72 ../disk_window.py:76
+#: ../disk_selection.py:93 ../disk_window.py:65 ../disk_window.py:68
+#: ../disk_window.py:73 ../disk_window.py:77
 msgid "Size(GB)"
-msgstr "Tamaño(GB)"
+msgstr "Tmñ (GB)"
 
-#: ../disk_selection.py:93 ../fdisk_partitions.py:55
+#: ../disk_selection.py:94 ../fdisk_partitions.py:56
 #: ../partition_edit_screen.py:89
 msgid "Boot"
-msgstr "Inicio"
-
-#: ../disk_selection.py:94
-msgid "Device"
-msgstr "Dispositivo"
+msgstr "Ini"
 
 #: ../disk_selection.py:95
-msgid "Manufacturer"
-msgstr "Fabricante"
+msgid "Device"
+msgstr "Disptv"
 
-#: ../disk_selection.py:96
-msgid "Notes"
-msgstr "Notas"
-
-#: ../disk_selection.py:99
+#: ../disk_selection.py:101
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../disk_selection.py:100
+#: ../disk_selection.py:102
 #, python-format
 msgid "Only the first %.1fTB can be used."
 msgstr "Sólo se pueden usar los primeros %.1fTB."
 
-#: ../disk_selection.py:101
+#: ../disk_selection.py:103
 msgid ""
 "You have chosen a GPT labeled disk. Installing onto a GPT labeled disk will "
 "cause the loss of all existing data and the disk will be relabeled as SMI."
 msgstr "Ha elegido un disco con etiqueta GPT. Si realiza la instalación en un disco con etiqueta GPT, se perderán todos los datos existentes y se volverá a colocar la etiqueta SMI al disco."
 
-#: ../disk_window.py:63 ../disk_window.py:66
+#: ../disk_window.py:64 ../disk_window.py:67
 msgid "Primary"
 msgstr "Principal"
 
-#: ../disk_window.py:63 ../disk_window.py:66
+#: ../disk_window.py:64 ../disk_window.py:67
 msgid "Logical"
 msgstr "Lógico"
 
-#: ../disk_window.py:68 ../disk_window.py:77
+#: ../disk_window.py:69 ../disk_window.py:78
 msgid " Avail"
 msgstr " Disp"
 
-#: ../disk_window.py:70 ../disk_window.py:74
+#: ../disk_window.py:71 ../disk_window.py:75
 msgid "Slice"
 msgstr "Segmento"
 
-#: ../disk_window.py:341
+#: ../disk_window.py:342
 #, python-format
 msgid "%d more partitions"
 msgstr "%d más particiones"
 
-#: ../disk_window.py:343
+#: ../disk_window.py:344
 #, python-format
 msgid "%d more slices"
 msgstr "%d más segmentos"
 
-#: ../disk_window.py:775 ../disk_window.py:785
-msgid "Only the digits 0-9 and \".\" are valid."
-msgstr "Sólo los dígitos del 0 al 9 y \".\" son válidos."
+#: ../disk_window.py:777 ../disk_window.py:787
+#, python-format
+msgid "Only the digits 0-9 and %s are valid."
+msgstr "Sólo los dígitos del 0 al 9 y %s son válidos."
 
-#: ../disk_window.py:778
-msgid "A number can only have one \".\""
-msgstr "El número sólo puede tener un \".\""
+#: ../disk_window.py:780
+#, python-format
+msgid "A number can only have one %s"
+msgstr "El número sólo puede tener un %s"
 
-#: ../disk_window.py:787
+#: ../disk_window.py:789
 msgid "Size can be specified to only one decimal place."
 msgstr "El tamaño se puede especificar sólo con un lugar decimal."
 
-#: ../disk_window.py:803
+#: ../disk_window.py:807
 #, python-format
-msgid ""
-"The new size (%(size).1f) is greater than the available space (%(avail).1f)"
-msgstr "El nuevo tamaño (%(size).1f) es mayor que el espacio disponible (%(avail).1f)"
+msgid "The new size %(size)s is greater than the available space %(avail)s"
+msgstr "El nuevo tamaño %(size)s es mayor que el espacio disponible %(avail)s"
 
-#: ../fdisk_partitions.py:56
-#, python-format
-msgid "Fdisk Partitions: %(size).1fGB %(type)s %(bootable)s"
-msgstr "Particiones fdisk: %(size).1fGB %(type)s %(bootable)s"
+#: ../fdisk_partitions.py:57
+msgid "Fdisk Partitions: "
+msgstr "Particiones fdisk: "
 
-#: ../fdisk_partitions.py:57 ../fdisk_partitions.py:84
+#: ../fdisk_partitions.py:58 ../fdisk_partitions.py:86
 msgid "Solaris Partition Slices"
 msgstr "Segmentos de partición de Solaris"
 
-#: ../fdisk_partitions.py:58
+#: ../fdisk_partitions.py:59
+msgid "Solaris Slices: "
+msgstr "Segmentos Solaris: "
+
+#: ../fdisk_partitions.py:60 ../partition_edit_screen.py:84
 #, python-format
-msgid "Solaris Slices: %(size).1fGB %(type)s %(bootable)s"
-msgstr "Segmentos Solaris: %(size).1fGB %(type)s %(bootable)s"
+msgid " %(type)s %(bootable)s"
+msgstr " %(type)s %(bootable)s"
 
-#: ../fdisk_partitions.py:59
+#: ../fdisk_partitions.py:61
 #, python-format
 msgid ""
 "%(release)s can be installed on the whole disk or a partition on the disk."
 msgstr "%(release)s se puede instalar en todo el disco o en una partición de éste."
 
-#: ../fdisk_partitions.py:61
+#: ../fdisk_partitions.py:63
 #, python-format
 msgid ""
 "%(release)s can be installed in the whole fdisk partition or within a slice "
 "in the partition"
 msgstr "%(release)s se puede instalar en toda la partición fdisk o dentro de un segmento de la partición."
 
-#: ../fdisk_partitions.py:64
+#: ../fdisk_partitions.py:66
 #, python-format
 msgid "%(release)s can be installed on the whole disk or a slice on the disk."
 msgstr "%(release)s se puede instalar en todo el disco o un segmento de éste."
 
-#: ../fdisk_partitions.py:72
+#: ../fdisk_partitions.py:74
 msgid "Use the whole disk"
 msgstr "Usar todo el disco"
 
-#: ../fdisk_partitions.py:73
+#: ../fdisk_partitions.py:75
 msgid "Use the whole partition"
 msgstr "Usar toda la partición"
 
-#: ../fdisk_partitions.py:74
+#: ../fdisk_partitions.py:76
 msgid "Use a slice in the partition"
 msgstr "Usar un segmento de la partición"
 
-#: ../fdisk_partitions.py:75
+#: ../fdisk_partitions.py:77
 msgid "Use a partition of the disk"
 msgstr "Usar una partición del disco"
 
-#: ../fdisk_partitions.py:76
+#: ../fdisk_partitions.py:78
 msgid "Use a slice on the disk"
 msgstr "Usar un segmento del disco"
 
-#: ../fdisk_partitions.py:79
+#: ../fdisk_partitions.py:81
 msgid "Solaris Slices"
 msgstr "Segmentos Solaris"
 
-#: ../fdisk_partitions.py:82
+#: ../fdisk_partitions.py:84
 msgid "Fdisk Partitions"
 msgstr "Particiones fdisk"
 
@@ -405,7 +401,7 @@
 "\t%s"
 msgstr "No se pudo leer el archivo de registro:\n \t%s"
 
-#: ../partition_edit_screen.py:59
+#: ../partition_edit_screen.py:60
 msgid ""
 "Oracle Solaris will be installed into the Solaris partition. A partition's "
 "type can be changed using the F5 key.\n"
@@ -418,7 +414,7 @@
 "\"Extended\" partition its logical partitions are listed on the right."
 msgstr "Oracle Solaris se instalará en la partición de Solaris. Un tipo de partición se puede cambiar con la tecla F5.\n \n El tamaño de la partición se puede aumentar hasta alcanzar el espacio disponible. Para aumentar el espacio disponible, suprima una partición adyacente. Para suprimir una partición, cámbiela a \"Sin usar\" con la tecla F5.\n Las cuatro ranuras de partición principales se muestran a la izquierda. Si una de ellas es una partición \"Extendida\", sus particiones lógicas se muestran a la derecha."
 
-#: ../partition_edit_screen.py:71
+#: ../partition_edit_screen.py:72
 #, python-format
 msgid ""
 "%(release)s will be installed in the \"%(pool)s\" slice. Use the F5 key to "
@@ -431,19 +427,17 @@
 "Slices are listed in disk layout order."
 msgstr "%(release)s se instalará en el segmento \"%(pool)s\". Use la tecla F5 para cambiar un segmento a \"%(pool)s.\"\n \n El tamaño del segmento se puede aumentar hasta alcanzar el tamaño disponible. Para aumentar el espacio disponible, suprima un segmento adyacente. Use la tecla F5 para suprimir un segmento y cambiarlo a \"Sin usar.\"\n \n Los segmentos se muestran en el orden de la disposición del disco."
 
-#: ../partition_edit_screen.py:80
-#, python-format
-msgid "Select Partition: %(size).1fGB %(type)s %(bootable)s"
-msgstr "Seleccionar partición: %(size).1fGB %(type)s %(bootable)s"
+#: ../partition_edit_screen.py:81
+msgid "Select Partition: "
+msgstr "Seleccionar partición: "
 
 #: ../partition_edit_screen.py:82
 msgid "Select Slice in Fdisk Partition"
 msgstr "Seleccionar segmento en partición fdisk"
 
 #: ../partition_edit_screen.py:83
-#, python-format
-msgid "Select Slice: %(size).1fGB %(type)s%(bootable)s"
-msgstr "Seleccionar segmento: %(size).1fGB %(type)s%(bootable)s"
+msgid "Select Slice: "
+msgstr "Seleccionar segmento: "
 
 #: ../partition_edit_screen.py:85
 msgid "indicates the slice's current content will be destroyed"
@@ -469,163 +463,115 @@
 msgid "Change Type"
 msgstr "Camb tipo"
 
-#: ../summary.py:61 ../summary.py:66
+#: ../summary.py:63 ../summary.py:68
 msgid "Installation Summary"
 msgstr "Resumen de instalación"
 
-#: ../summary.py:62
+#: ../summary.py:64
 msgid ""
 "Review the settings below before installing. Go back (F3) to make changes."
 msgstr "Revise los siguientes valores de configuración antes de realizar la instalación. Retroceda (F3) para realizar cambios."
 
-#: ../summary.py:72
+#: ../summary.py:74
 msgid "Install"
 msgstr "Instalar"
 
-#: ../summary.py:111
+#: ../summary.py:113
 #, python-format
 msgid "Software: %s"
 msgstr "Software: %s"
 
-#: ../summary.py:117
+#: ../summary.py:119
 msgid "Language: *The following can be changed when logging in."
 msgstr "Idioma: *lo siguiente se puede cambiar al iniciar sesión."
 
-#: ../summary.py:121
+#: ../summary.py:123
 #, python-format
 msgid "  Default language: %s"
 msgstr "  Idioma predeterminado: %s"
 
-#: ../summary.py:124
+#: ../summary.py:126
 msgid "Keyboard layout: *The following can be changed when logging in."
 msgstr "Disposición del teclado: *lo siguiente se puede cambiar al iniciar sesión."
 
-#: ../summary.py:126
+#: ../summary.py:128
 #, python-format
 msgid "  Default keyboard layout: %s"
 msgstr "  Disposición predeterminada del teclado: %s"
 
-#: ../summary.py:129
+#: ../summary.py:131
 #, python-format
 msgid "Terminal type: %s"
 msgstr "Tipo de terminal: %s"
 
-#: ../summary.py:132
+#: ../summary.py:134
 msgid "Users:"
 msgstr "Usuarios:"
 
-#: ../summary.py:135
+#: ../summary.py:137
 msgid "Network:"
 msgstr "Red:"
 
-#: ../summary.py:147
+#: ../summary.py:149
 #, python-format
 msgid "  Computer name: %s"
 msgstr "  Nombre de equipo: %s"
 
-#: ../summary.py:152
+#: ../summary.py:154
 msgid "  Network Configuration: Automatic"
 msgstr "  Configuración de red: automática"
 
-#: ../summary.py:154
+#: ../summary.py:156
 msgid "  Network Configuration: None"
 msgstr "  Configuración de red: ninguna"
 
-#: ../summary.py:156
+#: ../summary.py:158
 #, python-format
 msgid "  Manual Configuration: %s"
 msgstr "  Configuración manual:‎ %s"
 
-#: ../summary.py:158
+#: ../summary.py:160
 #, python-format
 msgid "    IP Address: %s"
 msgstr "    Dirección IP: %s"
 
-#: ../summary.py:159
+#: ../summary.py:161
 #, python-format
 msgid "    Netmask: %s"
 msgstr "    Máscara de red: %s"
 
-#: ../summary.py:161
+#: ../summary.py:163
 #, python-format
 msgid "    Router: %s"
 msgstr "    Enrutador: %s"
 
-#: ../summary.py:172
-#, python-format
-msgid "Domain: %s"
-msgstr "    Dominio: %s"
-
-#: ../summary.py:175 ../summary.py:185 ../summary.py:198
-#, python-format
-msgid "Name service: %s"
-msgstr "Servicio de nombres: %s"
-
-#: ../summary.py:179
-msgid "DNS servers: "
-msgstr "Servidores DNS: "
-
-#: ../summary.py:181
-msgid "DNS Domain search list: "
-msgstr "Lista de búsqueda de dominio de DNS: "
-
-#: ../summary.py:187
-msgid "LDAP profile: "
-msgstr "Perfil LDAP: "
-
-#: ../summary.py:188
-msgid "LDAP server's IP: "
-msgstr "IP del servidor LDAP: "
-
-#: ../summary.py:189
-msgid "LDAP search base: "
-msgstr "Base de búsqueda de LDAP: "
-
-#: ../summary.py:193
-msgid "LDAP proxy bind distinguished name: "
-msgstr "Nombre distintivo de vínculo de proxy LDAP: "
-
-#: ../summary.py:195
-msgid "LDAP proxy bind password: [concealed]"
-msgstr "Contraseña de vínculo de proxy LDAP: [concealed]"
-
-#: ../summary.py:201
-msgid "NIS server: broadcast"
-msgstr "Servidor NIS: emisión"
-
-#: ../summary.py:203
-msgid "NIS server's IP: "
-msgstr "IP del servidor NIS: "
-
-#: ../summary.py:214
+#: ../summary.py:180
 msgid "  Warning: No root password set"
 msgstr "  Advertencia: no se configuró una contraseña de usuario root"
 
-#: ../summary.py:216
+#: ../summary.py:182
 #, python-format
 msgid "  Username: %s"
 msgstr "  Nombre de usuario: %s"
 
-#: ../summary.py:218
+#: ../summary.py:184
 msgid "  No user account"
 msgstr "  No hay cuentas de usuario"
 
-#: ../summary.py:228
-#, python-format
-msgid "Disk: %(disk-size).1fGB %(disk-type)s"
-msgstr "Disco: %(disk-size).1fGB %(disk-type)s"
+#: ../summary.py:198
+msgid "Disk: "
+msgstr "Disco: "
 
-#: ../summary.py:238
+#: ../summary.py:209
+msgid "Partition: "
+msgstr "Partición: "
+
+#: ../summary.py:216
 #, python-format
-msgid "Partition: %(part-size).1fGB %(part-type)s"
-msgstr "Partición: %(part-size).1fGB %(part-type)s"
+msgid "Slice %s: "
+msgstr "Segmento %s: "
 
-#: ../summary.py:246
-#, python-format
-msgid "Slice %(slice-num)s: %(slice-size).1fGB %(pool)s"
-msgstr "Segmento %(slice-num)s: %(slice-size).1fGB %(pool)s"
-
-#: ../summary.py:257
+#: ../summary.py:230
 #, python-format
 msgid "Time Zone: %s"
 msgstr "Zona horaria: %s"