po: Translation updates for autoboot/ipmi changes

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>

diff --git a/po/de.po b/po/de.po
index c6b41f2323655f65ad2ef61ae0f287ef42dc0cb2..d541d170d089a17f726cdc4d0e2bf9a21326f7fe 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: German\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: German\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"

 
 msgid "running boot hooks"
 msgstr "Aktive Boot-Anbindungspunkte (Hooks)"
 
 msgid "running boot hooks"
 msgstr "Aktive Boot-Anbindungspunkte (Hooks)"


@@ -130,20 +130,28 @@ msgstr "Systemkonfiguration"
 msgid "No IP / mask values are set"
 msgstr "Keine Werte für IP/Maske festgelegt"
 
 msgid "No IP / mask values are set"
 msgstr "Keine Werte für IP/Maske festgelegt"
 

+msgid "Select a boot device to add"
+msgstr "Wählen Sie eine Booteinheit aus, die hinzugefügt werden soll"
+

 msgid "Waiting for configuration data..."
 msgstr "Warten auf Konfigurationsdaten..."
 
 msgid "Waiting for configuration data..."
 msgstr "Warten auf Konfigurationsdaten..."
 

-msgid "Autoboot:"
-msgstr "Autom. Booten:"
+#, fuzzy
+msgid "Add Device"
+msgstr "Einheit:"
+
+msgid "Clear"
+msgstr "Inhalt löschen"

 
 

-msgid "Don't autoboot"
-msgstr "Kein automatisches Booten"
+msgid "Clear & Boot Any"
+msgstr "Inhalt löschen & beliebige booten"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "Von jeder Platte/Netzeinheit automatisch booten"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Bootargumente:"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "Nur von bestimmter Platte/Netzeinheit autom. booten"
+msgid "(None)"
+msgstr "(Keine Angabe)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -153,9 +161,13 @@ msgstr "Platte: %s [UUID: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "Netz:  %s [MAC: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "Netz:  %s [MAC: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Einheit:"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "Unbekannte UUID: %s"
+msgid "Any %s device"
+msgstr "Jede %s-Einheit"

 
 msgid "Timeout:"
 msgstr "Zeitlimit:"
 
 msgid "Timeout:"
 msgstr "Zeitlimit:"


@@ -163,6 +175,13 @@ msgstr "Zeitlimit:"
 msgid "seconds"
 msgstr "Sekunden"
 
 msgid "seconds"
 msgstr "Sekunden"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "IPMI-Bootoption für %s: %s"
+
+msgid "Clear option:"
+msgstr "Option 'Inhalt löschen':"
+

 msgid "Network:"
 msgstr "Netz:"
 
 msgid "Network:"
 msgstr "Netz:"
 


@@ -326,24 +345,24 @@ msgstr "Speichereinheiten"
 
 #, c-format
 msgid " UUID:       %s"
 
 #, c-format
 msgid " UUID:       %s"

-msgstr " UUID:       %s"
+msgstr "  UUID:       %s"

 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " angehängt bei: %s"
+msgstr "  angehängt bei: %s"

 
 msgid "Network interfaces"
 msgstr "Netzschnittstellen"
 
 #, c-format
 msgid " MAC:  %s"
 
 msgid "Network interfaces"
 msgstr "Netzschnittstellen"
 
 #, c-format
 msgid " MAC:  %s"

-msgstr " MAC:  %s"
+msgstr "  MAC:  %s"

 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr " Verbindung: %s"
+msgstr "  Verbindung: %s"

 
 msgid "up"
 msgstr "aktiv"
 
 msgid "up"
 msgstr "aktiv"


@@ -425,7 +444,7 @@ msgid ""
 "host/pxeconffile or http://host/pxeconffile"
 msgstr ""
 "Geben Sie hier eine gültige URL ein, um eine ferne Konfigurationsdatei vom "
 "host/pxeconffile or http://host/pxeconffile"
 msgstr ""
 "Geben Sie hier eine gültige URL ein, um eine ferne Konfigurationsdatei vom "

-"Typ 'pxe-boot' abzurufen, und analysieren sie sie.\n"
+"Typ 'pxe-boot' abzurufen, und analysieren Sie sie.\n"

 "\n"
 "URLs haben das Format 'Schema://host/path/to/pxeconffile'. Beispiele: tftp://"
 "host/pxeconffile oder http://host/pxeconffile"
 "\n"
 "URLs haben das Format 'Schema://host/path/to/pxeconffile'. Beispiele: tftp://"
 "host/pxeconffile oder http://host/pxeconffile"


@@ -483,24 +502,29 @@ msgstr ""
 "Beispiel: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Beispiel: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -567,3 +591,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Verwendung"
 
 msgid "Usage"
 msgstr "Verwendung"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/en.po b/po/en.po
index 5a3edde907a52f9522b2afcec4ed2148b08797e4..2e510cc43535de225c6e761c6d5f279dacb1bdf7 100644 (file)
--- a/po/en.po
+++ b/po/en.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: English\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: English\n"


@@ -128,20 +128,28 @@ msgstr "System Configuration"
 msgid "No IP / mask values are set"
 msgstr "No IP / mask values are set"
 
 msgid "No IP / mask values are set"
 msgstr "No IP / mask values are set"
 

+msgid "Select a boot device to add"
+msgstr ""
+

 msgid "Waiting for configuration data..."
 msgstr "Waiting for configuration data..."
 
 msgid "Waiting for configuration data..."
 msgstr "Waiting for configuration data..."
 

-msgid "Autoboot:"
-msgstr "Autoboot:"
+#, fuzzy
+msgid "Add Device"
+msgstr "Device:"
+
+msgid "Clear"
+msgstr ""

 
 

-msgid "Don't autoboot"
-msgstr "Don't autoboot"
+msgid "Clear & Boot Any"
+msgstr ""

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "Autoboot from any disk/network device"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Boot arguments:"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "Only autoboot from a specific disk/network device"
+msgid "(None)"
+msgstr ""

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,9 +159,13 @@ msgstr "disk: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "net:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "net:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Device:"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "Unknown UUID: %s"
+msgid "Any %s device"
+msgstr ""

 
 msgid "Timeout:"
 msgstr "Timeout:"
 
 msgid "Timeout:"
 msgstr "Timeout:"


@@ -161,6 +173,13 @@ msgstr "Timeout:"
 msgid "seconds"
 msgstr "seconds"
 
 msgid "seconds"
 msgstr "seconds"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr ""
+
+msgid "Clear option:"
+msgstr ""
+

 msgid "Network:"
 msgstr "Network:"
 
 msgid "Network:"
 msgstr "Network:"
 


@@ -470,24 +489,29 @@ msgstr ""
 "Example: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Example: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -547,3 +571,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Usage"
 
 msgid "Usage"
 msgstr "Usage"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/es.po b/po/es.po
index 09629e2591810ea277a74a8e623b6f10ad4a7eb4..0f155edae007cf6e103ca60f2d4f700f74221d6f 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Spanish\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Spanish\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"

 
 msgid "running boot hooks"
 msgstr "ejecutando ganchos de arranque"
 
 msgid "running boot hooks"
 msgstr "ejecutando ganchos de arranque"


@@ -96,7 +96,7 @@ msgid "Petitboot Config Retrieval"
 msgstr "Recuperación de configuración de Petitboot"
 
 msgid "tab=next, shift+tab=previous, x=exit, h=help"
 msgstr "Recuperación de configuración de Petitboot"
 
 msgid "tab=next, shift+tab=previous, x=exit, h=help"

-msgstr "tab=siguiente, shift+tab=anterior, x=salida, h=ayuda"
+msgstr "tab=siguiente, mayús+tab=anterior, x=salir, h=ayuda"

 
 msgid "Boot Option Editor"
 msgstr "Editor de opciones de arranque"
 
 msgid "Boot Option Editor"
 msgstr "Editor de opciones de arranque"


@@ -128,20 +128,28 @@ msgstr "Configuración del sistema"
 msgid "No IP / mask values are set"
 msgstr "No se han establecido valores IP / máscara"
 
 msgid "No IP / mask values are set"
 msgstr "No se han establecido valores IP / máscara"
 

+msgid "Select a boot device to add"
+msgstr "Seleccione un dispositivo de arranque para añadirlo"
+

 msgid "Waiting for configuration data..."
 msgstr "Esperando datos de configuración..."
 
 msgid "Waiting for configuration data..."
 msgstr "Esperando datos de configuración..."
 

-msgid "Autoboot:"
-msgstr "Arranque automático:"
+#, fuzzy
+msgid "Add Device"
+msgstr "Dispositivo:"
+
+msgid "Clear"
+msgstr "Borrar"

 
 

-msgid "Don't autoboot"
-msgstr "No arrancar automáticamente"
+msgid "Clear & Boot Any"
+msgstr "Borrar y realizar cualquier arranque"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "Arranque automático desde cualquier dispositivo de disco/red"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Argumentos de arranque:"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "Arranque automático sólo desde un dispositivo de disco/red"
+msgid "(None)"
+msgstr "(Ninguno)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,16 +159,27 @@ msgstr "disco: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "red:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "red:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Dispositivo:"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "UUID desconocido: %s"
+msgid "Any %s device"
+msgstr "Cualquier dispositivo %s"

 
 msgid "Timeout:"
 
 msgid "Timeout:"

-msgstr "Tiempo de espera:"
+msgstr "Tiempo espera:"

 
 msgid "seconds"
 msgstr "segundos"
 
 
 msgid "seconds"
 msgstr "segundos"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "Opción de arranque de IPMI %s: %s"
+
+msgid "Clear option:"
+msgstr "Borrar opción:"
+

 msgid "Network:"
 msgstr "Red:"
 
 msgid "Network:"
 msgstr "Red:"
 


@@ -323,24 +342,24 @@ msgstr "Dispositivos de almacenamiento"
 
 #, c-format
 msgid " UUID:       %s"
 
 #, c-format
 msgid " UUID:       %s"

-msgstr " UUID:       %s"
+msgstr "  UUID:       %s"

 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " montado en: %s"
+msgstr "  montado en: %s"

 
 msgid "Network interfaces"
 msgstr "Interfaces de red"
 
 #, c-format
 msgid " MAC:  %s"
 
 msgid "Network interfaces"
 msgstr "Interfaces de red"
 
 #, c-format
 msgid " MAC:  %s"

-msgstr " MAC:  %s"
+msgstr "  MAC:  %s"

 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr " enlace: %s"
+msgstr "  enlace: %s"

 
 msgid "up"
 msgstr "activo"
 
 msgid "up"
 msgstr "activo"


@@ -475,24 +494,29 @@ msgstr ""
 "Ejemplo: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Ejemplo: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -557,3 +581,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Uso"
 
 msgid "Usage"
 msgstr "Uso"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/fr.po b/po/fr.po
index 6d3e15fa0cf5d2cdea07e9958e33945af9562b03..f4f60a7c82247234da39f7e38830de1e0d136615 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: French\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: French\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"

 
 msgid "running boot hooks"
 msgstr "exécution points d'ancrage d'amorçage"
 
 msgid "running boot hooks"
 msgstr "exécution points d'ancrage d'amorçage"


@@ -128,20 +128,28 @@ msgstr "Configuration système"
 msgid "No IP / mask values are set"
 msgstr "Aucune valeur IP/de masque définie"
 
 msgid "No IP / mask values are set"
 msgstr "Aucune valeur IP/de masque définie"
 

+msgid "Select a boot device to add"
+msgstr "Sélectionner une unité d'amorçage à ajouter"
+

 msgid "Waiting for configuration data..."
 msgstr "Attente de données de configuration..."
 
 msgid "Waiting for configuration data..."
 msgstr "Attente de données de configuration..."
 

-msgid "Autoboot:"
-msgstr "Amorçage auto :"
+#, fuzzy
+msgid "Add Device"
+msgstr "Unité :"
+
+msgid "Clear"
+msgstr "Effacer"

 
 

-msgid "Don't autoboot"
-msgstr "Pas d'amorçage automatique"
+msgid "Clear & Boot Any"
+msgstr "Effacer & amorcer"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "Amorçage automatique depuis unité de disque/réseau"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Arguments d'amorçage :"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "Amorçage auto seulement depuis unité disque/réseau spécifique"
+msgid "(None)"
+msgstr "(Aucun)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,9 +159,13 @@ msgstr "disque : %s [uuid : %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "réseau :  %s [mac : %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "réseau :  %s [mac : %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Unité :"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "UUID inconnu : %s"
+msgid "Any %s device"
+msgstr "N'importe quelle unité %s"

 
 msgid "Timeout:"
 msgstr "Délai attente :"
 
 msgid "Timeout:"
 msgstr "Délai attente :"


@@ -161,6 +173,13 @@ msgstr "Délai attente :"
 msgid "seconds"
 msgstr "secondes"
 
 msgid "seconds"
 msgstr "secondes"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "%s Option d'amorçage IPMI : %s"
+
+msgid "Clear option:"
+msgstr "Option d'effacement :"
+

 msgid "Network:"
 msgstr "Réseau :"
 
 msgid "Network:"
 msgstr "Réseau :"
 


@@ -476,24 +495,29 @@ msgstr ""
 "Exemple : root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Exemple : root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -558,3 +582,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Utilisation"
 
 msgid "Usage"
 msgstr "Utilisation"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/it.po b/po/it.po
index 1c351985e8fc8e78ca661c7f65efed9ef28ee5dd..a3f82a3a982388756b06c11d870f4f7b1ad956f2 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Italian\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Italian\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"

 
 msgid "running boot hooks"
 msgstr "esecuzione di hook di avvio"
 
 msgid "running boot hooks"
 msgstr "esecuzione di hook di avvio"


@@ -129,20 +129,28 @@ msgstr "Configurazione di sistema"
 msgid "No IP / mask values are set"
 msgstr "Non è stato impostato alcun valore di IP/maschera"
 
 msgid "No IP / mask values are set"
 msgstr "Non è stato impostato alcun valore di IP/maschera"
 

+msgid "Select a boot device to add"
+msgstr "Selezionare un dispositivo di avvio da aggiungere"
+

 msgid "Waiting for configuration data..."
 msgstr "In attesa dei dati di configurazione..."
 
 msgid "Waiting for configuration data..."
 msgstr "In attesa dei dati di configurazione..."
 

-msgid "Autoboot:"
-msgstr "Avvio automatico:"
+#, fuzzy
+msgid "Add Device"
+msgstr "Dispositivo:"
+
+msgid "Clear"
+msgstr "Ripulisci"

 
 

-msgid "Don't autoboot"
-msgstr "Non eseguire l'avvio automatico"
+msgid "Clear & Boot Any"
+msgstr "Ripulisci e avvia tutto"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "Avvia automaticamente da qualsiasi dispositivo di rete/disco"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Argomenti avvio:"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "Avvia automaticamente solo da uno specifico dispositivo di rete/disco"
+msgid "(None)"
+msgstr "(Nessuno)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -152,9 +160,13 @@ msgstr "disco: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "rete:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "rete:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Dispositivo:"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "UUID sconosciuto: %s"
+msgid "Any %s device"
+msgstr "Qualsiasi dispositivo %s "

 
 msgid "Timeout:"
 msgstr "Timeout:"
 
 msgid "Timeout:"
 msgstr "Timeout:"


@@ -162,6 +174,13 @@ msgstr "Timeout:"
 msgid "seconds"
 msgstr "secondi"
 
 msgid "seconds"
 msgstr "secondi"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "Opzione di avvio IPMI %s: %s"
+
+msgid "Clear option:"
+msgstr "Ripulisci opzione:"
+

 msgid "Network:"
 msgstr "Rete:"
 
 msgid "Network:"
 msgstr "Rete:"
 


@@ -296,7 +315,7 @@ msgstr "Selezione lingua di Petitboot"
 
 #, c-format
 msgid "!Invalid option %d"
 
 #, c-format
 msgid "!Invalid option %d"

-msgstr "Opzione non valida %d"
+msgstr "!Opzione non valida %d"

 
 msgid "Disk"
 msgstr "Disco"
 
 msgid "Disk"
 msgstr "Disco"


@@ -476,24 +495,29 @@ msgstr ""
 "Esempio: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Esempio: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -559,3 +583,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Utilizzo"
 
 msgid "Usage"
 msgstr "Utilizzo"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/ja.po b/po/ja.po
index c225fe8c41311cb98924f285f9ac62f73590b89b..7ccf9ba424f163f793ada5e355dc644e71d8d34d 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Japanese\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Japanese\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 
 msgid "running boot hooks"
 msgstr "ブート・フックを実行しています"
 
 msgid "running boot hooks"
 msgstr "ブート・フックを実行しています"


@@ -128,20 +128,28 @@ msgstr "システム構成"
 msgid "No IP / mask values are set"
 msgstr "IP/マスク値が設定されていません"
 
 msgid "No IP / mask values are set"
 msgstr "IP/マスク値が設定されていません"
 

+msgid "Select a boot device to add"
+msgstr "追加するブート・デバイスの選択"
+

 msgid "Waiting for configuration data..."
 msgstr "構成データを待っています..."
 
 msgid "Waiting for configuration data..."
 msgstr "構成データを待っています..."
 

-msgid "Autoboot:"
-msgstr "自動ブート:"
+#, fuzzy
+msgid "Add Device"
+msgstr "デバイス: "
+
+msgid "Clear"
+msgstr "消去"

 
 

-msgid "Don't autoboot"
-msgstr "自動ブートしない"
+msgid "Clear & Boot Any"
+msgstr "消去していずれかをブート"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "任意のディスク/ネットワーク・デバイスから自動ブート"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "ブート引数:"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "特定ディスク/ネットワークデバイスからのみ自動ブート"
+msgid "(None)"
+msgstr "(なし)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,9 +159,13 @@ msgstr "ディスク: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "net:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "net:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "デバイス: "
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "ä¸\8dæ\98\8e UUID: %s"
+msgid "Any %s device"
+msgstr "ä»»æ\84\8fã\81® %s ã\83\87ã\83\90ã\82¤ã\82¹"

 
 msgid "Timeout:"
 msgstr "タイムアウト:"
 
 msgid "Timeout:"
 msgstr "タイムアウト:"


@@ -161,6 +173,13 @@ msgstr "タイムアウト:"
 msgid "seconds"
 msgstr "秒"
 
 msgid "seconds"
 msgstr "秒"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "%s IPMI ブート・オプション: %s"
+
+msgid "Clear option:"
+msgstr "消去オプション:"
+

 msgid "Network:"
 msgstr "ネットワーク:"
 
 msgid "Network:"
 msgstr "ネットワーク:"
 


@@ -296,7 +315,7 @@ msgstr "Petitboot 言語選択"
 
 #, c-format
 msgid "!Invalid option %d"
 
 #, c-format
 msgid "!Invalid option %d"

-msgstr "!オプション %d は無効です"
+msgstr "!オプション %d  は無効です"

 
 msgid "Disk"
 msgstr "ディスク"
 
 msgid "Disk"
 msgstr "ディスク"


@@ -324,31 +343,31 @@ msgstr "ストレージ・デバイス"
 
 #, c-format
 msgid " UUID:       %s"
 
 #, c-format
 msgid " UUID:       %s"

-msgstr " UUID:       %s"
+msgstr "  UUID:       %s"

 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " マウント位置: %s"
+msgstr "  マウント位置: %s"

 
 msgid "Network interfaces"
 msgstr "ネットワーク・インターフェース"
 
 #, c-format
 msgid " MAC:  %s"
 
 msgid "Network interfaces"
 msgstr "ネットワーク・インターフェース"
 
 #, c-format
 msgid " MAC:  %s"

-msgstr " MAC:  %s"
+msgstr "  MAC:  %s"

 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr " リンク: %s"
+msgstr "  リンク: %s"

 
 msgid "up"
 msgstr "アップ"
 
 #, fuzzy
 msgid "down"
 
 msgid "up"
 msgstr "アップ"
 
 #, fuzzy
 msgid "down"

-msgstr "ダウン"
+msgstr "ã\83ªã\83³ã\82¯ã\83\80ã\82¦ã\83³"

 
 msgid "Petitboot System Information"
 msgstr "Petitboot システム情報"
 
 msgid "Petitboot System Information"
 msgstr "Petitboot システム情報"


@@ -479,24 +498,29 @@ msgstr ""
 "例えば、root=/dev/sda1 console=hvc0 のように入力します。\n"
 "\n"
 
 "例えば、root=/dev/sda1 console=hvc0 のように入力します。\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -548,9 +572,8 @@ msgstr ""
 "\n"
 "特定のインターフェースに DHCP: 選択されたネットワーク・インターフェースに IP "
 "アドレスが自動的に割り当てられます。その他のインターフェースは構成されませ"
 "\n"
 "特定のインターフェースに DHCP: 選択されたネットワーク・インターフェースに IP "
 "アドレスが自動的に割り当てられます。その他のインターフェースは構成されませ"

-"ん。さまざまなインターフェースに対して複数の DHCP サーバーがあるが、ブート時"
-"には単一のインターフェースのみを構成したい\n"
-"場合に、このオプションを選択します。\n"
+"ん。さまざまなインターフェースに対して複数のDHCP サーバーがあるが、ブート時に"
+"は単一のインターフェースのみを構成する場合に、このオプションを選択します。\n"

 "\n"
 "静的 IP 構成: ネットワーク・インターフェースの IPv4 アドレスとネットワーク・"
 "マスク、ゲートウェイ、および DNS サーバーを指定できます。DHCP サーバーがない"
 "\n"
 "静的 IP 構成: ネットワーク・インターフェースの IPv4 アドレスとネットワーク・"
 "マスク、ゲートウェイ、および DNS サーバーを指定できます。DHCP サーバーがない"


@@ -559,3 +582,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "使用法"
 
 msgid "Usage"
 msgstr "使用法"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/ko.po b/po/ko.po
index 769083607bd244abaa818a325008510ad0c29a2c..f523696160c20c0789cd4d880f8a745adea24aa8 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Korean\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Korean\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 
 msgid "running boot hooks"
 msgstr "부트 후크 실행 중"
 
 msgid "running boot hooks"
 msgstr "부트 후크 실행 중"


@@ -128,20 +128,28 @@ msgstr "시스템 구성"
 msgid "No IP / mask values are set"
 msgstr "IP/마스크 값이 설정되지 않음"
 
 msgid "No IP / mask values are set"
 msgstr "IP/마스크 값이 설정되지 않음"
 

+msgid "Select a boot device to add"
+msgstr "추가할 부트 장치를 선택하십시오. "
+

 msgid "Waiting for configuration data..."
 msgstr "구성 데이터 대기 중..."
 
 msgid "Waiting for configuration data..."
 msgstr "구성 데이터 대기 중..."
 

-msgid "Autoboot:"
-msgstr "자동 부트:"
+#, fuzzy
+msgid "Add Device"
+msgstr "장치: "
+
+msgid "Clear"
+msgstr "선택 취소"

 
 

-msgid "Don't autoboot"
-msgstr "ì\9e\90ë\8f\99 ë¶\80í\8a¸í\95\98ì§\80 ì\95\8aì\9d\8c"
+msgid "Clear & Boot Any"
+msgstr "ì\84 í\83\9d ì·¨ì\86\8c & 모ë\93  ë¶\80í\8a¸"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "모든 디스크/네트워크 장치에서 자동 부트"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "부트 인수:"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "특정 디스크/네트워크 장치에서만 자동 부트"
+msgid "(None)"
+msgstr "(없음)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,9 +159,13 @@ msgstr "디스크: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "네트:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "네트:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "장치: "
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "알 수 없는 UUID: %s"
+msgid "Any %s device"
+msgstr "모든 %s 장치"

 
 msgid "Timeout:"
 msgstr "제한시간:"
 
 msgid "Timeout:"
 msgstr "제한시간:"


@@ -161,6 +173,13 @@ msgstr "제한시간:"
 msgid "seconds"
 msgstr "초"
 
 msgid "seconds"
 msgstr "초"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "%s IPMI 부트 옵션: %s"
+
+msgid "Clear option:"
+msgstr "선택 취소 옵션:"
+

 msgid "Network:"
 msgstr "네트워크:"
 
 msgid "Network:"
 msgstr "네트워크:"
 


@@ -323,24 +342,24 @@ msgstr "스토리지 장치"
 
 #, c-format
 msgid " UUID:       %s"
 
 #, c-format
 msgid " UUID:       %s"

-msgstr " UUID:       %s"
+msgstr "  UUID:       %s"

 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " 마운트 위치: %s"
+msgstr "  마운트 위치: %s"

 
 msgid "Network interfaces"
 msgstr "네트워크 인터페이스"
 
 #, c-format
 msgid " MAC:  %s"
 
 msgid "Network interfaces"
 msgstr "네트워크 인터페이스"
 
 #, c-format
 msgid " MAC:  %s"

-msgstr " MAC:  %s"
+msgstr "  MAC:  %s"

 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr " 링크: %s"
+msgstr "  링크: %s"

 
 msgid "up"
 msgstr "연결"
 
 msgid "up"
 msgstr "연결"


@@ -471,24 +490,29 @@ msgstr ""
 "예: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "예: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -544,3 +568,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "사용법"
 
 msgid "Usage"
 msgstr "사용법"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6e71d6e5c61aed88ae6b3bd9d44d0434ea563c1b..512f6be6b440df41b13680d7e1b8a69b37c0d0dd 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Portugese (Brazil)\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Portugese (Brazil)\n"


@@ -128,24 +128,28 @@ msgstr "Configuração do Sistema"
 msgid "No IP / mask values are set"
 msgstr "Nenhum valor de máscara/IP está configurado"
 
 msgid "No IP / mask values are set"
 msgstr "Nenhum valor de máscara/IP está configurado"
 

+msgid "Select a boot device to add"
+msgstr "Selecione um dispositivo de inicialização a incluir. "
+

 msgid "Waiting for configuration data..."
 msgstr "Aguardando dados de configuração..."
 
 msgid "Waiting for configuration data..."
 msgstr "Aguardando dados de configuração..."
 

-msgid "Autoboot:"
-msgstr "Executar a inicialização automática:"
+#, fuzzy
+msgid "Add Device"
+msgstr "Dispositivo:"

 
 

-msgid "Don't autoboot"
-msgstr "Não executar a inicialização automática"
+msgid "Clear"
+msgstr "Limpar"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr ""
-"Executar a inicialização automática a partir de qualquer dispositivo de "
-"disco/rede"
+msgid "Clear & Boot Any"
+msgstr "Limpar e inicializar qualquer um"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr ""
-"Executar a inicialização automática apenas a partir de um dispositivo de "
-"disco/rede específico"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Argumentos de inicialização:"
+
+msgid "(None)"
+msgstr "(Nenhum)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -155,9 +159,13 @@ msgstr "disco: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "rede:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "rede:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Dispositivo:"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "UUID (identificador exclusivo universal) Desconhecido: %s"
+msgid "Any %s device"
+msgstr "Qualquer dispositivo %s"

 
 msgid "Timeout:"
 msgstr "Tempo Limite:"
 
 msgid "Timeout:"
 msgstr "Tempo Limite:"


@@ -165,6 +173,13 @@ msgstr "Tempo Limite:"
 msgid "seconds"
 msgstr "segundos"
 
 msgid "seconds"
 msgstr "segundos"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "%s Opção de inicialização de IPMI: %s"
+
+msgid "Clear option:"
+msgstr "Limpar opção: "
+

 msgid "Network:"
 msgstr "Rede:"
 
 msgid "Network:"
 msgstr "Rede:"
 


@@ -231,7 +246,7 @@ msgstr "Falha: inicializar %s"
 
 #, c-format
 msgid "User item %u"
 
 #, c-format
 msgid "User item %u"

-msgstr "Item de usuário %u"
+msgstr "Item do usuário %u"

 
 msgid "Error"
 msgstr "Erro"
 
 msgid "Error"
 msgstr "Erro"


@@ -410,7 +425,7 @@ msgstr ""
 "Para configurar o idioma da interface do petitboot, digite L (idioma).\n"
 "\n"
 "Para localizar opções de inicialização novas ou atualizadas no sistema, "
 "Para configurar o idioma da interface do petitboot, digite L (idioma).\n"
 "\n"
 "Para localizar opções de inicialização novas ou atualizadas no sistema, "

-"selecione a opção 'Varrer novamentedispositivos'.\n"
+"selecione a opção 'Varrer novamente dispositivos'.\n"

 "\n"
 "Para recuperar novas opções de inicialização a partir de um arquivo de "
 "configuração remoto, selecione a opção 'Recuperar configuração a partir da "
 "\n"
 "Para recuperar novas opções de inicialização a partir de um arquivo de "
 "configuração remoto, selecione a opção 'Recuperar configuração a partir da "


@@ -482,24 +497,29 @@ msgstr ""
 "Exemplo: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Exemplo: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -552,7 +572,7 @@ msgstr ""
 "\n"
 "DHCP (Protocolo de Configuração de Host Dinâmico) em todas as interfaces "
 "ativas: designa automaticamente endereços IP a cada interface de rede. Use "
 "\n"
 "DHCP (Protocolo de Configuração de Host Dinâmico) em todas as interfaces "
 "ativas: designa automaticamente endereços IP a cada interface de rede. Use "

-"essa opção se tiver um servidor DHCP em sua rede.\n"
+"essa opção se tiver um servidor DHCP em suarede.\n"

 "\n"
 "DHCP (Protocolo de Configuração de Host Dinâmico) em uma interface "
 "específica: designa automaticamente endereços IP à interface de rede "
 "\n"
 "DHCP (Protocolo de Configuração de Host Dinâmico) em uma interface "
 "específica: designa automaticamente endereços IP à interface de rede "


@@ -567,3 +587,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Uso"
 
 msgid "Usage"
 msgstr "Uso"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/ru.po b/po/ru.po
index f913db180997d3b2c2eb182485a391f2288a4393..ae7d3c395dd3ccb93447d4891847da3e48f17ebb 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Russian\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Russian\n"


@@ -14,7 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

 
 msgid "running boot hooks"
 msgstr "выполнение привязок загрузки"
 
 msgid "running boot hooks"
 msgstr "выполнение привязок загрузки"


@@ -128,21 +129,28 @@ msgstr "Конфигурация системы"
 msgid "No IP / mask values are set"
 msgstr "Не задано значение IP / маски"
 
 msgid "No IP / mask values are set"
 msgstr "Не задано значение IP / маски"
 

+msgid "Select a boot device to add"
+msgstr "Выберите загрузочное устройство для добавления"
+

 msgid "Waiting for configuration data..."
 msgstr "Ожидание данных конфигурации..."
 
 msgid "Waiting for configuration data..."
 msgstr "Ожидание данных конфигурации..."
 

-msgid "Autoboot:"
-msgstr "Автоматическая загрузка:"
+#, fuzzy
+msgid "Add Device"
+msgstr "Устройство:"

 
 

-msgid "Don't autoboot"
-msgstr "Ð\9dе загÑ\80Ñ\83жаÑ\82Ñ\8cÑ\81Ñ\8f авÑ\82омаÑ\82иÑ\87еÑ\81ки"
+msgid "Clear"
+msgstr "Ð\9eÑ\87иÑ\81Ñ\82иÑ\82Ñ\8c"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81ки загÑ\80Ñ\83жаÑ\82Ñ\8cÑ\81Ñ\8f Ñ\81 лÑ\8eбого диÑ\81ка/Ñ\81еÑ\82евого Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82ва"
+msgid "Clear & Boot Any"
+msgstr "Ð\9eÑ\87иÑ\81Ñ\82иÑ\82Ñ\8c и загÑ\80Ñ\83зиÑ\82Ñ\8c вÑ\81е"

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr ""
-"Автоматически загружаться только с указанного диска/сетевого устройства"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "Аргументы загрузки:"
+
+msgid "(None)"
+msgstr "(Нет)"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -152,9 +160,13 @@ msgstr "диск: %s [uuid: %s]"
 msgid "net:  %s [mac: %s]"
 msgstr "сеть:  %s [mac: %s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "сеть:  %s [mac: %s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "Устройство:"
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "Ð\9dеизвеÑ\81Ñ\82нÑ\8bй UUID: %s"
+msgid "Any %s device"
+msgstr "Ð\9bÑ\8eбое Ñ\83Ñ\81Ñ\82Ñ\80ойÑ\81Ñ\82во %s"

 
 msgid "Timeout:"
 msgstr "Тайм-аут:"
 
 msgid "Timeout:"
 msgstr "Тайм-аут:"


@@ -162,6 +174,13 @@ msgstr "Тайм-аут:"
 msgid "seconds"
 msgstr "секунд"
 
 msgid "seconds"
 msgstr "секунд"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "Опция загрузки IPMI %s: %s"
+
+msgid "Clear option:"
+msgstr "Опция очистки:"
+

 msgid "Network:"
 msgstr "Сеть:"
 
 msgid "Network:"
 msgstr "Сеть:"
 


@@ -175,10 +194,10 @@ msgid "Static IP configuration"
 msgstr "Конфигурация статического IP"
 
 msgid "link up"
 msgstr "Конфигурация статического IP"
 
 msgid "link up"

-msgstr "подклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f"
+msgstr "линиÑ\8f Ñ\81вÑ\8fзи акÑ\82ивна"

 
 msgid "link down"
 
 msgid "link down"

-msgstr "оÑ\82клÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f"
+msgstr "линиÑ\8f Ñ\81вÑ\8fзи неакÑ\82ивна"

 
 msgid "IP/mask:"
 msgstr "IP/маска:"
 
 msgid "IP/mask:"
 msgstr "IP/маска:"


@@ -225,7 +244,7 @@ msgstr "Не удалось: загрузиться %s"
 
 #, c-format
 msgid "User item %u"
 
 #, c-format
 msgid "User item %u"

-msgstr "Ð\9eбÑ\8aекÑ\82 полÑ\8cзоваÑ\82елÑ\8f %u"
+msgstr "Ð\9fолÑ\8cзоваÑ\82елÑ\8cÑ\81кий Ñ\8dлеменÑ\82 %u"

 
 msgid "Error"
 msgstr "Ошибка"
 
 msgid "Error"
 msgstr "Ошибка"


@@ -328,7 +347,7 @@ msgstr " UUID:       %s"
 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " Ñ\83Ñ\81Ñ\82ановлено в: %s"
+msgstr " Ñ\82оÑ\87ка монÑ\82иÑ\80ованиÑ\8f: %s"

 
 msgid "Network interfaces"
 msgstr "Сетевые интерфейсы"
 
 msgid "Network interfaces"
 msgstr "Сетевые интерфейсы"


@@ -341,14 +360,14 @@ msgstr " MAC:  %s"
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr " связь: %s"
+msgstr " линия связи: %s"

 
 msgid "up"
 
 msgid "up"

-msgstr "вкл"
+msgstr "акÑ\82ивна"

 
 #, fuzzy
 msgid "down"
 
 #, fuzzy
 msgid "down"

-msgstr "вÑ\8bкл"
+msgstr "неакÑ\82ивна"

 
 msgid "Petitboot System Information"
 msgstr "Информация о системе Petitboot"
 
 msgid "Petitboot System Information"
 msgstr "Информация о системе Petitboot"


@@ -473,24 +492,29 @@ msgstr ""
 "Пример: root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "Пример: root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -520,7 +544,7 @@ msgstr ""
 "или если хотите поработать с petitboot до загрузки системы\n"
 "\n"
 "Автозагрузка с любого диска/сетевого устройства: любой вариант загрузки с "
 "или если хотите поработать с petitboot до загрузки системы\n"
 "\n"
 "Автозагрузка с любого диска/сетевого устройства: любой вариант загрузки с "

-"оÑ\82меÑ\82кой по Ñ\83молÑ\87аниÑ\8e (задаеÑ\82Ñ\81Ñ\8f в наÑ\81Ñ\82Ñ\80ойкаÑ\85 bootloader) будет автоматически "
+"оÑ\82меÑ\82кой по Ñ\83молÑ\87аниÑ\8e (в конÑ\84игÑ\83Ñ\80аÑ\86ии загÑ\80Ñ\83зÑ\87ика) будет автоматически "

 "загружен после тайм-аута. Используйте этот вариант в том случае, если хотите "
 "быстро загрузить систему без изменения каких-либо настроек варианта "
 "загрузки. Является стандартной конфигурацией.\n"
 "загружен после тайм-аута. Используйте этот вариант в том случае, если хотите "
 "быстро загрузить систему без изменения каких-либо настроек варианта "
 "загрузки. Является стандартной конфигурацией.\n"


@@ -552,3 +576,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "Использование"
 
 msgid "Usage"
 msgstr "Использование"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 62976b08768f577ae69ebb551afca55b3829aeb1..1b298f4b4364c837829bed0f5adb5dff315768b8 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Simplified Chinese\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Simplified Chinese\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 
 msgid "running boot hooks"
 msgstr "正在运行引导挂钩"
 
 msgid "running boot hooks"
 msgstr "正在运行引导挂钩"


@@ -128,20 +128,28 @@ msgstr "系统配置"
 msgid "No IP / mask values are set"
 msgstr "未设置任何 IP/掩码值"
 
 msgid "No IP / mask values are set"
 msgstr "未设置任何 IP/掩码值"
 

+msgid "Select a boot device to add"
+msgstr "选择要添加的引导设备"
+

 msgid "Waiting for configuration data..."
 msgstr "正在等待配置数据..."
 
 msgid "Waiting for configuration data..."
 msgstr "正在等待配置数据..."
 

-msgid "Autoboot:"
-msgstr "自动引导："
+#, fuzzy
+msgid "Add Device"
+msgstr "设备："
+
+msgid "Clear"
+msgstr "清除"

 
 

-msgid "Don't autoboot"
-msgstr "不自动引导"
+msgid "Clear & Boot Any"
+msgstr "清除并引导任何项"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "从任何磁盘/网络设备自动引导"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "引导参数："

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "仅从特定磁盘/网络设备自动引导"
+msgid "(None)"
+msgstr "（无）"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,9 +159,13 @@ msgstr "磁盘：%s [uuid：%s]"
 msgid "net:  %s [mac: %s]"
 msgstr "网路：%s [mac：%s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "网路：%s [mac：%s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "设备："
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "未知 UUID：%s"
+msgid "Any %s device"
+msgstr "任何 %s 设备"

 
 msgid "Timeout:"
 msgstr "超时："
 
 msgid "Timeout:"
 msgstr "超时："


@@ -161,6 +173,13 @@ msgstr "超时："
 msgid "seconds"
 msgstr "秒"
 
 msgid "seconds"
 msgstr "秒"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "%s IPMI 引导选项：%s"
+
+msgid "Clear option:"
+msgstr "清除选项："
+

 msgid "Network:"
 msgstr "网络："
 
 msgid "Network:"
 msgstr "网络："
 


@@ -295,7 +314,7 @@ msgstr "选择 Petitboot 语言"
 
 #, c-format
 msgid "!Invalid option %d"
 
 #, c-format
 msgid "!Invalid option %d"

-msgstr "！无效的选项 %d"
+msgstr "选项 %d 无效！"

 
 msgid "Disk"
 msgstr "磁盘"
 
 msgid "Disk"
 msgstr "磁盘"


@@ -323,24 +342,24 @@ msgstr "存储设备"
 
 #, c-format
 msgid " UUID:       %s"
 
 #, c-format
 msgid " UUID:       %s"

-msgstr " UUID：       %s"
+msgstr "  UUID：       %s"

 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " 安装于：%s"
+msgstr "  安装于：%s"

 
 msgid "Network interfaces"
 msgstr "网络接口"
 
 #, c-format
 msgid " MAC:  %s"
 
 msgid "Network interfaces"
 msgstr "网络接口"
 
 #, c-format
 msgid " MAC:  %s"

-msgstr " MAC：  %s"
+msgstr "  MAC：  %s"

 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr "链接： %s"
+msgstr " 链接： %s"

 
 msgid "up"
 msgstr "上行链路"
 
 msgid "up"
 msgstr "上行链路"


@@ -462,24 +481,29 @@ msgstr ""
 "示例：root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "示例：root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -518,8 +542,8 @@ msgstr ""
 "\n"
 "网络选项：\n"
 "\n"
 "\n"
 "网络选项：\n"
 "\n"

-"所有活动接口上的 DHCP：自动将 IP 地址分配给每个网络接口。如果您的网络上有 "
-"DHCP 服务器，请使用 此选项。\n"
+"所有活动接口上的 DHCP：自动将 IP 地址分配给每个网络接口。如果网络上存在 DHCP "
+"服务器，请使用此选项。\n"

 "\n"
 "特定接口上的 DHCP：自动将 IP 地址分配给选择的网络接口。不配置其他接口。如果您"
 "在不同的接口上有多个 DHCP 服务器，但在引导期间只想配置单个接口，请选择此选"
 "\n"
 "特定接口上的 DHCP：自动将 IP 地址分配给选择的网络接口。不配置其他接口。如果您"
 "在不同的接口上有多个 DHCP 服务器，但在引导期间只想配置单个接口，请选择此选"


@@ -530,3 +554,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "用法"
 
 msgid "Usage"
 msgstr "用法"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 657062f0ebac6b775ed291618b7277f9672def3c..60f27d8ff856ed7353fb9e66ef6c67b6d0ceb64e 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
 msgstr ""
 "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
 "Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"

-"POT-Creation-Date: 2014-10-13 09:24+1100\n"
+"POT-Creation-Date: 2015-07-28 14:45+1000\n"

 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Traditional Chinese\n"
 "PO-Revision-Date: 2014-06-24 13:56+0800\n"
 "Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
 "Language-Team: Traditional Chinese\n"


@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 
 msgid "running boot hooks"
 msgstr "正在執行啟動連結鉤"
 
 msgid "running boot hooks"
 msgstr "正在執行啟動連結鉤"


@@ -128,20 +128,28 @@ msgstr "系統配置"
 msgid "No IP / mask values are set"
 msgstr "未設定任何 IP/遮罩值"
 
 msgid "No IP / mask values are set"
 msgstr "未設定任何 IP/遮罩值"
 

+msgid "Select a boot device to add"
+msgstr "選取要新增的啟動裝置"
+

 msgid "Waiting for configuration data..."
 msgstr "正在等待配置資料..."
 
 msgid "Waiting for configuration data..."
 msgstr "正在等待配置資料..."
 

-msgid "Autoboot:"
-msgstr "自動啟動："
+#, fuzzy
+msgid "Add Device"
+msgstr "裝置："
+
+msgid "Clear"
+msgstr "清除"

 
 

-msgid "Don't autoboot"
-msgstr "不自動啟動"
+msgid "Clear & Boot Any"
+msgstr "清除並啟動任意項"

 
 

-msgid "Autoboot from any disk/network device"
-msgstr "從任何磁碟/網路裝置自動啟動"
+#, fuzzy
+msgid "Boot Order:"
+msgstr "啟動引數："

 
 

-msgid "Only autoboot from a specific disk/network device"
-msgstr "僅從特定的磁碟/網路裝置自動啟動"
+msgid "(None)"
+msgstr "（無）"

 
 #, c-format
 msgid "disk: %s [uuid: %s]"
 
 #, c-format
 msgid "disk: %s [uuid: %s]"


@@ -151,9 +159,13 @@ msgstr "磁碟：%s [UUID：%s]"
 msgid "net:  %s [mac: %s]"
 msgstr "網路：%s [MAC：%s]"
 
 msgid "net:  %s [mac: %s]"
 msgstr "網路：%s [MAC：%s]"
 

+#, fuzzy
+msgid "Any Device"
+msgstr "裝置："
+

 #, c-format
 #, c-format

-msgid "Unknown UUID: %s"
-msgstr "ä¸\8dæ\98\8e UUIDï¼\9a%s"
+msgid "Any %s device"
+msgstr "ä»»ä½\95 %s è£\9dç½®"

 
 msgid "Timeout:"
 msgstr "逾時："
 
 msgid "Timeout:"
 msgstr "逾時："


@@ -161,6 +173,13 @@ msgstr "逾時："
 msgid "seconds"
 msgstr "秒"
 
 msgid "seconds"
 msgstr "秒"
 

+#, c-format
+msgid "%s IPMI boot option: %s"
+msgstr "%s IPMI 啟動選項：%s"
+
+msgid "Clear option:"
+msgstr "清除選項："
+

 msgid "Network:"
 msgstr "網路："
 
 msgid "Network:"
 msgstr "網路："
 


@@ -323,24 +342,24 @@ msgstr "儲存裝置"
 
 #, c-format
 msgid " UUID:       %s"
 
 #, c-format
 msgid " UUID:       %s"

-msgstr " UUID：      %s"
+msgstr "  UUID：      %s"

 
 #, c-format
 msgid " mounted at: %s"
 
 #, c-format
 msgid " mounted at: %s"

-msgstr " 裝載位置：%s"
+msgstr "  裝載位置：%s"

 
 msgid "Network interfaces"
 msgstr "網路介面"
 
 #, c-format
 msgid " MAC:  %s"
 
 msgid "Network interfaces"
 msgstr "網路介面"
 
 #, c-format
 msgid " MAC:  %s"

-msgstr " MAC：%s"
+msgstr "  MAC：%s"

 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"
 
 #. TRANSLATORS: these "up" / "down" strings refer to the
 #. * link status for a network connection.
 #, c-format
 msgid " link: %s"

-msgstr " 鏈結：%s"
+msgstr "  鏈結：%s"

 
 msgid "up"
 msgstr "向上鏈結"
 
 msgid "up"
 msgstr "向上鏈結"


@@ -465,24 +484,29 @@ msgstr ""
 "範例：root=/dev/sda1 console=hvc0\n"
 "\n"
 
 "範例：root=/dev/sda1 console=hvc0\n"
 "\n"
 

+#, fuzzy

 msgid ""
 msgid ""

-"Autoboot: There are three possible options for automatic-boot hehaviour:\n"
-"\n"
-"Don't autoboot: boot options will be listed in the petitboot menu, but none "
-"will be booted automatically. User interaction will be required to continue "
+"Autoboot: Specify which devices to autoboot from.\n"
+"\n"
+"By selecting the 'Add Device' button new devices can be added to the "
+"autoboot list, either by UUID, MAC address, or device type. Once added to "
+"the boot order, the priority of devices can be changed with the 'left' and "
+"'right' keys Devices can be individually removed from the boot order with "
+"the minus key. Use this option if you have multiple operating system images "
+"installed.\n"
+"\n"
+"To autoboot from any device, select the 'Clear & Boot Any' button. In this "
+"case, any boot option that is marked as a default (by bootloader "
+"configuration) will be booted automatically after a timeout. Use this option "
+"if you want to quickly boot your system without changing any boot option "
+"settings. This is the typical configuration.\n"
+"\n"
+"To disable autoboot, select the 'Clear' button, which will clear the boot "
+"order. With autoboot disabled, user interaction will be required to continue "

 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"
 "past the petitboot menu. Use this option if you want the machine to wait for "
 "an explicit boot selection, or want to interact with petitboot before "
 "booting the system\n"
 "\n"

-"Autoboot from any disk/network device: any boot option that is marked as a "
-"default (by bootloader configuration) will be booted automatically after a "
-"timeout. Use this option if you want to quickly boot your system without "
-"changing any boot option settings. This is the typical configuration.\n"
-"\n"
-"Only autoboot from a specific disk/network device: only boot options from a "
-"single device (specifed here) will be booted automatically after a timeout. "
-"Use this option if you have multiple operating system images installed.\n"
-"\n"

 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"
 "Timeout: Specify the length of time, in seconds, that the main menu will be "
 "displayed before the default boot option is started. This option is only "
 "displayed if autoboot is enabled.\n"


@@ -521,8 +545,8 @@ msgstr ""
 "\n"
 "網路選項：\n"
 "\n"
 "\n"
 "網路選項：\n"
 "\n"

-"對所有作用中介面使用 DHCP：自動將 IP 位址指派給每一個網路介面。如果您的網路中"
-"有 DHCP 伺服器，請使用此選項。\n"
+"對所有作用中介面使用 DHCP：自動將 IP 位址指派給每一個網路介面。如果網路上有 "
+"DHCP 伺服器，請使用此選項。\n"

 "\n"
 "對特定介面使用 DHCP：自動將 IP 位址指派給選定的網路介面。不配置其他介面。如果"
 "您在不同的介面上具有多個 DHCP 伺服器，但在啟動期間只想配置單一介面，請選取此"
 "\n"
 "對特定介面使用 DHCP：自動將 IP 位址指派給選定的網路介面。不配置其他介面。如果"
 "您在不同的介面上具有多個 DHCP 伺服器，但在啟動期間只想配置單一介面，請選取此"


@@ -533,3 +557,18 @@ msgstr ""
 
 msgid "Usage"
 msgstr "用法"
 
 msgid "Usage"
 msgstr "用法"

+
+#~ msgid "Autoboot:"
+#~ msgstr "Autoboot:"
+
+#~ msgid "Don't autoboot"
+#~ msgstr "Don't autoboot"
+
+#~ msgid "Autoboot from any disk/network device"
+#~ msgstr "Autoboot from any disk/network device"
+
+#~ msgid "Only autoboot from a specific disk/network device"
+#~ msgstr "Only autoboot from a specific disk/network device"
+
+#~ msgid "Unknown UUID: %s"
+#~ msgstr "Unknown UUID: %s"